CRLF -> LF

damn you visual studio for creating CRLF files everywhere...
Signed-off-by: Tayou <tayou@gmx.net>

2 files changed, 212 insertions, 212 deletions

diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp
index 7ccc946a..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"

-

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

-}

+// 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 d5e73bb8..9af44b5a 100644
--- a/launcher/ui/themes/ThemeManager.h
+++ b/launcher/ui/themes/ThemeManager.h
@@ -1,57 +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);

-

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

-};

+// 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);
+};