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

Merge pull request #7330 from MightyCreak/simplify-theme-selection 

Replace "Light" theme by "Default"
This commit is contained in:
bunnei 2021-11-25 01:52:48 -08:00 committed by GitHub
parent f078d3d212 2e5866147e
commit 06ad463ec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/yuzu/main.cpp
View File

@ -3472,36 +3472,38 @@ void GMainWindow::filterBarSetChecked(bool state) {
} }
void GMainWindow::UpdateUITheme() { void GMainWindow::UpdateUITheme() {
const QString default_icons = QStringLiteral("default"); const QString default_theme = QStringLiteral("default");
const QString& current_theme = UISettings::values.theme; QString current_theme = UISettings::values.theme;
const bool is_default_theme = current_theme == QString::fromUtf8(UISettings::themes[0].second);
QStringList theme_paths(default_theme_paths); QStringList theme_paths(default_theme_paths);
if (is_default_theme || current_theme.isEmpty()) { if (current_theme.isEmpty()) {
const QString theme_uri(QStringLiteral(":default/style.qss")); current_theme = default_theme;
QFile f(theme_uri);
if (f.open(QFile::ReadOnly | QFile::Text)) {
QTextStream ts(&f);
qApp->setStyleSheet(ts.readAll());
setStyleSheet(ts.readAll());
} else {
qApp->setStyleSheet({});
setStyleSheet({});
}
QIcon::setThemeName(default_icons);
} else {
const QString theme_uri(QLatin1Char{':'} + current_theme + QStringLiteral("/style.qss"));
QFile f(theme_uri);
if (f.open(QFile::ReadOnly | QFile::Text)) {
QTextStream ts(&f);
qApp->setStyleSheet(ts.readAll());
setStyleSheet(ts.readAll());
} else {
LOG_ERROR(Frontend, "Unable to set style, stylesheet file not found");
}
QIcon::setThemeName(current_theme);
} }
if (current_theme != default_theme) {
QString theme_uri{QStringLiteral(":%1/style.qss").arg(current_theme)};
QFile f(theme_uri);
if (!f.open(QFile::ReadOnly | QFile::Text)) {
LOG_ERROR(Frontend, "Unable to open style \"{}\", fallback to the default theme",
UISettings::values.theme.toStdString());
current_theme = default_theme;
}
}
QString theme_uri{QStringLiteral(":%1/style.qss").arg(current_theme)};
QFile f(theme_uri);
if (f.open(QFile::ReadOnly | QFile::Text)) {
QTextStream ts(&f);
qApp->setStyleSheet(ts.readAll());
setStyleSheet(ts.readAll());
} else {
LOG_ERROR(Frontend, "Unable to set style \"{}\", stylesheet file not found",
UISettings::values.theme.toStdString());
qApp->setStyleSheet({});
setStyleSheet({});
}
QIcon::setThemeName(current_theme);
QIcon::setThemeSearchPaths(theme_paths); QIcon::setThemeSearchPaths(theme_paths);
} }

4
src/yuzu/uisettings.cpp
View File

@ -7,8 +7,8 @@
namespace UISettings { namespace UISettings {
const Themes themes{{ const Themes themes{{
{"Light", "default"}, {"Default", "default"},
{"Light Colorful", "colorful"}, {"Default Colorful", "colorful"},
{"Dark", "qdarkstyle"}, {"Dark", "qdarkstyle"},
{"Dark Colorful", "colorful_dark"}, {"Dark Colorful", "colorful_dark"},
{"Midnight Blue", "qdarkstyle_midnight_blue"}, {"Midnight Blue", "qdarkstyle_midnight_blue"},