mirror of
https://github.com/ciphervance/supercell-wx.git
synced 2025-10-30 13:30:06 +00:00
Move connection creation earlier to cause it to be triggered on setting
the current value to the combobox
This commit is contained in:
parent
3f52f79210
commit
73d3eedcdc
1 changed files with 7 additions and 6 deletions
|
|
@ -521,12 +521,6 @@ void SettingsDialogImpl::SetupGeneralTab()
|
||||||
settings::GeneralSettings& generalSettings =
|
settings::GeneralSettings& generalSettings =
|
||||||
settings::GeneralSettings::Instance();
|
settings::GeneralSettings::Instance();
|
||||||
|
|
||||||
theme_.SetSettingsVariable(generalSettings.theme());
|
|
||||||
SCWX_SETTINGS_COMBO_BOX(theme_,
|
|
||||||
self_->ui->themeComboBox,
|
|
||||||
types::UiStyleIterator(),
|
|
||||||
types::GetUiStyleName);
|
|
||||||
theme_.SetResetButton(self_->ui->resetThemeButton);
|
|
||||||
|
|
||||||
QObject::connect(
|
QObject::connect(
|
||||||
self_->ui->themeComboBox,
|
self_->ui->themeComboBox,
|
||||||
|
|
@ -542,6 +536,13 @@ void SettingsDialogImpl::SetupGeneralTab()
|
||||||
self_->ui->resetThemeFileButton->setEnabled(themeFileEnabled);
|
self_->ui->resetThemeFileButton->setEnabled(themeFileEnabled);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
theme_.SetSettingsVariable(generalSettings.theme());
|
||||||
|
SCWX_SETTINGS_COMBO_BOX(theme_,
|
||||||
|
self_->ui->themeComboBox,
|
||||||
|
types::UiStyleIterator(),
|
||||||
|
types::GetUiStyleName);
|
||||||
|
theme_.SetResetButton(self_->ui->resetThemeButton);
|
||||||
|
|
||||||
themeFile_.SetSettingsVariable(generalSettings.theme_file());
|
themeFile_.SetSettingsVariable(generalSettings.theme_file());
|
||||||
themeFile_.SetEditWidget(self_->ui->themeFileLineEdit);
|
themeFile_.SetEditWidget(self_->ui->themeFileLineEdit);
|
||||||
themeFile_.SetResetButton(self_->ui->resetThemeFileButton);
|
themeFile_.SetResetButton(self_->ui->resetThemeFileButton);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue