Merge pull request #2596 from TayouVR/more-system-themes

Display all system themes in widget theme selector

launcher/ui/themes/BrightTheme.cpp

@@ -1,3 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
 #include "BrightTheme.h"
 
 #include <QObject>
@@ -55,3 +89,7 @@ QString BrightTheme::appStyleSheet()
 {
     return QString();
 }
+QString BrightTheme::tooltip()
+{
+    return QString();
+}

launcher/ui/themes/BrightTheme.h

@@ -1,3 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
 #pragma once
 
 #include "FusionTheme.h"
@@ -8,6 +42,7 @@ class BrightTheme : public FusionTheme {
 
     QString id() override;
     QString name() override;
+    QString tooltip() override;
     bool hasStyleSheet() override;
     QString appStyleSheet() override;
     bool hasColorScheme() override;

launcher/ui/themes/CustomTheme.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -285,3 +285,7 @@ QString CustomTheme::qtTheme()
 {
     return m_widgets;
 }
+QString CustomTheme::tooltip()
+{
+    return m_tooltip;
+}

launcher/ui/themes/CustomTheme.h

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -44,6 +44,7 @@ class CustomTheme : public ITheme {
 
     QString id() override;
     QString name() override;
+    QString tooltip() override;
     bool hasStyleSheet() override;
     QString appStyleSheet() override;
     bool hasColorScheme() override;
@@ -62,4 +63,10 @@ class CustomTheme : public ITheme {
     QString m_id;
     QString m_widgets;
     QString m_qssFilePath;
+    /**
+     * The tooltip could be defined in the theme json,
+     * or composed of other fields that could be in there.
+     * like author, license, etc.
+     */
+    QString m_tooltip = "";
 };

launcher/ui/themes/DarkTheme.cpp

@@ -1,3 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
 #include "DarkTheme.h"
 
 #include <QObject>
@@ -56,3 +90,7 @@ QString DarkTheme::appStyleSheet()
 {
     return "QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }";
 }
+QString DarkTheme::tooltip()
+{
+    return "";
+}

launcher/ui/themes/DarkTheme.h

@@ -1,3 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
 #pragma once
 
 #include "FusionTheme.h"
@@ -8,6 +42,7 @@ class DarkTheme : public FusionTheme {
 
     QString id() override;
     QString name() override;
+    QString tooltip() override;
     bool hasStyleSheet() override;
     QString appStyleSheet() override;
     bool hasColorScheme() override;

launcher/ui/themes/ITheme.h

@@ -44,6 +44,7 @@ class ITheme {
     virtual void apply(bool initial);
     virtual QString id() = 0;
     virtual QString name() = 0;
+    virtual QString tooltip() = 0;
     virtual bool hasStyleSheet() = 0;
     virtual QString appStyleSheet() = 0;
     virtual QString qtTheme() = 0;

launcher/ui/themes/SystemTheme.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
  *  Copyright (C) 2024 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -35,31 +35,16 @@
  */
 #include "SystemTheme.h"
 #include <QApplication>
-#include <QDebug>
 #include <QStyle>
 #include <QStyleFactory>
 #include "HintOverrideProxyStyle.h"
 #include "ThemeManager.h"
 
-SystemTheme::SystemTheme()
+SystemTheme::SystemTheme(QString& styleName, bool isSystemTheme)
 {
-    themeDebugLog() << "Determining System Theme...";
-    const auto& style = QApplication::style();
-    systemPalette = QApplication::palette();
-    QString lowerThemeName = style->objectName();
-    themeDebugLog() << "System theme seems to be:" << lowerThemeName;
-    QStringList styles = QStyleFactory::keys();
-    for (auto& st : styles) {
-        themeDebugLog() << "Considering theme from theme factory:" << st.toLower();
-        if (st.toLower() == lowerThemeName) {
-            systemTheme = st;
-            themeDebugLog() << "System theme has been determined to be:" << systemTheme;
-            return;
-        }
-    }
-    // fall back to fusion if we can't find the current theme.
-    systemTheme = "Fusion";
-    themeDebugLog() << "System theme not found, defaulted to Fusion";
+    themeName = isSystemTheme ? "system" : styleName;
+    widgetTheme = styleName;
+    colorPalette = QApplication::palette();
 }
 
 void SystemTheme::apply(bool initial)
@@ -76,22 +61,49 @@ void SystemTheme::apply(bool initial)
 
 QString SystemTheme::id()
 {
-    return "system";
+    return themeName;
 }
 
 QString SystemTheme::name()
 {
+    if (themeName.toLower() == "windowsvista") {
+        return QObject::tr("Windows Vista");
+    } else if (themeName.toLower() == "windows") {
+        return QObject::tr("Windows 9x");
+    } else if (themeName.toLower() == "windows11") {
+        return QObject::tr("Windows 11");
+    } else if (themeName.toLower() == "system") {
         return QObject::tr("System");
+    } else {
+        return themeName;
+    }
+}
+
+QString SystemTheme::tooltip()
+{
+    if (themeName.toLower() == "windowsvista") {
+        return QObject::tr("Widget style trying to look like your win32 theme");
+    } else if (themeName.toLower() == "windows") {
+        return QObject::tr("Windows 9x inspired widget style");
+    } else if (themeName.toLower() == "windows11") {
+        return QObject::tr("WinUI 3 inspired Qt widget style");
+    } else if (themeName.toLower() == "fusion") {
+        return QObject::tr("The default Qt widget style");
+    } else if (themeName.toLower() == "system") {
+        return QObject::tr("Your current system theme");
+    } else {
+        return "";
+    }
 }
 
 QString SystemTheme::qtTheme()
 {
-    return systemTheme;
+    return widgetTheme;
 }
 
 QPalette SystemTheme::colorScheme()
 {
-    return systemPalette;
+    return colorPalette;
 }
 
 QString SystemTheme::appStyleSheet()

launcher/ui/themes/SystemTheme.h

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -38,12 +38,13 @@
 
 class SystemTheme : public ITheme {
    public:
-    SystemTheme();
+    SystemTheme(QString& themeName, bool isSystemTheme = false);
     virtual ~SystemTheme() {}
     void apply(bool initial) override;
 
     QString id() override;
     QString name() override;
+    QString tooltip() override;
     QString qtTheme() override;
     bool hasStyleSheet() override;
     QString appStyleSheet() override;
@@ -53,6 +54,7 @@ class SystemTheme : public ITheme {
     QColor fadeColor() override;
 
    private:
-    QPalette systemPalette;
-    QString systemTheme;
+    QPalette colorPalette;
+    QString widgetTheme;
+    QString themeName;
 };

launcher/ui/themes/ThemeManager.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
  *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -23,6 +23,8 @@
 #include <QDirIterator>
 #include <QIcon>
 #include <QImageReader>
+#include <QStyle>
+#include <QStyleFactory>
 #include "Exception.h"
 #include "ui/themes/BrightTheme.h"
 #include "ui/themes/CatPack.h"
@@ -119,14 +121,30 @@ void ThemeManager::initializeIcons()
 
 void ThemeManager::initializeWidgets()
 {
+    themeDebugLog() << "Determining System Widget Theme...";
+    const auto& style = QApplication::style();
+    currentlySelectedSystemTheme = style->objectName();
+    themeDebugLog() << "System theme seems to be:" << currentlySelectedSystemTheme;
+
     themeDebugLog() << "<> Initializing Widget Themes";
-    themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<SystemTheme>());
+    themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<SystemTheme>(currentlySelectedSystemTheme, true));
     auto darkThemeId = addTheme(std::make_unique<DarkTheme>());
     themeDebugLog() << "Loading Built-in Theme:" << darkThemeId;
     themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<BrightTheme>());
 
-    // TODO: need some way to differentiate same name themes in different subdirectories (maybe smaller grey text next to theme name in
-    // dropdown?)
+    themeDebugLog() << "<> Initializing System Widget Themes";
+    QStringList styles = QStyleFactory::keys();
+    for (auto& st : styles) {
+#ifdef Q_OS_WINDOWS
+        if (QSysInfo::productVersion() != "11" && st == "windows11") {
+            continue;
+        }
+#endif
+        themeDebugLog() << "Loading System Theme:" << addTheme(std::make_unique<SystemTheme>(st));
+    }
+
+    // TODO: need some way to differentiate same name themes in different subdirectories
+    //  (maybe smaller grey text next to theme name in dropdown?)
 
     if (!m_applicationThemeFolder.mkpath("."))
         themeWarningLog() << "Couldn't create theme folder";
@@ -238,7 +256,11 @@ void ThemeManager::applyCurrentlySelectedTheme(bool initial)
     auto settings = APPLICATION->settings();
     setIconTheme(settings->get("IconTheme").toString());
     themeDebugLog() << "<> Icon theme set.";
-    setApplicationTheme(settings->get("ApplicationTheme").toString(), initial);
+    auto applicationTheme = settings->get("ApplicationTheme").toString();
+    if (applicationTheme == "") {
+        applicationTheme = currentlySelectedSystemTheme;
+    }
+    setApplicationTheme(applicationTheme, initial);
     themeDebugLog() << "<> Application theme set.";
 }
 

launcher/ui/themes/ThemeManager.h

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
  *  Copyright (C) 2023 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -64,6 +64,7 @@ class ThemeManager {
     QDir m_applicationThemeFolder{ "themes" };
     QDir m_catPacksFolder{ "catpacks" };
     std::map<QString, std::unique_ptr<CatPack>> m_cat_packs;
+    QString currentlySelectedSystemTheme;
 
     void initializeThemes();
     void initializeCatPacks();

launcher/ui/widgets/ThemeCustomizationWidget.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Tayou <git@tayou.org>
+ *  Copyright (C) 2024 Tayou <git@tayou.org>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -151,6 +151,10 @@ void ThemeCustomizationWidget::loadSettings()
         int idx = 0;
         for (auto& theme : themes) {
             ui->widgetStyleComboBox->addItem(theme->name(), theme->id());
+            if (theme->tooltip() != "") {
+                int index = ui->widgetStyleComboBox->count() - 1;
+                ui->widgetStyleComboBox->setItemData(index, theme->tooltip(), Qt::ToolTipRole);
+            }
             if (currentTheme == theme->id()) {
                 ui->widgetStyleComboBox->setCurrentIndex(idx);
             }