diff options
| author | bunnei <bunneidev@gmail.com> | 2016-12-30 04:09:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-30 04:09:01 +0100 |
| commit | f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4 (patch) | |
| tree | 63472a7c6dbd7bc9f77ba503800afdaf36982da5 /src/citra_qt | |
| parent | Merge pull request #2367 from JayFoxRox/lighting-lut-quickfix (diff) | |
| parent | Config: auto-select region and language (diff) | |
| download | yuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.tar yuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.tar.gz yuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.tar.bz2 yuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.tar.lz yuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.tar.xz yuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.tar.zst yuzu-f556d6ee90aae2d81cd9770c0b3259ac88ae8fe4.zip | |
Diffstat (limited to 'src/citra_qt')
| -rw-r--r-- | src/citra_qt/config.cpp | 3 | ||||
| -rw-r--r-- | src/citra_qt/configure_general.cpp | 6 | ||||
| -rw-r--r-- | src/citra_qt/configure_general.ui | 5 | ||||
| -rw-r--r-- | src/citra_qt/configure_system.ui | 3 |
4 files changed, 14 insertions, 3 deletions
diff --git a/src/citra_qt/config.cpp b/src/citra_qt/config.cpp index 06a4e9d25..c904c4b00 100644 --- a/src/citra_qt/config.cpp +++ b/src/citra_qt/config.cpp @@ -72,7 +72,8 @@ void Config::ReadValues() { qt_config->beginGroup("System"); Settings::values.is_new_3ds = qt_config->value("is_new_3ds", false).toBool(); - Settings::values.region_value = qt_config->value("region_value", 1).toInt(); + Settings::values.region_value = + qt_config->value("region_value", Settings::REGION_VALUE_AUTO_SELECT).toInt(); qt_config->endGroup(); qt_config->beginGroup("Miscellaneous"); diff --git a/src/citra_qt/configure_general.cpp b/src/citra_qt/configure_general.cpp index 03cd8835b..ac90a6df4 100644 --- a/src/citra_qt/configure_general.cpp +++ b/src/citra_qt/configure_general.cpp @@ -23,13 +23,15 @@ void ConfigureGeneral::setConfiguration() { ui->toggle_deepscan->setChecked(UISettings::values.gamedir_deepscan); ui->toggle_check_exit->setChecked(UISettings::values.confirm_before_closing); ui->toggle_cpu_jit->setChecked(Settings::values.use_cpu_jit); - ui->region_combobox->setCurrentIndex(Settings::values.region_value); + + // 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); } void ConfigureGeneral::applyConfiguration() { UISettings::values.gamedir_deepscan = ui->toggle_deepscan->isChecked(); UISettings::values.confirm_before_closing = ui->toggle_check_exit->isChecked(); - Settings::values.region_value = ui->region_combobox->currentIndex(); + Settings::values.region_value = ui->region_combobox->currentIndex() - 1; Settings::values.use_cpu_jit = ui->toggle_cpu_jit->isChecked(); Settings::Apply(); } diff --git a/src/citra_qt/configure_general.ui b/src/citra_qt/configure_general.ui index 81688113f..342954e41 100644 --- a/src/citra_qt/configure_general.ui +++ b/src/citra_qt/configure_general.ui @@ -84,6 +84,11 @@ <widget class="QComboBox" name="region_combobox"> <item> <property name="text"> + <string>Auto-select</string> + </property> + </item> + <item> + <property name="text"> <string notr="true">JPN</string> </property> </item> diff --git a/src/citra_qt/configure_system.ui b/src/citra_qt/configure_system.ui index 6a906b61b..cc54fa37f 100644 --- a/src/citra_qt/configure_system.ui +++ b/src/citra_qt/configure_system.ui @@ -129,6 +129,9 @@ </item> <item row="2" column="1"> <widget class="QComboBox" name="combo_language"> + <property name="toolTip"> + <string>Note: this can be overridden when region setting is auto-select</string> + </property> <item> <property name="text"> <string>Japanese (日本語)</string> |