diff options
| author | 2017-06-24 02:35:17 +0200 | |
|---|---|---|
| committer | 2017-06-24 05:48:35 +0200 | |
| commit | bbeb9f1dbbac983c85b87085865d23b33ce51add (patch) | |
| tree | 21129c8783d75541dc8eca3062310671b6396eba | |
| parent | Merge pull request #2798 from yuriks/svc-create-session (diff) | |
| download | yuzu-bbeb9f1dbbac983c85b87085865d23b33ce51add.tar.gz yuzu-bbeb9f1dbbac983c85b87085865d23b33ce51add.tar.xz yuzu-bbeb9f1dbbac983c85b87085865d23b33ce51add.zip | |
citra-qt: add new uisetting->theme
| -rw-r--r-- | src/citra_qt/configuration/config.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/ui_settings.h | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index 64ffc9152..b7b129fe0 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp | |||
| @@ -134,6 +134,7 @@ void Config::ReadValues() { | |||
| 134 | qt_config->endGroup(); | 134 | qt_config->endGroup(); |
| 135 | 135 | ||
| 136 | qt_config->beginGroup("UI"); | 136 | qt_config->beginGroup("UI"); |
| 137 | UISettings::values.theme = qt_config->value("theme", UISettings::themes[0].second).toString(); | ||
| 137 | 138 | ||
| 138 | qt_config->beginGroup("UILayout"); | 139 | qt_config->beginGroup("UILayout"); |
| 139 | UISettings::values.geometry = qt_config->value("geometry").toByteArray(); | 140 | UISettings::values.geometry = qt_config->value("geometry").toByteArray(); |
| @@ -269,6 +270,7 @@ void Config::SaveValues() { | |||
| 269 | qt_config->endGroup(); | 270 | qt_config->endGroup(); |
| 270 | 271 | ||
| 271 | qt_config->beginGroup("UI"); | 272 | qt_config->beginGroup("UI"); |
| 273 | qt_config->setValue("theme", UISettings::values.theme); | ||
| 272 | 274 | ||
| 273 | qt_config->beginGroup("UILayout"); | 275 | qt_config->beginGroup("UILayout"); |
| 274 | qt_config->setValue("geometry", UISettings::values.geometry); | 276 | qt_config->setValue("geometry", UISettings::values.geometry); |
diff --git a/src/citra_qt/ui_settings.h b/src/citra_qt/ui_settings.h index bc37f81c5..025c73f84 100644 --- a/src/citra_qt/ui_settings.h +++ b/src/citra_qt/ui_settings.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <array> | ||
| 7 | #include <vector> | 8 | #include <vector> |
| 8 | #include <QByteArray> | 9 | #include <QByteArray> |
| 9 | #include <QString> | 10 | #include <QString> |
| @@ -14,6 +15,10 @@ namespace UISettings { | |||
| 14 | using ContextualShortcut = std::pair<QString, int>; | 15 | using ContextualShortcut = std::pair<QString, int>; |
| 15 | using Shortcut = std::pair<QString, ContextualShortcut>; | 16 | using Shortcut = std::pair<QString, ContextualShortcut>; |
| 16 | 17 | ||
| 18 | static const std::array<std::pair<QString, QString>, 2> themes = { | ||
| 19 | {std::make_pair(QString("Default"), QString("default")), | ||
| 20 | std::make_pair(QString("Dark"), QString("qdarkstyle"))}}; | ||
| 21 | |||
| 17 | struct Values { | 22 | struct Values { |
| 18 | QByteArray geometry; | 23 | QByteArray geometry; |
| 19 | QByteArray state; | 24 | QByteArray state; |
| @@ -39,6 +44,8 @@ struct Values { | |||
| 39 | bool gamedir_deepscan; | 44 | bool gamedir_deepscan; |
| 40 | QStringList recent_files; | 45 | QStringList recent_files; |
| 41 | 46 | ||
| 47 | QString theme; | ||
| 48 | |||
| 42 | // Shortcut name <Shortcut, context> | 49 | // Shortcut name <Shortcut, context> |
| 43 | std::vector<Shortcut> shortcuts; | 50 | std::vector<Shortcut> shortcuts; |
| 44 | }; | 51 | }; |