diff options
author | bunnei <bunneidev@gmail.com> | 2017-07-18 03:30:01 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-18 03:30:01 +0200 |
commit | 822e8d21ea9fd080a76fa939494c14c9bd2f3e27 (patch) | |
tree | 4d318f30937d9e1091dbd2a3c90920594dbd2081 /src/citra_qt/configuration | |
parent | Merge pull request #2818 from B3n30/network (diff) | |
parent | citra-qt: Add option to configure the UI theme (diff) | |
download | yuzu-822e8d21ea9fd080a76fa939494c14c9bd2f3e27.tar yuzu-822e8d21ea9fd080a76fa939494c14c9bd2f3e27.tar.gz yuzu-822e8d21ea9fd080a76fa939494c14c9bd2f3e27.tar.bz2 yuzu-822e8d21ea9fd080a76fa939494c14c9bd2f3e27.tar.lz yuzu-822e8d21ea9fd080a76fa939494c14c9bd2f3e27.tar.xz yuzu-822e8d21ea9fd080a76fa939494c14c9bd2f3e27.tar.zst yuzu-822e8d21ea9fd080a76fa939494c14c9bd2f3e27.zip |
Diffstat (limited to 'src/citra_qt/configuration')
-rw-r--r-- | src/citra_qt/configuration/config.cpp | 2 | ||||
-rw-r--r-- | src/citra_qt/configuration/configure_general.cpp | 9 | ||||
-rw-r--r-- | src/citra_qt/configuration/configure_general.ui | 28 |
3 files changed, 39 insertions, 0 deletions
diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index 40142b6d9..75abb4ce6 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -141,6 +141,7 @@ void Config::ReadValues() { qt_config->endGroup(); qt_config->beginGroup("UI"); + UISettings::values.theme = qt_config->value("theme", UISettings::themes[0].second).toString(); qt_config->beginGroup("UILayout"); UISettings::values.geometry = qt_config->value("geometry").toByteArray(); @@ -281,6 +282,7 @@ void Config::SaveValues() { qt_config->endGroup(); qt_config->beginGroup("UI"); + qt_config->setValue("theme", UISettings::values.theme); qt_config->beginGroup("UILayout"); qt_config->setValue("geometry", UISettings::values.geometry); diff --git a/src/citra_qt/configuration/configure_general.cpp b/src/citra_qt/configuration/configure_general.cpp index a21176c34..939379717 100644 --- a/src/citra_qt/configuration/configure_general.cpp +++ b/src/citra_qt/configuration/configure_general.cpp @@ -12,6 +12,11 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureGeneral) { ui->setupUi(this); + + for (auto theme : UISettings::themes) { + ui->theme_combobox->addItem(theme.first, theme.second); + } + this->setConfiguration(); ui->toggle_cpu_jit->setEnabled(!Core::System::GetInstance().IsPoweredOn()); @@ -26,11 +31,15 @@ void ConfigureGeneral::setConfiguration() { // 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)); } 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.use_cpu_jit = ui->toggle_cpu_jit->isChecked(); Settings::Apply(); diff --git a/src/citra_qt/configuration/configure_general.ui b/src/citra_qt/configuration/configure_general.ui index c739605a4..eedf2cbb0 100644 --- a/src/citra_qt/configuration/configure_general.ui +++ b/src/citra_qt/configuration/configure_general.ui @@ -132,6 +132,34 @@ </widget> </item> <item> + <widget class="QGroupBox" name="theme_group_box"> + <property name="title"> + <string>Theme</string> + </property> + <layout class="QHBoxLayout" name="theme_qhbox_layout"> + <item> + <layout class="QVBoxLayout" name="theme_qvbox_layout"> + <item> + <layout class="QHBoxLayout" name="theme_qhbox_layout_2"> + <item> + <widget class="QLabel" name="theme_label"> + <property name="text"> + <string>Theme:</string> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="theme_combobox"> + </widget> + </item> + </layout> + </item> + </layout> + </item> + </layout> + </widget> + </item> + <item> <widget class="QGroupBox" name="groupBox_3"> <property name="title"> <string>Hotkeys</string> |