Merge branch 'develop' into remove-updater

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

7 files changed, 343 insertions, 260 deletions

diff --git a/launcher/ui/themes/CustomTheme.cpp b/launcher/ui/themes/CustomTheme.cpp
index 3ad61668..198e76ba 100644
--- a/launcher/ui/themes/CustomTheme.cpp
+++ b/launcher/ui/themes/CustomTheme.cpp
@@ -167,8 +167,6 @@ CustomTheme::CustomTheme(ITheme* baseTheme, QFileInfo& fileInfo, bool isManifest
 
         if (!FS::ensureFolderPathExists(path) || !FS::ensureFolderPathExists(pathResources)) {
             themeWarningLog() << "couldn't create folder for theme!";
-            m_palette = baseTheme->colorScheme();
-            m_styleSheet = baseTheme->appStyleSheet();
             return;
         }
 
@@ -177,18 +175,15 @@ CustomTheme::CustomTheme(ITheme* baseTheme, QFileInfo& fileInfo, bool isManifest
         bool jsonDataIncomplete = false;
 
         m_palette = baseTheme->colorScheme();
-        if (!readThemeJson(themeFilePath, m_palette, m_fadeAmount, m_fadeColor, m_name, m_widgets, m_qssFilePath, jsonDataIncomplete)) {
-            themeDebugLog() << "Did not read theme json file correctly, writing new one to: " << themeFilePath;
-            m_name = "Custom";
-            m_palette = baseTheme->colorScheme();
-            m_fadeColor = baseTheme->fadeColor();
-            m_fadeAmount = baseTheme->fadeAmount();
-            m_widgets = baseTheme->qtTheme();
-            m_qssFilePath = "themeStyle.css";
-        } else {
+        if (readThemeJson(themeFilePath, m_palette, m_fadeAmount, m_fadeColor, m_name, m_widgets, m_qssFilePath, jsonDataIncomplete)) {
+            // If theme data was found, fade "Disabled" color of each role according to FadeAmount
             m_palette = fadeInactive(m_palette, m_fadeAmount, m_fadeColor);
+        } else {
+            themeDebugLog() << "Did not read theme json file correctly, not changing theme, keeping previous.";
+            return;
         }
 
+        // FIXME: This is kinda jank, it only actually checks if the qss file path is not present. It should actually check for any relevant missing data (e.g. name, colors)
         if (jsonDataIncomplete) {
             writeThemeJson(fileInfo.absoluteFilePath(), m_palette, m_fadeAmount, m_fadeColor, m_name, m_widgets, m_qssFilePath);
         }
@@ -197,20 +192,14 @@ CustomTheme::CustomTheme(ITheme* baseTheme, QFileInfo& fileInfo, bool isManifest
         QFileInfo info(qssFilePath);
         if (info.isFile()) {
             try {
-                // TODO: validate css?
+                // TODO: validate qss?
                 m_styleSheet = QString::fromUtf8(FS::read(qssFilePath));
             } catch (const Exception& e) {
-                themeWarningLog() << "Couldn't load css:" << e.cause() << "from" << qssFilePath;
-                m_styleSheet = baseTheme->appStyleSheet();
+                themeWarningLog() << "Couldn't load qss:" << e.cause() << "from" << qssFilePath;
+                return;
             }
         } else {
-            themeDebugLog() << "No theme css present.";
-            m_styleSheet = baseTheme->appStyleSheet();
-            try {
-                FS::write(qssFilePath, m_styleSheet.toUtf8());
-            } catch (const Exception& e) {
-                themeWarningLog() << "Couldn't write css:" << e.cause() << "to" << qssFilePath;
-            }
+            themeDebugLog() << "No theme qss present.";
         }
     } else {
         m_id = fileInfo.fileName();
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..2e5b7f25 100644
--- a/launcher/ui/themes/ITheme.h
+++ b/launcher/ui/themes/ITheme.h
@@ -1,14 +1,47 @@
+// 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>
+#include <QString>
 
 class QStyle;
 
-class ITheme
-{
-public:
+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;
@@ -18,10 +51,7 @@ public:
     virtual QPalette colorScheme() = 0;
     virtual QColor fadeColor() = 0;
     virtual double fadeAmount() = 0;
-    virtual QStringList searchPaths()
-    {
-        return {};
-    }
+    virtual QStringList searchPaths() { return {}; }
 
     static QPalette fadeInactive(QPalette in, qreal bias, QColor color);
 };
diff --git a/launcher/ui/themes/SystemTheme.cpp b/launcher/ui/themes/SystemTheme.cpp
index a63d1741..24875e33 100644
--- a/launcher/ui/themes/SystemTheme.cpp
+++ b/launcher/ui/themes/SystemTheme.cpp
@@ -34,24 +34,22 @@
  */
 #include "SystemTheme.h"
 #include <QApplication>
+#include <QDebug>
 #include <QStyle>
 #include <QStyleFactory>
-#include <QDebug>
 #include "ThemeManager.h"
 
 SystemTheme::SystemTheme()
 {
     themeDebugLog() << "Determining System Theme...";
-    const auto & style = QApplication::style();
+    const auto& style = QApplication::style();
     systemPalette = style->standardPalette();
     QString lowerThemeName = style->objectName();
     themeDebugLog() << "System theme seems to be:" << lowerThemeName;
     QStringList styles = QStyleFactory::keys();
-    for(auto &st: styles)
-    {
+    for (auto& st : styles) {
         themeDebugLog() << "Considering theme from theme factory:" << st.toLower();
-        if(st.toLower() == lowerThemeName)
-        {
+        if (st.toLower() == lowerThemeName) {
             systemTheme = st;
             themeDebugLog() << "System theme has been determined to be:" << systemTheme;
             return;
@@ -62,14 +60,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()
@@ -104,7 +97,7 @@ double SystemTheme::fadeAmount()
 
 QColor SystemTheme::fadeColor()
 {
-    return QColor(128,128,128);
+    return QColor(128, 128, 128);
 }
 
 bool SystemTheme::hasStyleSheet()
diff --git a/launcher/ui/themes/SystemTheme.h b/launcher/ui/themes/SystemTheme.h
index fe450600..b5c03def 100644
--- a/launcher/ui/themes/SystemTheme.h
+++ b/launcher/ui/themes/SystemTheme.h
@@ -1,13 +1,46 @@
+// 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"
 
-class SystemTheme: public ITheme
-{
-public:
+class SystemTheme : public ITheme {
+   public:
     SystemTheme();
     virtual ~SystemTheme() {}
-    void apply(bool initial) override;
+    void apply() override;
 
     QString id() override;
     QString name() override;
@@ -18,7 +51,8 @@ public:
     QPalette colorScheme() override;
     double fadeAmount() override;
     QColor fadeColor() override;
-private:
+
+   private:
     QPalette systemPalette;
     QString systemTheme;
 };
diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp
index 01a38a86..13406485 100644
--- a/launcher/ui/themes/ThemeManager.cpp
+++ b/launcher/ui/themes/ThemeManager.cpp
@@ -1,155 +1,155 @@
-// 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 "ThemeManager.h"

-

-#include <QApplication>

-#include <QDir>

-#include <QDirIterator>

-#include <QIcon>

-#include "ui/themes/BrightTheme.h"

-#include "ui/themes/CustomTheme.h"

-#include "ui/themes/DarkTheme.h"

-#include "ui/themes/SystemTheme.h"

-

-#include "Application.h"

-

-#ifdef Q_OS_WIN

-#include <windows.h>

-// this is needed for versionhelpers.h, it is also included in WinDarkmode, but we can't rely on that.

-// Ultimately this should be included in versionhelpers, but that is outside of the project.

-#include "ui/WinDarkmode.h"

-#include <versionhelpers.h>

-#endif

-

-ThemeManager::ThemeManager(MainWindow* mainWindow)

-{

-    m_mainWindow = mainWindow;

-    InitializeThemes();

-}

-

-/// @brief Adds the Theme to the list of themes

-/// @param theme The Theme to add

-/// @return Theme ID

-QString ThemeManager::AddTheme(std::unique_ptr<ITheme> theme)

-{

-    QString id = theme->id();

-    m_themes.emplace(id, std::move(theme));

-    return id;

-}

-

-/// @brief Gets the Theme from the List via ID

-/// @param themeId Theme ID of theme to fetch

-/// @return Theme at themeId

-ITheme* ThemeManager::GetTheme(QString themeId)

-{

-    return m_themes[themeId].get();

-}

-

-void ThemeManager::InitializeThemes()

-{

-    // Icon themes

-    {

-        // TODO: icon themes and instance icons do not mesh well together. Rearrange and fix discrepancies!

-        // set icon theme search path!

-        auto searchPaths = QIcon::themeSearchPaths();

-        searchPaths.append("iconthemes");

-        QIcon::setThemeSearchPaths(searchPaths);

-        themeDebugLog() << "<> Icon themes initialized.";

-    }

-

-    // Initialize widget themes

-    {

-        themeDebugLog() << "<> Initializing Widget Themes";

-        themeDebugLog() << "Loading Built-in Theme:" << AddTheme(std::make_unique<SystemTheme>());

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

-        QString themeFolder = QDir("./themes/").absoluteFilePath("");

-        themeDebugLog() << "Theme Folder Path: " << themeFolder;

-

-        QDirIterator directoryIterator(themeFolder, QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);

-        while (directoryIterator.hasNext()) {

-            QDir dir(directoryIterator.next());

-            QFileInfo themeJson(dir.absoluteFilePath("theme.json"));

-            if (themeJson.exists()) {

-                // Load "theme.json" based themes

-                themeDebugLog() << "Loading JSON Theme from:" << themeJson.absoluteFilePath();

-                AddTheme(std::make_unique<CustomTheme>(GetTheme(darkThemeId), themeJson, true));

-            } else {

-                // Load pure QSS Themes

-                QDirIterator stylesheetFileIterator(dir.absoluteFilePath(""), { "*.qss", "*.css" }, QDir::Files);

-                while (stylesheetFileIterator.hasNext()) {

-                    QFile customThemeFile(stylesheetFileIterator.next());

-                    QFileInfo customThemeFileInfo(customThemeFile);

-                    themeDebugLog() << "Loading QSS Theme from:" << customThemeFileInfo.absoluteFilePath();

-                    AddTheme(std::make_unique<CustomTheme>(GetTheme(darkThemeId), customThemeFileInfo, false));

-                }

-            }

-        }

-

-        themeDebugLog() << "<> Widget themes initialized.";

-    }

-}

-

-QList<ITheme*> ThemeManager::getValidApplicationThemes()

-{

-    QList<ITheme*> ret;

-    ret.reserve(m_themes.size());

-    for (auto&& [id, theme] : m_themes) {

-        ret.append(theme.get());

-    }

-    return ret;

-}

-

-void ThemeManager::setIconTheme(const QString& name)

-{

-    QIcon::setThemeName(name);

-}

-

-void ThemeManager::applyCurrentlySelectedTheme()

-{

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

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

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

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

-}

-

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

-{

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

-#ifdef Q_OS_WIN

-        if (m_mainWindow && IsWindows10OrGreater()) {

-            if (QString::compare(theme->id(), "dark") == 0) {

-                WinDarkmode::setDarkWinTitlebar(m_mainWindow->winId(), true);

-            } else {

-                WinDarkmode::setDarkWinTitlebar(m_mainWindow->winId(), false);

-            }

-        }

-#endif

-    } else {

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

-    }

-}

+// 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 "ThemeManager.h"
+
+#include <QApplication>
+#include <QDir>
+#include <QDirIterator>
+#include <QIcon>
+#include "ui/themes/BrightTheme.h"
+#include "ui/themes/CustomTheme.h"
+#include "ui/themes/DarkTheme.h"
+#include "ui/themes/SystemTheme.h"
+
+#include "Application.h"
+
+ThemeManager::ThemeManager(MainWindow* mainWindow)
+{
+    m_mainWindow = mainWindow;
+    initializeThemes();
+}
+
+/// @brief Adds the Theme to the list of themes
+/// @param theme The Theme to add
+/// @return Theme ID
+QString ThemeManager::addTheme(std::unique_ptr<ITheme> theme)
+{
+    QString id = theme->id();
+    m_themes.emplace(id, std::move(theme));
+    return id;
+}
+
+/// @brief Gets the Theme from the List via ID
+/// @param themeId Theme ID of theme to fetch
+/// @return Theme at themeId
+ITheme* ThemeManager::getTheme(QString themeId)
+{
+    return m_themes[themeId].get();
+}
+
+void ThemeManager::initializeThemes()
+{
+    // Icon themes
+    {
+        // TODO: icon themes and instance icons do not mesh well together. Rearrange and fix discrepancies!
+        // set icon theme search path!
+        auto searchPaths = QIcon::themeSearchPaths();
+        searchPaths.append("iconthemes");
+        QIcon::setThemeSearchPaths(searchPaths);
+        themeDebugLog() << "<> Icon themes initialized.";
+    }
+
+    // Initialize widget themes
+    {
+        themeDebugLog() << "<> Initializing Widget Themes";
+        themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<SystemTheme>());
+        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?)
+        QString themeFolder = QDir("./themes/").absoluteFilePath("");
+        themeDebugLog() << "Theme Folder Path: " << themeFolder;
+
+        QDirIterator directoryIterator(themeFolder, QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+        while (directoryIterator.hasNext()) {
+            QDir dir(directoryIterator.next());
+            QFileInfo themeJson(dir.absoluteFilePath("theme.json"));
+            if (themeJson.exists()) {
+                // Load "theme.json" based themes
+                themeDebugLog() << "Loading JSON Theme from:" << themeJson.absoluteFilePath();
+                addTheme(std::make_unique<CustomTheme>(getTheme(darkThemeId), themeJson, true));
+            } else {
+                // Load pure QSS Themes
+                QDirIterator stylesheetFileIterator(dir.absoluteFilePath(""), { "*.qss", "*.css" }, QDir::Files);
+                while (stylesheetFileIterator.hasNext()) {
+                    QFile customThemeFile(stylesheetFileIterator.next());
+                    QFileInfo customThemeFileInfo(customThemeFile);
+                    themeDebugLog() << "Loading QSS Theme from:" << customThemeFileInfo.absoluteFilePath();
+                    addTheme(std::make_unique<CustomTheme>(getTheme(darkThemeId), customThemeFileInfo, false));
+                }
+            }
+        }
+
+        themeDebugLog() << "<> Widget themes initialized.";
+    }
+}
+
+QList<ITheme*> ThemeManager::getValidApplicationThemes()
+{
+    QList<ITheme*> ret;
+    ret.reserve(m_themes.size());
+    for (auto&& [id, theme] : m_themes) {
+        ret.append(theme.get());
+    }
+    return ret;
+}
+
+void ThemeManager::setIconTheme(const QString& name)
+{
+    QIcon::setThemeName(name);
+}
+
+void ThemeManager::applyCurrentlySelectedTheme()
+{
+    setIconTheme(APPLICATION->settings()->get("IconTheme").toString());
+    themeDebugLog() << "<> Icon theme set.";
+    setApplicationTheme(APPLICATION->settings()->get("ApplicationTheme").toString());
+    themeDebugLog() << "<> Application theme set.";
+}
+
+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();
+    } else {
+        themeWarningLog() << "Tried to set invalid theme:" << name;
+    }
+}
+
+QString ThemeManager::getCatImage(QString catName)
+{
+    QDateTime now = QDateTime::currentDateTime();
+    QDateTime birthday(QDate(now.date().year(), 11, 30), QTime(0, 0));
+    QDateTime xmas(QDate(now.date().year(), 12, 25), QTime(0, 0));
+    QDateTime halloween(QDate(now.date().year(), 10, 31), QTime(0, 0));
+    QString cat = !catName.isEmpty() ? catName : APPLICATION->settings()->get("BackgroundCat").toString();
+    if (std::abs(now.daysTo(xmas)) <= 4) {
+        cat += "-xmas";
+    } else if (std::abs(now.daysTo(halloween)) <= 4) {
+        cat += "-spooky";
+    } else if (std::abs(now.daysTo(birthday)) <= 12) {
+        cat += "-bday";
+    }
+    return cat;
+}
diff --git a/launcher/ui/themes/ThemeManager.h b/launcher/ui/themes/ThemeManager.h
index b85cb742..9af44b5a 100644
--- a/launcher/ui/themes/ThemeManager.h
+++ b/launcher/ui/themes/ThemeManager.h
@@ -1,52 +1,57 @@
-// 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 <QString>

-

-#include "ui/MainWindow.h"

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

-

-inline auto themeDebugLog()

-{

-    return qDebug() << "[Theme]";

-}

-inline auto themeWarningLog()

-{

-    return qWarning() << "[Theme]";

-}

-

-class ThemeManager {

-   public:

-    ThemeManager(MainWindow* mainWindow);

-

-    // maybe make private? Or put in ctor?

-    void InitializeThemes();

-

-    QList<ITheme*> getValidApplicationThemes();

-    void setIconTheme(const QString& name);

-    void applyCurrentlySelectedTheme();

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

-

-   private:

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

-    MainWindow* m_mainWindow;

-

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

-    ITheme* GetTheme(QString themeId);

-};

+// 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 <QString>
+
+#include "ui/MainWindow.h"
+#include "ui/themes/ITheme.h"
+
+inline auto themeDebugLog()
+{
+    return qDebug() << "[Theme]";
+}
+inline auto themeWarningLog()
+{
+    return qWarning() << "[Theme]";
+}
+
+class ThemeManager {
+   public:
+    ThemeManager(MainWindow* mainWindow);
+
+    QList<ITheme*> getValidApplicationThemes();
+    void setIconTheme(const QString& name);
+    void applyCurrentlySelectedTheme();
+    void setApplicationTheme(const QString& name);
+
+    /// <summary>
+    /// Returns the cat based on selected cat and with events (Birthday, XMas, etc.)
+    /// </summary>
+    /// <param name="catName">Optional, if you need a specific cat.</param>
+    /// <returns></returns>
+    static QString getCatImage(QString catName = "");
+
+   private:
+    std::map<QString, std::unique_ptr<ITheme>> m_themes;
+    MainWindow* m_mainWindow;
+
+    void initializeThemes();
+    QString addTheme(std::unique_ptr<ITheme> theme);
+    ITheme* getTheme(QString themeId);
+};