octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1440 from lioncash/array

Browse Source 
ui_settings: Place definition of the theme array within the cpp file
This commit is contained in:
bunnei
2018-10-05 22:54:01 -04:00
committed by GitHub
parent d3bfb102d8 30dfd89126
commit e6ee31a8e9
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/yuzu/configuration/configure_general.cpp
View File

@@ -13,7 +13,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
ui->setupUi(this); ui->setupUi(this);
for (auto theme : UISettings::themes) { for (const auto& theme : UISettings::themes) {
ui->theme_combobox->addItem(theme.first, theme.second); ui->theme_combobox->addItem(theme.first, theme.second);
} }

8
src/yuzu/ui_settings.cpp
View File

@@ -6,5 +6,11 @@
namespace UISettings { namespace UISettings {
const Themes themes{{
{"Default", "default"},
{"Dark", "qdarkstyle"},
}};
Values values = {}; Values values = {};
}
} // namespace UISettings

5
src/yuzu/ui_settings.h
View File

@@ -15,9 +15,8 @@ namespace UISettings {
using ContextualShortcut = std::pair<QString, int>; using ContextualShortcut = std::pair<QString, int>;
using Shortcut = std::pair<QString, ContextualShortcut>; using Shortcut = std::pair<QString, ContextualShortcut>;
static const std::array<std::pair<QString, QString>, 2> themes = { using Themes = std::array<std::pair<const char*, const char*>, 2>;
{std::make_pair(QString("Default"), QString("default")), extern const Themes themes;
std::make_pair(QString("Dark"), QString("qdarkstyle"))}};
struct Values { struct Values {
QByteArray geometry; QByteArray geometry;