From 2e5866147eb24545e597d86f4e6621c2f2c63165 Mon Sep 17 00:00:00 2001
From: Romain Failliot <romain.failliot@foolstep.com>
Date: Sat, 13 Nov 2021 22:14:30 -0500
Subject: Replace "Light" theme by "Default"

This reflects the current behavior: Light = System default. If your
system is set to dark theme, then Light = Dark, which is a bit confusing
for the end user.

In this PR, I propose to change "Light" with "Default". This way, the
user has "Default" and "Default Colorful", which will apply the system
theme. Now that the Flatpak respects the system theme, I think this
makes much more sense.

I also simplified the theme update. Before the code was branching
between the default theme and the others, but I think we can have
something simpler by forcing the default theme if no theme is defined in
the settings, or if the selected theme doesn't exist. And if there's an
error, tell the theme name in the error message.
---
 src/yuzu/main.cpp       | 48 +++++++++++++++++++++++++-----------------------
 src/yuzu/uisettings.cpp |  4 ++--
 2 files changed, 27 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 4e5552d2a..cfda60997 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -3381,36 +3381,38 @@ void GMainWindow::filterBarSetChecked(bool state) {
 }
 
 void GMainWindow::UpdateUITheme() {
-    const QString default_icons = QStringLiteral("default");
-    const QString& current_theme = UISettings::values.theme;
-    const bool is_default_theme = current_theme == QString::fromUtf8(UISettings::themes[0].second);
+    const QString default_theme = QStringLiteral("default");
+    QString current_theme = UISettings::values.theme;
     QStringList theme_paths(default_theme_paths);
 
-    if (is_default_theme || current_theme.isEmpty()) {
-        const QString theme_uri(QStringLiteral(":default/style.qss"));
+    if (current_theme.isEmpty()) {
+        current_theme = default_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)) {
-            QTextStream ts(&f);
-            qApp->setStyleSheet(ts.readAll());
-            setStyleSheet(ts.readAll());
-        } else {
-            qApp->setStyleSheet({});
-            setStyleSheet({});
+        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;
         }
-        QIcon::setThemeName(default_icons);
+    }
+
+    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 {
-        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);
+        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);
 }
 
diff --git a/src/yuzu/uisettings.cpp b/src/yuzu/uisettings.cpp
index 37499fc85..21683576c 100644
--- a/src/yuzu/uisettings.cpp
+++ b/src/yuzu/uisettings.cpp
@@ -7,8 +7,8 @@
 namespace UISettings {
 
 const Themes themes{{
-    {"Light", "default"},
-    {"Light Colorful", "colorful"},
+    {"Default", "default"},
+    {"Default Colorful", "colorful"},
     {"Dark", "qdarkstyle"},
     {"Dark Colorful", "colorful_dark"},
     {"Midnight Blue", "qdarkstyle_midnight_blue"},
-- 
cgit v1.2.3