add theme setup wizard

Signed-off-by: Tayou <tayou@gmx.net>

6 files changed, 113 insertions, 17 deletions

diff --git a/launcher/ui/themes/ITheme.cpp b/launcher/ui/themes/ITheme.cpp
index 8bfc466d..22043e44 100644
--- a/launcher/ui/themes/ITheme.cpp
+++ b/launcher/ui/themes/ITheme.cpp
@@ -1,19 +1,51 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *
+ *  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 "ITheme.h"
 #include "rainbow.h"
 #include <QStyleFactory>
 #include <QDir>
 #include "Application.h"
 
-void ITheme::apply(bool)
+void ITheme::apply()
 {
     APPLICATION->setStyleSheet(QString());
     QApplication::setStyle(QStyleFactory::create(qtTheme()));
     if (hasColorScheme()) {
         QApplication::setPalette(colorScheme());
     }
-    if (hasStyleSheet())
-        APPLICATION->setStyleSheet(appStyleSheet());
-
+    APPLICATION->setStyleSheet(appStyleSheet());
     QDir::setSearchPaths("theme", searchPaths());
 }
 
diff --git a/launcher/ui/themes/ITheme.h b/launcher/ui/themes/ITheme.h
index c2347cf6..bb5c8afe 100644
--- a/launcher/ui/themes/ITheme.h
+++ b/launcher/ui/themes/ITheme.h
@@ -1,3 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *
+ *  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 <QString>
 #include <QPalette>
@@ -8,7 +42,7 @@ class ITheme
 {
 public:
     virtual ~ITheme() {}
-    virtual void apply(bool initial);
+    virtual void apply();
     virtual QString id() = 0;
     virtual QString name() = 0;
     virtual bool hasStyleSheet() = 0;
diff --git a/launcher/ui/themes/SystemTheme.cpp b/launcher/ui/themes/SystemTheme.cpp
index a63d1741..d6ef442b 100644
--- a/launcher/ui/themes/SystemTheme.cpp
+++ b/launcher/ui/themes/SystemTheme.cpp
@@ -62,14 +62,9 @@ SystemTheme::SystemTheme()
     themeDebugLog() << "System theme not found, defaulted to Fusion";
 }
 
-void SystemTheme::apply(bool initial)
+void SystemTheme::apply()
 {
-    // if we are applying the system theme as the first theme, just don't touch anything. it's for the better...
-    if(initial)
-    {
-        return;
-    }
-    ITheme::apply(initial);
+    ITheme::apply();
 }
 
 QString SystemTheme::id()
diff --git a/launcher/ui/themes/SystemTheme.h b/launcher/ui/themes/SystemTheme.h
index fe450600..5c9216eb 100644
--- a/launcher/ui/themes/SystemTheme.h
+++ b/launcher/ui/themes/SystemTheme.h
@@ -1,3 +1,37 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *
+ *  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 "ITheme.h"
@@ -7,7 +41,7 @@ class SystemTheme: public ITheme
 public:
     SystemTheme();
     virtual ~SystemTheme() {}
-    void apply(bool initial) override;
+    void apply() override;
 
     QString id() override;
     QString name() override;
diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp
index 5a612472..a6cebc6f 100644
--- a/launcher/ui/themes/ThemeManager.cpp
+++ b/launcher/ui/themes/ThemeManager.cpp
@@ -120,18 +120,18 @@ void ThemeManager::applyCurrentlySelectedTheme()
 {

     setIconTheme(APPLICATION->settings()->get("IconTheme").toString());

     themeDebugLog() << "<> Icon theme set.";

-    setApplicationTheme(APPLICATION->settings()->get("ApplicationTheme").toString(), true);

+    setApplicationTheme(APPLICATION->settings()->get("ApplicationTheme").toString());

     themeDebugLog() << "<> Application theme set.";

 }

 

-void ThemeManager::setApplicationTheme(const QString& name, bool initial)

+void ThemeManager::setApplicationTheme(const QString& name)

 {

     auto systemPalette = qApp->palette();

     auto themeIter = m_themes.find(name);

     if (themeIter != m_themes.end()) {

         auto& theme = themeIter->second;

         themeDebugLog() << "applying theme" << theme->name();

-        theme->apply(initial);

+        theme->apply();

     } else {

         themeWarningLog() << "Tried to set invalid theme:" << name;

     }

diff --git a/launcher/ui/themes/ThemeManager.h b/launcher/ui/themes/ThemeManager.h
index b85cb742..0a70ddfc 100644
--- a/launcher/ui/themes/ThemeManager.h
+++ b/launcher/ui/themes/ThemeManager.h
@@ -41,11 +41,12 @@ class ThemeManager {
     QList<ITheme*> getValidApplicationThemes();

     void setIconTheme(const QString& name);

     void applyCurrentlySelectedTheme();

-    void setApplicationTheme(const QString& name, bool initial);

+    void setApplicationTheme(const QString& name);

 

    private:

     std::map<QString, std::unique_ptr<ITheme>> m_themes;

     MainWindow* m_mainWindow;

+    bool m_firstThemeInitialized;

 

     QString AddTheme(std::unique_ptr<ITheme> theme);

     ITheme* GetTheme(QString themeId);