N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4314 from FearlessTobi/port-1440

Browse source 
Port yuzu-emu/yuzu#1440: "ui_settings: Place definition of the theme array within the cpp file"
This commit is contained in:
Merry 2018-10-07 11:14:58 +01:00 committed by GitHub
commit a8155fdf48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/citra_qt/configuration/configure_general.cpp
View file

@ -31,7 +31,7 @@ ConfigureGeneral::ConfigureGeneral(QWidget* parent)
static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this,
&ConfigureGeneral::onLanguageChanged);
for (auto theme : UISettings::themes) {
for (const auto& theme : UISettings::themes) {
ui->theme_combobox->addItem(theme.first, theme.second);
}

10
src/citra_qt/ui_settings.cpp
View file

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

7
src/citra_qt/ui_settings.h
View file

@ -16,11 +16,8 @@ namespace UISettings {
using ContextualShortcut = std::pair<QString, int>;
using Shortcut = std::pair<QString, ContextualShortcut>;
static const std::array<std::pair<QString, QString>, 4> themes = {
{std::make_pair(QString("Default"), QString("default")),
std::make_pair(QString("Dark"), QString("qdarkstyle")),
std::make_pair(QString("Colorful"), QString("colorful")),
std::make_pair(QString("Colorful Dark"), QString("colorful_dark"))}};
using Themes = std::array<std::pair<const char*, const char*>, 4>;
extern const Themes themes;
struct GameDir {
QString path;