add theme setup wizard

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

15 files changed, 958 insertions, 281 deletions

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index e913849d..331ca0e1 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1346,7 +1346,7 @@ void MainWindow::updateThemeMenu()
         themeAction->setActionGroup(themesGroup);
 
         connect(themeAction, &QAction::triggered, [theme]() {
-            APPLICATION->setApplicationTheme(theme->id(),false);
+            APPLICATION->setApplicationTheme(theme->id());
             APPLICATION->settings()->set("ApplicationTheme", theme->id());
         });
     }
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index bd7cec6a..69a8e3df 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -286,75 +286,6 @@ void LauncherPage::applySettings()
     }
 
     s->set("UpdateChannel", m_currentUpdateChannel);
-    auto original = s->get("IconTheme").toString();
-    //FIXME: make generic
-    switch (ui->themeComboBox->currentIndex())
-    {
-    case 0:
-        s->set("IconTheme", "pe_colored");
-        break;
-    case 1:
-        s->set("IconTheme", "pe_light");
-        break;
-    case 2:
-        s->set("IconTheme", "pe_dark");
-        break;
-    case 3:
-        s->set("IconTheme", "pe_blue");
-        break;
-    case 4:
-        s->set("IconTheme", "breeze_light");
-        break;
-    case 5:
-        s->set("IconTheme", "breeze_dark");
-        break;
-    case 6:
-        s->set("IconTheme", "OSX");
-        break;
-    case 7:
-        s->set("IconTheme", "iOS");
-        break;
-    case 8:
-        s->set("IconTheme", "flat");
-        break;
-    case 9:
-        s->set("IconTheme", "flat_white");
-        break;
-    case 10:
-        s->set("IconTheme", "multimc");
-        break;
-    case 11:
-        s->set("IconTheme", "custom");
-        break;
-    }
-
-    if(original != s->get("IconTheme"))
-    {
-        APPLICATION->setIconTheme(s->get("IconTheme").toString());
-    }
-
-    auto originalAppTheme = s->get("ApplicationTheme").toString();
-    auto newAppTheme = ui->themeComboBoxColors->currentData().toString();
-    if(originalAppTheme != newAppTheme)
-    {
-        s->set("ApplicationTheme", newAppTheme);
-        APPLICATION->setApplicationTheme(newAppTheme, false);
-    }
-
-    switch (ui->themeBackgroundCat->currentIndex()) {
-    case 0: // original cat
-        s->set("BackgroundCat", "kitteh");
-        break;
-    case 1: // rory the cat
-        s->set("BackgroundCat", "rory");
-        break;
-    case 2: // rory the cat flat edition
-        s->set("BackgroundCat", "rory-flat");
-        break;
-    case 3: // teawie
-        s->set("BackgroundCat", "teawie");
-        break;
-    }
 
     s->set("MenuBarInsteadOfToolBar", ui->preferMenuBarCheckBox->isChecked());
 
@@ -404,47 +335,6 @@ void LauncherPage::loadSettings()
     }
 
     m_currentUpdateChannel = s->get("UpdateChannel").toString();
-    //FIXME: make generic
-    auto theme = s->get("IconTheme").toString();
-    QStringList iconThemeOptions{"pe_colored", 
-                                 "pe_light", 
-                                 "pe_dark", 
-                                 "pe_blue", 
-                                 "breeze_light", 
-                                 "breeze_dark", 
-                                 "OSX", 
-                                 "iOS", 
-                                 "flat", 
-                                 "flat_white", 
-                                 "multimc", 
-                                 "custom"};
-    ui->themeComboBox->setCurrentIndex(iconThemeOptions.indexOf(theme));
-
-    auto cat = s->get("BackgroundCat").toString();
-    if (cat == "kitteh") {
-        ui->themeBackgroundCat->setCurrentIndex(0);
-    } else if (cat == "rory") {
-        ui->themeBackgroundCat->setCurrentIndex(1);
-    } else if (cat == "rory-flat") {
-        ui->themeBackgroundCat->setCurrentIndex(2);
-    } else if (cat == "teawie") {
-        ui->themeBackgroundCat->setCurrentIndex(3);
-    }
-
-    {
-        auto currentTheme = s->get("ApplicationTheme").toString();
-        auto themes = APPLICATION->getValidApplicationThemes();
-        int idx = 0;
-        for(auto &theme: themes)
-        {
-            ui->themeComboBoxColors->addItem(theme->name(), theme->id());
-            if(currentTheme == theme->id())
-            {
-                ui->themeComboBoxColors->setCurrentIndex(idx);
-            }
-            idx++;
-        }
-    }
 
     // Toolbar/menu bar settings (not applicable if native menu bar is present)
     ui->toolsBox->setEnabled(!QMenuBar().isNativeMenuBar());
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index ded333aa..65f4a9d5 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>514</width>
+    <width>511</width>
     <height>629</height>
    </rect>
   </property>
@@ -38,7 +38,7 @@
       <enum>QTabWidget::Rounded</enum>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="featuresTab">
       <attribute name="title">
@@ -243,155 +243,9 @@
          <property name="title">
           <string>Theme</string>
          </property>
-         <layout class="QFormLayout" name="formLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>&amp;Icons</string>
-            </property>
-            <property name="buddy">
-             <cstring>themeComboBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="themeComboBox">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::StrongFocus</enum>
-            </property>
-            <item>
-             <property name="text">
-              <string>Simple (Colored Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Light Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Dark Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Blue Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Breeze Light</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Breeze Dark</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string notr="true">OSX</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string notr="true">iOS</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Flat</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Flat (White)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Legacy</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Custom</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>&amp;Colors</string>
-            </property>
-            <property name="buddy">
-             <cstring>themeComboBoxColors</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="themeComboBoxColors">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::StrongFocus</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_5">
-            <property name="text">
-             <string>C&amp;at</string>
-            </property>
-            <property name="buddy">
-             <cstring>themeBackgroundCat</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QComboBox" name="themeBackgroundCat">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::StrongFocus</enum>
-            </property>
-            <item>
-             <property name="text">
-              <string>Background Cat (from MultiMC)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Rory ID 11 (drawn by Ashtaka)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Rory ID 11 (flat edition, drawn by Ashtaka)</string>
-             </property>
-            </item>
-            <item>
-              <property name="text">
-                <string>Teawie (drawn by SympathyTea)</string>
-              </property>
-            </item>
-           </widget>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
+          <item>
+           <widget class="ThemeCustomizationWidget" name="themeCustomizationWidget" native="true"/>
           </item>
          </layout>
         </widget>
@@ -575,6 +429,14 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ThemeCustomizationWidget</class>
+   <extends>QWidget</extends>
+   <header>ui/widgets/ThemeCustomizationWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>tabWidget</tabstop>
   <tabstop>autoUpdateCheckBox</tabstop>
@@ -587,8 +449,6 @@
   <tabstop>iconsDirBrowseBtn</tabstop>
   <tabstop>sortLastLaunchedBtn</tabstop>
   <tabstop>sortByNameBtn</tabstop>
-  <tabstop>themeComboBox</tabstop>
-  <tabstop>themeComboBoxColors</tabstop>
   <tabstop>showConsoleCheck</tabstop>
   <tabstop>autoCloseConsoleCheck</tabstop>
   <tabstop>showConsoleErrorCheck</tabstop>
diff --git a/launcher/ui/setupwizard/ThemeWizardPage.cpp b/launcher/ui/setupwizard/ThemeWizardPage.cpp
new file mode 100644
index 00000000..6f041134
--- /dev/null
+++ b/launcher/ui/setupwizard/ThemeWizardPage.cpp
@@ -0,0 +1,70 @@
+// 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/>.

+ */

+#include "ThemeWizardPage.h"

+#include "ui_ThemeWizardPage.h"

+

+#include "Application.h"

+#include "ui/themes/ITheme.h"

+#include "ui/widgets/ThemeCustomizationWidget.h"

+#include "ui_ThemeCustomizationWidget.h"

+

+ThemeWizardPage::ThemeWizardPage(QWidget *parent) :

+BaseWizardPage(parent),

+ui(new Ui::ThemeWizardPage) {

+    ui->setupUi(this);

+

+    ui->themeCustomizationWidget->showFeatures((ThemeFields)(ThemeFields::ICONS | ThemeFields::WIDGETS)); 

+    connect(ui->themeCustomizationWidget, QOverload<int>::of(&ThemeCustomizationWidget::currentIconThemeChanged), this, &ThemeWizardPage::updateIcons);

+

+    updateIcons();

+}

+

+ThemeWizardPage::~ThemeWizardPage() {

+delete ui;

+}

+

+void ThemeWizardPage::initializePage()

+{

+}

+

+bool ThemeWizardPage::validatePage()

+{

+    return true;

+}

+

+void ThemeWizardPage::updateIcons() {

+    qDebug() << "Setting Icons";

+    ui->previewIconButton0->setIcon(APPLICATION->getThemedIcon("new"));

+    ui->previewIconButton1->setIcon(APPLICATION->getThemedIcon("centralmods"));

+    ui->previewIconButton2->setIcon(APPLICATION->getThemedIcon("viewfolder"));

+    ui->previewIconButton3->setIcon(APPLICATION->getThemedIcon("launch"));

+    ui->previewIconButton4->setIcon(APPLICATION->getThemedIcon("copy"));

+    ui->previewIconButton5->setIcon(APPLICATION->getThemedIcon("export"));

+    ui->previewIconButton6->setIcon(APPLICATION->getThemedIcon("delete"));

+    ui->previewIconButton7->setIcon(APPLICATION->getThemedIcon("about"));

+    ui->previewIconButton8->setIcon(APPLICATION->getThemedIcon("settings"));

+    ui->previewIconButton9->setIcon(APPLICATION->getThemedIcon("cat"));

+    update();

+    repaint();

+    parentWidget()->update();

+}

+

+void ThemeWizardPage::retranslate()

+{

+    ui->retranslateUi(this);

+}

diff --git a/launcher/ui/setupwizard/ThemeWizardPage.h b/launcher/ui/setupwizard/ThemeWizardPage.h
new file mode 100644
index 00000000..10913d1b
--- /dev/null
+++ b/launcher/ui/setupwizard/ThemeWizardPage.h
@@ -0,0 +1,44 @@
+// 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/>.

+ */

+#pragma once

+

+#include <QWidget>

+#include "BaseWizardPage.h"

+

+namespace Ui {

+class ThemeWizardPage;

+}

+

+class ThemeWizardPage : public BaseWizardPage

+{

+    Q_OBJECT

+

+public:

+    explicit ThemeWizardPage(QWidget *parent = nullptr);

+    ~ThemeWizardPage();

+

+    void initializePage() override;

+    bool validatePage() override;

+    void retranslate() override;

+

+private slots:

+    void updateIcons();

+

+private:

+    Ui::ThemeWizardPage *ui;

+};

diff --git a/launcher/ui/setupwizard/ThemeWizardPage.ui b/launcher/ui/setupwizard/ThemeWizardPage.ui
new file mode 100644
index 00000000..b743644f
--- /dev/null
+++ b/launcher/ui/setupwizard/ThemeWizardPage.ui
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<ui version="4.0">

+ <class>ThemeWizardPage</class>

+ <widget class="QWizardPage" name="ThemeWizardPage">

+  <property name="geometry">

+   <rect>

+    <x>0</x>

+    <y>0</y>

+    <width>400</width>

+    <height>300</height>

+   </rect>

+  </property>

+  <property name="windowTitle">

+   <string>WizardPage</string>

+  </property>

+  <layout class="QVBoxLayout" name="verticalLayout_2">

+   <item>

+    <widget class="QLabel" name="label">

+     <property name="text">

+      <string>Select the Theme you wish to use</string>

+     </property>

+    </widget>

+   </item>

+   <item>

+    <widget class="ThemeCustomizationWidget" name="themeCustomizationWidget" native="true">

+     <property name="minimumSize">

+      <size>

+       <width>0</width>

+       <height>100</height>

+      </size>

+     </property>

+    </widget>

+   </item>

+   <item>

+    <widget class="Line" name="line">

+     <property name="orientation">

+      <enum>Qt::Horizontal</enum>

+     </property>

+    </widget>

+   </item>

+   <item>

+    <widget class="QLabel" name="label_4">

+     <property name="text">

+      <string>Icon Preview:</string>

+     </property>

+    </widget>

+   </item>

+   <item>

+    <layout class="QGridLayout" name="iconPreview">

+     <item row="0" column="2">

+      <widget class="QPushButton" name="previewIconButton2">

+       <property name="sizePolicy">

+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">

+         <horstretch>0</horstretch>

+         <verstretch>0</verstretch>

+        </sizepolicy>

+       </property>

+       <property name="minimumSize">

+        <size>

+         <width>30</width>

+         <height>30</height>

+        </size>

+       </property>

+       <property name="icon">

+        <iconset theme="applications-engineering">

+         <normaloff>.</normaloff>.</iconset>

+       </property>

+       <property name="checkable">

+        <bool>false</bool>

+       </property>

+       <property name="flat">

+        <bool>true</bool>

+       </property>

+      </widget>

+     </item>

+     <item row="0" column="5">

+      <widget class="QPushButton" name="previewIconButton5">

+       <property name="sizePolicy">

+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">

+         <horstretch>0</horstretch>

+         <verstretch>0</verstretch>

+        </sizepolicy>

+       </property>

+       <property name="minimumSize">

+        <size>

+         <width>30</width>

+         <height>30</height>

+        </size>

+       </property>

+       <property name="icon">

+        <iconset theme="applications-engineering">

+         <normaloff>.</normaloff>.</iconset>

+       </property>

+       <property name="checkable">

+        <bool>false</bool>

+       </property>

+       <property name="flat">

+        <bool>true</bool>

+       </property>

+      </widget>

+     </item>

+     <item row="0" column="7">

+      <widget class="QPushButton" name="previewIconButton7">

+       <property name="sizePolicy">

+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">

+         <horstretch>0</horstretch>

+         <verstretch>0</verstretch>

+        </sizepolicy>

+       </property>

+       <property name="minimumSize">

+        <size>

+         <width>30</width>

+         <height>30</height>

+        </size>

+       </property>

+       <property name="icon">

+        <iconset theme="applications-engineering">

+         <normaloff>.</normaloff>.</iconset>

+       </property>

+       <property name="checkable">

+        <bool>false</bool>

+       </property>

+       <property name="flat">

+        <bool>true</bool>

+       </property>

+      </widget>

+     </item>

+     <item row="0" column="4">

+      <widget class="QPushButton" name="previewIconButton4">

+       <property name="sizePolicy">

+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">

+         <horstretch>0</horstretch>

+         <verstretch>0</verstretch>

+        </sizepolicy>

+       </property>

+       <property name="minimumSize">

+        <size>

+         <width>30</width>

+         <height>30</height>

+        </size>

+       </property>

+       <property name="icon">

+        <iconset theme="applications-engineering">

+         <normaloff>.</normaloff>.</iconset>

+       </property>

+       <property name="checkable">

+        <bool>false</bool>

+       </property>

+       <property name="flat">

+        <bool>true</bool>

+       </property>

+      </widget>

+     </item>

+     <item row="0" column="1">

+      <widget class="QPushButton" name="previewIconButton1">

+       <property name="sizePolicy">

+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">

+         <horstretch>0</horstretch>

+         <verstretch>0</verstretch>

+        </sizepolicy>

+       </property>

+       <property name="minimumSize">

+        <size>

+         <width>30</width>

+         <height>30</height>

+        </size>

+       </property>

+       <property name="icon">

+        <iconset theme="centralmods">

+         <normaloff>.</normaloff>.</iconset>

+       </property>

+       <property name="checkable">

+        <bool>false</bool>

+       </property>

+       <property name="flat">

+        <bool>true</bool>

+       </property>

+      </widget>

+     </item>

+     <item row="0" column="0">

+      <widget class="QPushButton" name="previewIconButton0">

+       <property name="sizePolicy">

+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">

+         <horstretch>0</horstretch>

+         <verstretch>0</verstretch>

+        </sizepolicy>

+       </property>

+       <property name="minimumSize">

+        <size>

+         <width>30</width>

+         <height>30</height>

+        </size>

+       </property>

+       <property name="icon">

+        <iconset theme="applications-engineering">

+         <normaloff>.</normaloff>.</iconset>

+       </property>

+       <property name="checkable">

+        <bool>false</bool>

+       </property>

+       <property name="flat">

+        <bool>true</bool>

+       </property>

+      </widget>

+     </item>

+     <item row="0" column="9">

+      <widget class="QPushButton" name="previewIconButton9">

+       <property name="sizePolicy">

+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">

+         <horstretch>0</horstretch>

+         <verstretch>0</verstretch>

+        </sizepolicy>

+       </property>

+       <property name="minimumSize">

+        <size>

+         <width>30</width>

+         <height>30</height>

+        </size>

+       </property>

+       <property name="icon">

+        <iconset theme="viewfolder">

+         <normaloff>.</normaloff>.</iconset>

+       </property>

+       <property name="checkable">

+        <bool>false</bool>

+       </property>

+       <property name="flat">

+        <bool>true</bool>

+       </property>

+      </widget>

+     </item>

+     <item row="0" column="6">

+      <widget class="QPushButton" name="previewIconButton6">

+       <property name="sizePolicy">

+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">

+         <horstretch>0</horstretch>

+         <verstretch>0</verstretch>

+        </sizepolicy>

+       </property>

+       <property name="minimumSize">

+        <size>

+         <width>30</width>

+         <height>30</height>

+        </size>

+       </property>

+       <property name="icon">

+        <iconset theme="new">

+         <normaloff>.</normaloff>.</iconset>

+       </property>

+       <property name="checkable">

+        <bool>false</bool>

+       </property>

+       <property name="flat">

+        <bool>true</bool>

+       </property>

+      </widget>

+     </item>

+     <item row="0" column="3">

+      <widget class="QPushButton" name="previewIconButton3">

+       <property name="sizePolicy">

+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">

+         <horstretch>0</horstretch>

+         <verstretch>0</verstretch>

+        </sizepolicy>

+       </property>

+       <property name="minimumSize">

+        <size>

+         <width>30</width>

+         <height>30</height>

+        </size>

+       </property>

+       <property name="icon">

+        <iconset theme="applications-engineering">

+         <normaloff>.</normaloff>.</iconset>

+       </property>

+       <property name="checkable">

+        <bool>false</bool>

+       </property>

+       <property name="flat">

+        <bool>true</bool>

+       </property>

+      </widget>

+     </item>

+     <item row="0" column="8">

+      <widget class="QPushButton" name="previewIconButton8">

+       <property name="sizePolicy">

+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">

+         <horstretch>0</horstretch>

+         <verstretch>0</verstretch>

+        </sizepolicy>

+       </property>

+       <property name="minimumSize">

+        <size>

+         <width>30</width>

+         <height>30</height>

+        </size>

+       </property>

+       <property name="icon">

+        <iconset theme="applications-engineering">

+         <normaloff>.</normaloff>.</iconset>

+       </property>

+       <property name="checkable">

+        <bool>false</bool>

+       </property>

+       <property name="flat">

+        <bool>true</bool>

+       </property>

+      </widget>

+     </item>

+    </layout>

+   </item>

+   <item>

+    <spacer name="verticalSpacer">

+     <property name="orientation">

+      <enum>Qt::Vertical</enum>

+     </property>

+     <property name="sizeHint" stdset="0">

+      <size>

+       <width>20</width>

+       <height>193</height>

+      </size>

+     </property>

+    </spacer>

+   </item>

+  </layout>

+ </widget>

+ <customwidgets>

+  <customwidget>

+   <class>ThemeCustomizationWidget</class>

+   <extends>QWidget</extends>

+   <header>ui/widgets/ThemeCustomizationWidget.h</header>

+  </customwidget>

+ </customwidgets>

+ <resources/>

+ <connections/>

+</ui>

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);

diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.cpp b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
new file mode 100644
index 00000000..0830a030
--- /dev/null
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
@@ -0,0 +1,135 @@
+// 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/>.

+ */

+#include "ThemeCustomizationWidget.h"

+#include "ui_ThemeCustomizationWidget.h"

+

+#include "Application.h"

+#include "ui/themes/ITheme.h"

+

+ThemeCustomizationWidget::ThemeCustomizationWidget(QWidget *parent) : QWidget(parent), ui(new Ui::ThemeCustomizationWidget)

+{

+    ui->setupUi(this);

+    loadSettings();

+

+    connect(ui->iconsComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyIconTheme);

+    connect(ui->widgetStyleComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyWidgetTheme);

+    connect(ui->backgroundCatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyCatTheme);

+}

+

+ThemeCustomizationWidget::~ThemeCustomizationWidget()

+{

+    delete ui;

+}

+

+void ThemeCustomizationWidget::showFeatures(ThemeFields features) {

+    ui->iconsComboBox->setVisible(features & ThemeFields::ICONS);

+    ui->iconsLabel->setVisible(features & ThemeFields::ICONS);

+    ui->widgetStyleComboBox->setVisible(features & ThemeFields::WIDGETS);

+    ui->widgetThemeLabel->setVisible(features & ThemeFields::WIDGETS);

+    ui->backgroundCatComboBox->setVisible(features & ThemeFields::CAT);

+    ui->backgroundCatLabel->setVisible(features & ThemeFields::CAT);

+}

+

+void ThemeCustomizationWidget::applyIconTheme(int index) {

+    emit currentIconThemeChanged(index);

+

+    auto settings = APPLICATION->settings();

+    auto original = settings->get("IconTheme").toString();

+    // FIXME: make generic

+    settings->set("IconTheme", m_iconThemeOptions[index]);

+

+    if (original != settings->get("IconTheme")) {

+        APPLICATION->applyCurrentlySelectedTheme();

+    }

+}

+

+void ThemeCustomizationWidget::applyWidgetTheme(int index) {

+    emit currentWidgetThemeChanged(index);

+

+    auto settings = APPLICATION->settings();

+    auto originalAppTheme = settings->get("ApplicationTheme").toString();

+    auto newAppTheme = ui->widgetStyleComboBox->currentData().toString();

+    if (originalAppTheme != newAppTheme) {

+        settings->set("ApplicationTheme", newAppTheme);

+        APPLICATION->applyCurrentlySelectedTheme();

+    }

+}

+

+void ThemeCustomizationWidget::applyCatTheme(int index) {

+    emit currentCatChanged(index);

+

+    auto settings = APPLICATION->settings();

+    switch (index) {

+        case 0: // original cat

+            settings->set("BackgroundCat", "kitteh");

+            break;

+        case 1: // rory the cat

+            settings->set("BackgroundCat", "rory");

+            break;

+        case 2: // rory the cat flat edition

+            settings->set("BackgroundCat", "rory-flat");

+            break;

+        case 3:  // teawie

+            settings->set("BackgroundCat", "teawie");

+            break;

+    }

+}

+

+void ThemeCustomizationWidget::applySettings()

+{

+    applyIconTheme(ui->iconsComboBox->currentIndex());

+    applyWidgetTheme(ui->widgetStyleComboBox->currentIndex());

+    applyCatTheme(ui->backgroundCatComboBox->currentIndex());

+}

+void ThemeCustomizationWidget::loadSettings()

+{

+    auto settings = APPLICATION->settings();

+

+    // FIXME: make generic

+    auto theme = settings->get("IconTheme").toString();

+    ui->iconsComboBox->setCurrentIndex(m_iconThemeOptions.indexOf(theme));

+

+    {

+        auto currentTheme = settings->get("ApplicationTheme").toString();

+        auto themes = APPLICATION->getValidApplicationThemes();

+        int idx = 0;

+        for (auto& theme : themes) {

+            ui->widgetStyleComboBox->addItem(theme->name(), theme->id());

+            if (currentTheme == theme->id()) {

+                ui->widgetStyleComboBox->setCurrentIndex(idx);

+            }

+            idx++;

+        }

+    }

+

+    auto cat = settings->get("BackgroundCat").toString();

+    if (cat == "kitteh") {

+        ui->backgroundCatComboBox->setCurrentIndex(0);

+    } else if (cat == "rory") {

+        ui->backgroundCatComboBox->setCurrentIndex(1);

+    } else if (cat == "rory-flat") {

+        ui->backgroundCatComboBox->setCurrentIndex(2);

+    } else if (cat == "teawie") {

+        ui->backgroundCatComboBox->setCurrentIndex(3);

+    }

+}

+

+void ThemeCustomizationWidget::retranslate()

+{

+    ui->retranslateUi(this);

+}
\ No newline at end of file
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.h b/launcher/ui/widgets/ThemeCustomizationWidget.h
new file mode 100644
index 00000000..e17286e1
--- /dev/null
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.h
@@ -0,0 +1,64 @@
+// 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/>.

+ */

+#pragma once

+

+#include <QWidget>

+#include <translations/TranslationsModel.h>

+

+enum ThemeFields { 

+    NONE    = 0b0000,

+    ICONS   = 0b0001,

+    WIDGETS = 0b0010,

+    CAT     = 0b0100

+};

+

+namespace Ui {

+class ThemeCustomizationWidget;

+}

+

+class ThemeCustomizationWidget : public QWidget

+{

+    Q_OBJECT

+

+public:

+    explicit ThemeCustomizationWidget(QWidget *parent = nullptr);

+    ~ThemeCustomizationWidget();

+

+    void showFeatures(ThemeFields features);

+

+    void applySettings();

+

+    void loadSettings();

+    void retranslate();

+    

+    Ui::ThemeCustomizationWidget *ui;

+

+private slots:

+    void applyIconTheme(int index);

+    void applyWidgetTheme(int index);

+    void applyCatTheme(int index);

+

+signals:

+    int currentIconThemeChanged(int index);

+    int currentWidgetThemeChanged(int index);

+    int currentCatChanged(int index);

+

+private:

+

+    QStringList m_iconThemeOptions{ "pe_colored", "pe_light", "pe_dark", "pe_blue", "breeze_light", "breeze_dark", "OSX", "iOS", "flat", "flat_white", "multimc", "custom" };

+};

diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.ui b/launcher/ui/widgets/ThemeCustomizationWidget.ui
new file mode 100644
index 00000000..c184b8f3
--- /dev/null
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.ui
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<ui version="4.0">

+ <class>ThemeCustomizationWidget</class>

+ <widget class="QWidget" name="ThemeCustomizationWidget">

+  <property name="geometry">

+   <rect>

+    <x>0</x>

+    <y>0</y>

+    <width>400</width>

+    <height>311</height>

+   </rect>

+  </property>

+  <property name="windowTitle">

+   <string>Form</string>

+  </property>

+  <layout class="QFormLayout" name="formLayout">

+   <property name="leftMargin">

+    <number>0</number>

+   </property>

+   <property name="topMargin">

+    <number>0</number>

+   </property>

+   <property name="rightMargin">

+    <number>0</number>

+   </property>

+   <property name="bottomMargin">

+    <number>0</number>

+   </property>

+   <item row="0" column="0">

+    <widget class="QLabel" name="iconsLabel">

+     <property name="text">

+      <string>&amp;Icons</string>

+     </property>

+     <property name="buddy">

+      <cstring>iconsComboBox</cstring>

+     </property>

+    </widget>

+   </item>

+   <item row="0" column="1">

+    <widget class="QComboBox" name="iconsComboBox">

+     <property name="sizePolicy">

+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

+       <horstretch>0</horstretch>

+       <verstretch>0</verstretch>

+      </sizepolicy>

+     </property>

+     <property name="focusPolicy">

+      <enum>Qt::StrongFocus</enum>

+     </property>

+     <item>

+      <property name="text">

+       <string>Simple (Colored Icons)</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string>Simple (Light Icons)</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string>Simple (Dark Icons)</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string>Simple (Blue Icons)</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string>Breeze Light</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string>Breeze Dark</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string notr="true">OSX</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string notr="true">iOS</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string>Flat</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string>Flat (White)</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string>Legacy</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string>Custom</string>

+      </property>

+     </item>

+    </widget>

+   </item>

+   <item row="1" column="0">

+    <widget class="QLabel" name="widgetThemeLabel">

+     <property name="text">

+      <string>&amp;Colors</string>

+     </property>

+     <property name="buddy">

+      <cstring>widgetStyleComboBox</cstring>

+     </property>

+    </widget>

+   </item>

+   <item row="1" column="1">

+    <widget class="QComboBox" name="widgetStyleComboBox">

+     <property name="sizePolicy">

+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

+       <horstretch>0</horstretch>

+       <verstretch>0</verstretch>

+      </sizepolicy>

+     </property>

+     <property name="focusPolicy">

+      <enum>Qt::StrongFocus</enum>

+     </property>

+    </widget>

+   </item>

+   <item row="2" column="0">

+    <widget class="QLabel" name="backgroundCatLabel">

+     <property name="text">

+      <string>C&amp;at</string>

+     </property>

+     <property name="buddy">

+      <cstring>backgroundCatComboBox</cstring>

+     </property>

+    </widget>

+   </item>

+   <item row="2" column="1">

+    <widget class="QComboBox" name="backgroundCatComboBox">

+     <property name="sizePolicy">

+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">

+       <horstretch>0</horstretch>

+       <verstretch>0</verstretch>

+      </sizepolicy>

+     </property>

+     <property name="focusPolicy">

+      <enum>Qt::StrongFocus</enum>

+     </property>

+     <item>

+      <property name="text">

+       <string>Background Cat (from MultiMC)</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string>Rory ID 11 (drawn by Ashtaka)</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string>Rory ID 11 (flat edition, drawn by Ashtaka)</string>

+      </property>

+     </item>

+     <item>

+      <property name="text">

+       <string>Teawie (drawn by SympathyTea)</string>

+      </property>

+     </item>

+    </widget>

+   </item>

+  </layout>

+ </widget>

+ <resources/>

+ <connections/>

+</ui>