diff options
| author | Ameer J <52414509+ameerj@users.noreply.github.com> | 2021-07-08 14:46:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-08 14:46:31 -0400 |
| commit | 5edc96f4a47bff64cfd97f0c91e42b56ab58b2d7 (patch) | |
| tree | bd1e570a3f0594557e28516b0974aa07f67ad616 /src/yuzu/configuration/configure_ui.cpp | |
| parent | c7ad195fd3eeea380465be48264f4e69165178c7 (diff) | |
| parent | a949ee0410fcce9144806d7b64e9ae4bffd4fee9 (diff) | |
Merge pull request #6539 from lat9nq/default-setting
general: Move most settings' defaults and labels into their definition
Diffstat (limited to 'src/yuzu/configuration/configure_ui.cpp')
| -rw-r--r-- | src/yuzu/configuration/configure_ui.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/yuzu/configuration/configure_ui.cpp b/src/yuzu/configuration/configure_ui.cpp index 9674119e12..e8f41bf654 100644 --- a/src/yuzu/configuration/configure_ui.cpp +++ b/src/yuzu/configuration/configure_ui.cpp @@ -113,11 +113,12 @@ void ConfigureUi::SetConfiguration() { ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme)); ui->language_combobox->setCurrentIndex( ui->language_combobox->findData(UISettings::values.language)); - ui->show_add_ons->setChecked(UISettings::values.show_add_ons); + ui->show_add_ons->setChecked(UISettings::values.show_add_ons.GetValue()); ui->icon_size_combobox->setCurrentIndex( - ui->icon_size_combobox->findData(UISettings::values.icon_size)); + ui->icon_size_combobox->findData(UISettings::values.icon_size.GetValue())); - ui->enable_screenshot_save_as->setChecked(UISettings::values.enable_screenshot_save_as); + ui->enable_screenshot_save_as->setChecked( + UISettings::values.enable_screenshot_save_as.GetValue()); ui->screenshot_path_edit->setText(QString::fromStdString( Common::FS::GetYuzuPathString(Common::FS::YuzuPath::ScreenshotsDir))); } @@ -178,7 +179,7 @@ void ConfigureUi::InitializeRowComboBoxes() { void ConfigureUi::UpdateFirstRowComboBox(bool init) { const int currentIndex = - init ? UISettings::values.row_1_text_id + init ? UISettings::values.row_1_text_id.GetValue() : ui->row_1_text_combobox->findData(ui->row_1_text_combobox->currentData()); ui->row_1_text_combobox->clear(); @@ -197,7 +198,7 @@ void ConfigureUi::UpdateFirstRowComboBox(bool init) { void ConfigureUi::UpdateSecondRowComboBox(bool init) { const int currentIndex = - init ? UISettings::values.row_2_text_id + init ? UISettings::values.row_2_text_id.GetValue() : ui->row_2_text_combobox->findData(ui->row_2_text_combobox->currentData()); ui->row_2_text_combobox->clear(); |