diff options
| author | Kloen <kloen@outlawkiwi.com> | 2017-06-24 02:41:48 +0200 |
|---|---|---|
| committer | Kloen <kloen@outlawkiwi.com> | 2017-06-24 05:48:43 +0200 |
| commit | 74cf73f9d3cdfbca658f8132408eccad710a798c (patch) | |
| tree | e0224645af3977c8e2d710538475162f003d1439 | |
| parent | citra-qt: load ui theme at startup and config change. (diff) | |
| download | yuzu-74cf73f9d3cdfbca658f8132408eccad710a798c.tar yuzu-74cf73f9d3cdfbca658f8132408eccad710a798c.tar.gz yuzu-74cf73f9d3cdfbca658f8132408eccad710a798c.tar.bz2 yuzu-74cf73f9d3cdfbca658f8132408eccad710a798c.tar.lz yuzu-74cf73f9d3cdfbca658f8132408eccad710a798c.tar.xz yuzu-74cf73f9d3cdfbca658f8132408eccad710a798c.tar.zst yuzu-74cf73f9d3cdfbca658f8132408eccad710a798c.zip | |
| -rw-r--r-- | src/citra_qt/configuration/configure_general.cpp | 9 | ||||
| -rw-r--r-- | src/citra_qt/configuration/configure_general.ui | 28 |
2 files changed, 37 insertions, 0 deletions
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> |