napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[locale] Filter zones combo always

Browse Source 
The drop-down of zones was initially unfiltered, so you could start
in Europe/Amsterdam and the zones drop-down would also show Australian
zones; picking Perth would have weird effects, since Europe/Perth
doesn't exist and so you'd end up in New York instead.

- set the filtering region immediately, rather than only when the
  region changes.
This commit is contained in:
Adriaan de Groot 2020-11-05 00:33:45 +01:00
parent 83b2b95381
commit e5b7e66ee9
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/locale/LocalePage.cpp
View File

@ -91,10 +91,16 @@ LocalePage::LocalePage( Config* config, QWidget* parent )
// Set up the location before connecting signals, to avoid a signal // Set up the location before connecting signals, to avoid a signal
// storm as various parts interact. // storm as various parts interact.
m_regionCombo->setModel( m_config->regionModel() ); {
m_zoneCombo->setModel( m_config->regionalZonesModel() ); auto* regions = m_config->regionModel();
locationChanged( m_config->currentLocation() ); // doesn't inform TZ widget auto* zones = m_config->regionalZonesModel();
m_tzWidget->setCurrentLocation( m_config->currentLocation() ); auto* location = m_config->currentLocation();
zones->setRegion( location->region() );
m_regionCombo->setModel( regions );
m_zoneCombo->setModel( zones );
m_tzWidget->setCurrentLocation( location );
locationChanged( location ); // doesn't inform TZ widget
}
connect( config, &Config::currentLCStatusChanged, m_formatsLabel, &QLabel::setText ); connect( config, &Config::currentLCStatusChanged, m_formatsLabel, &QLabel::setText );
connect( config, &Config::currentLanguageStatusChanged, m_localeLabel, &QLabel::setText ); connect( config, &Config::currentLanguageStatusChanged, m_localeLabel, &QLabel::setText );