early-access version 2241
This commit is contained in:
parent
6ad4c4e120
commit
4b7b7d217c
3 changed files with 31 additions and 29 deletions
|
@ -1,7 +1,7 @@
|
||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 2240.
|
This is the source code for early-access 2241.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
|
|
@ -3481,36 +3481,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -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"},
|
||||||
|
|
Loading…
Reference in a new issue