From 18ca3ca751ad1596524e473f0ad56253ad4b006f Mon Sep 17 00:00:00 2001 From: James Rowe Date: Thu, 11 Jan 2018 21:56:15 -0700 Subject: Removing unused settings and yuzu rebranding --- src/yuzu/configuration/configure_general.cpp | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'src/yuzu/configuration/configure_general.cpp') diff --git a/src/yuzu/configuration/configure_general.cpp b/src/yuzu/configuration/configure_general.cpp index 4a1002c17..92fd6ab02 100644 --- a/src/yuzu/configuration/configure_general.cpp +++ b/src/yuzu/configuration/configure_general.cpp @@ -13,10 +13,6 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent) ui->setupUi(this); - for (auto theme : UISettings::themes) { - ui->theme_combobox->addItem(theme.first, theme.second); - } - this->setConfiguration(); ui->cpu_core_combobox->setEnabled(!Core::System::GetInstance().IsPoweredOn()); @@ -27,20 +23,12 @@ ConfigureGeneral::~ConfigureGeneral() {} void ConfigureGeneral::setConfiguration() { ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan); ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing); - - // The first item is "auto-select" with actual value -1, so plus one here will do the trick - ui->region_combobox->setCurrentIndex(Settings::values.region_value + 1); - - ui->theme_combobox->setCurrentIndex(ui->theme_combobox->findData(UISettings::values.theme)); ui->cpu_core_combobox->setCurrentIndex(static_cast(Settings::values.cpu_core)); } void ConfigureGeneral::applyConfiguration() { UISettings::values.gamedir_deepscan = ui->toggle_deepscan->isChecked(); UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked(); - UISettings::values.theme = - ui->theme_combobox->itemData(ui->theme_combobox->currentIndex()).toString(); - Settings::values.region_value = ui->region_combobox->currentIndex() - 1; Settings::values.cpu_core = static_cast(ui->cpu_core_combobox->currentIndex()); Settings::Apply(); -- cgit v1.2.3