NOISSUE continue reshuffling the codebase

12 files changed, 0 insertions, 621 deletions

diff --git a/launcher/themes/BrightTheme.cpp b/launcher/themes/BrightTheme.cpp
deleted file mode 100644
index b9188bdd..00000000
--- a/launcher/themes/BrightTheme.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "BrightTheme.h"
-
-QString BrightTheme::id()
-{
-    return "bright";
-}
-
-QString BrightTheme::name()
-{
-    return QObject::tr("Bright");
-}
-
-bool BrightTheme::hasColorScheme()
-{
-    return true;
-}
-
-QPalette BrightTheme::colorScheme()
-{
-    QPalette brightPalette;
-    brightPalette.setColor(QPalette::Window, QColor(239,240,241));
-    brightPalette.setColor(QPalette::WindowText, QColor(49,54,59));
-    brightPalette.setColor(QPalette::Base, QColor(252,252,252));
-    brightPalette.setColor(QPalette::AlternateBase, QColor(239,240,241));
-    brightPalette.setColor(QPalette::ToolTipBase, QColor(49,54,59));
-    brightPalette.setColor(QPalette::ToolTipText, QColor(239,240,241));
-    brightPalette.setColor(QPalette::Text,  QColor(49,54,59));
-    brightPalette.setColor(QPalette::Button, QColor(239,240,241));
-    brightPalette.setColor(QPalette::ButtonText, QColor(49,54,59));
-    brightPalette.setColor(QPalette::BrightText, Qt::red);
-    brightPalette.setColor(QPalette::Link, QColor(41, 128, 185));
-    brightPalette.setColor(QPalette::Highlight, QColor(61, 174, 233));
-    brightPalette.setColor(QPalette::HighlightedText, QColor(239,240,241));
-    return fadeInactive(brightPalette, fadeAmount(), fadeColor());
-}
-
-double BrightTheme::fadeAmount()
-{
-    return 0.5;
-}
-
-QColor BrightTheme::fadeColor()
-{
-    return QColor(239,240,241);
-}
-
-bool BrightTheme::hasStyleSheet()
-{
-    return false;
-}
-
-QString BrightTheme::appStyleSheet()
-{
-    return QString();
-}
-
diff --git a/launcher/themes/BrightTheme.h b/launcher/themes/BrightTheme.h
deleted file mode 100644
index c61f52d5..00000000
--- a/launcher/themes/BrightTheme.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "FusionTheme.h"
-
-class BrightTheme: public FusionTheme
-{
-public:
-    virtual ~BrightTheme() {}
-
-    QString id() override;
-    QString name() override;
-    bool hasStyleSheet() override;
-    QString appStyleSheet() override;
-    bool hasColorScheme() override;
-    QPalette colorScheme() override;
-    double fadeAmount() override;
-    QColor fadeColor() override;
-};
-
diff --git a/launcher/themes/CustomTheme.cpp b/launcher/themes/CustomTheme.cpp
deleted file mode 100644
index 3e3e27de..00000000
--- a/launcher/themes/CustomTheme.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-#include "CustomTheme.h"
-#include <QDir>
-#include <Json.h>
-#include <FileSystem.h>
-
-const char * themeFile = "theme.json";
-const char * styleFile = "themeStyle.css";
-
-static bool readThemeJson(const QString &path, QPalette &palette, double &fadeAmount, QColor &fadeColor, QString &name, QString &widgets)
-{
-    QFileInfo pathInfo(path);
-    if(pathInfo.exists() && pathInfo.isFile())
-    {
-        try
-        {
-            auto doc = Json::requireDocument(path, "Theme JSON file");
-            const QJsonObject root = doc.object();
-            name = Json::requireString(root, "name", "Theme name");
-            widgets = Json::requireString(root, "widgets", "Qt widget theme");
-            auto colorsRoot = Json::requireObject(root, "colors", "colors object");
-            auto readColor = [&](QString colorName) -> QColor
-            {
-                auto colorValue = Json::ensureString(colorsRoot, colorName, QString());
-                if(!colorValue.isEmpty())
-                {
-                    QColor color(colorValue);
-                    if(!color.isValid())
-                    {
-                        qWarning() << "Color value" << colorValue << "for" << colorName << "was not recognized.";
-                        return QColor();
-                    }
-                    return color;
-                }
-                return QColor();
-            };
-            auto readAndSetColor = [&](QPalette::ColorRole role, QString colorName)
-            {
-                auto color = readColor(colorName);
-                if(color.isValid())
-                {
-                    palette.setColor(role, color);
-                }
-                else
-                {
-                    qDebug() << "Color value for" << colorName << "was not present.";
-                }
-            };
-
-            // palette
-            readAndSetColor(QPalette::Window, "Window");
-            readAndSetColor(QPalette::WindowText, "WindowText");
-            readAndSetColor(QPalette::Base, "Base");
-            readAndSetColor(QPalette::AlternateBase, "AlternateBase");
-            readAndSetColor(QPalette::ToolTipBase, "ToolTipBase");
-            readAndSetColor(QPalette::ToolTipText, "ToolTipText");
-            readAndSetColor(QPalette::Text, "Text");
-            readAndSetColor(QPalette::Button, "Button");
-            readAndSetColor(QPalette::ButtonText, "ButtonText");
-            readAndSetColor(QPalette::BrightText, "BrightText");
-            readAndSetColor(QPalette::Link, "Link");
-            readAndSetColor(QPalette::Highlight, "Highlight");
-            readAndSetColor(QPalette::HighlightedText, "HighlightedText");
-
-            //fade
-            fadeColor = readColor("fadeColor");
-            fadeAmount = Json::ensureDouble(colorsRoot, "fadeAmount", 0.5, "fade amount");
-
-        }
-        catch (const Exception &e)
-        {
-            qWarning() << "Couldn't load theme json: " << e.cause();
-            return false;
-        }
-    }
-    else
-    {
-        qDebug() << "No theme json present.";
-        return false;
-    }
-    return true;
-}
-
-static bool writeThemeJson(const QString &path, const QPalette &palette, double fadeAmount, QColor fadeColor, QString name, QString widgets)
-{
-    QJsonObject rootObj;
-    rootObj.insert("name", name);
-    rootObj.insert("widgets", widgets);
-
-    QJsonObject colorsObj;
-    auto insertColor = [&](QPalette::ColorRole role, QString colorName)
-    {
-        colorsObj.insert(colorName, palette.color(role).name());
-    };
-
-    // palette
-    insertColor(QPalette::Window, "Window");
-    insertColor(QPalette::WindowText, "WindowText");
-    insertColor(QPalette::Base, "Base");
-    insertColor(QPalette::AlternateBase, "AlternateBase");
-    insertColor(QPalette::ToolTipBase, "ToolTipBase");
-    insertColor(QPalette::ToolTipText, "ToolTipText");
-    insertColor(QPalette::Text, "Text");
-    insertColor(QPalette::Button, "Button");
-    insertColor(QPalette::ButtonText, "ButtonText");
-    insertColor(QPalette::BrightText, "BrightText");
-    insertColor(QPalette::Link, "Link");
-    insertColor(QPalette::Highlight, "Highlight");
-    insertColor(QPalette::HighlightedText, "HighlightedText");
-
-    // fade
-    colorsObj.insert("fadeColor", fadeColor.name());
-    colorsObj.insert("fadeAmount", fadeAmount);
-
-    rootObj.insert("colors", colorsObj);
-    try
-    {
-        Json::write(rootObj, path);
-        return true;
-    }
-    catch (const Exception &e)
-    {
-        qWarning() << "Failed to write theme json to" << path;
-        return false;
-    }
-}
-
-CustomTheme::CustomTheme(ITheme* baseTheme, QString folder)
-{
-    m_id = folder;
-    QString path = FS::PathCombine("themes", m_id);
-    QString pathResources = FS::PathCombine("themes", m_id, "resources");
-
-    qDebug() << "Loading theme" << m_id;
-
-    if(!FS::ensureFolderPathExists(path) || !FS::ensureFolderPathExists(pathResources))
-    {
-        qWarning() << "couldn't create folder for theme!";
-        m_palette = baseTheme->colorScheme();
-        m_styleSheet = baseTheme->appStyleSheet();
-        return;
-    }
-
-    auto themeFilePath = FS::PathCombine(path, themeFile);
-
-    m_palette = baseTheme->colorScheme();
-    if (!readThemeJson(themeFilePath, m_palette, m_fadeAmount, m_fadeColor, m_name, m_widgets))
-    {
-        m_name = "Custom";
-        m_palette = baseTheme->colorScheme();
-        m_fadeColor = baseTheme->fadeColor();
-        m_fadeAmount = baseTheme->fadeAmount();
-        m_widgets = baseTheme->qtTheme();
-
-        QFileInfo info(themeFilePath);
-        if(!info.exists())
-        {
-            writeThemeJson(themeFilePath, m_palette, m_fadeAmount, m_fadeColor, "Custom", m_widgets);
-        }
-    }
-    else
-    {
-        m_palette = fadeInactive(m_palette, m_fadeAmount, m_fadeColor);
-    }
-
-    auto cssFilePath = FS::PathCombine(path, styleFile);
-    QFileInfo info (cssFilePath);
-    if(info.isFile())
-    {
-        try
-        {
-            // TODO: validate css?
-            m_styleSheet = QString::fromUtf8(FS::read(cssFilePath));
-        }
-        catch (const Exception &e)
-        {
-            qWarning() << "Couldn't load css:" << e.cause() << "from" << cssFilePath;
-            m_styleSheet = baseTheme->appStyleSheet();
-        }
-    }
-    else
-    {
-        qDebug() << "No theme css present.";
-        m_styleSheet = baseTheme->appStyleSheet();
-        try
-        {
-            FS::write(cssFilePath, m_styleSheet.toUtf8());
-        }
-        catch (const Exception &e)
-        {
-            qWarning() << "Couldn't write css:" << e.cause() << "to" << cssFilePath;
-        }
-    }
-}
-
-QStringList CustomTheme::searchPaths()
-{
-    return { FS::PathCombine("themes", m_id, "resources") };
-}
-
-
-QString CustomTheme::id()
-{
-    return m_id;
-}
-
-QString CustomTheme::name()
-{
-    return m_name;
-}
-
-bool CustomTheme::hasColorScheme()
-{
-    return true;
-}
-
-QPalette CustomTheme::colorScheme()
-{
-    return m_palette;
-}
-
-bool CustomTheme::hasStyleSheet()
-{
-    return true;
-}
-
-QString CustomTheme::appStyleSheet()
-{
-    return m_styleSheet;
-}
-
-double CustomTheme::fadeAmount()
-{
-    return m_fadeAmount;
-}
-
-QColor CustomTheme::fadeColor()
-{
-    return m_fadeColor;
-}
-
-QString CustomTheme::qtTheme()
-{
-    return m_widgets;
-}
diff --git a/launcher/themes/CustomTheme.h b/launcher/themes/CustomTheme.h
deleted file mode 100644
index d216895d..00000000
--- a/launcher/themes/CustomTheme.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include "ITheme.h"
-
-class CustomTheme: public ITheme
-{
-public:
-    CustomTheme(ITheme * baseTheme, QString folder);
-    virtual ~CustomTheme() {}
-
-    QString id() override;
-    QString name() override;
-    bool hasStyleSheet() override;
-    QString appStyleSheet() override;
-    bool hasColorScheme() override;
-    QPalette colorScheme() override;
-    double fadeAmount() override;
-    QColor fadeColor() override;
-    QString qtTheme() override;
-    QStringList searchPaths() override;
-
-private: /* data */
-    QPalette m_palette;
-    QColor m_fadeColor;
-    double m_fadeAmount;
-    QString m_styleSheet;
-    QString m_name;
-    QString m_id;
-    QString m_widgets;
-};
-
diff --git a/launcher/themes/DarkTheme.cpp b/launcher/themes/DarkTheme.cpp
deleted file mode 100644
index 31ecd559..00000000
--- a/launcher/themes/DarkTheme.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "DarkTheme.h"
-
-QString DarkTheme::id()
-{
-    return "dark";
-}
-
-QString DarkTheme::name()
-{
-    return QObject::tr("Dark");
-}
-
-bool DarkTheme::hasColorScheme()
-{
-    return true;
-}
-
-QPalette DarkTheme::colorScheme()
-{
-    QPalette darkPalette;
-    darkPalette.setColor(QPalette::Window, QColor(49,54,59));
-    darkPalette.setColor(QPalette::WindowText, Qt::white);
-    darkPalette.setColor(QPalette::Base, QColor(35,38,41));
-    darkPalette.setColor(QPalette::AlternateBase, QColor(49,54,59));
-    darkPalette.setColor(QPalette::ToolTipBase, Qt::white);
-    darkPalette.setColor(QPalette::ToolTipText, Qt::white);
-    darkPalette.setColor(QPalette::Text, Qt::white);
-    darkPalette.setColor(QPalette::Button, QColor(49,54,59));
-    darkPalette.setColor(QPalette::ButtonText, Qt::white);
-    darkPalette.setColor(QPalette::BrightText, Qt::red);
-    darkPalette.setColor(QPalette::Link, QColor(42, 130, 218));
-    darkPalette.setColor(QPalette::Highlight, QColor(42, 130, 218));
-    darkPalette.setColor(QPalette::HighlightedText, Qt::black);
-    return fadeInactive(darkPalette, fadeAmount(),  fadeColor());
-}
-
-double DarkTheme::fadeAmount()
-{
-    return 0.5;
-}
-
-QColor DarkTheme::fadeColor()
-{
-    return QColor(49,54,59);
-}
-
-bool DarkTheme::hasStyleSheet()
-{
-    return true;
-}
-
-QString DarkTheme::appStyleSheet()
-{
-    return "QToolTip { color: #ffffff; background-color: #2a82da; border: 1px solid white; }";
-}
diff --git a/launcher/themes/DarkTheme.h b/launcher/themes/DarkTheme.h
deleted file mode 100644
index 9bd2f343..00000000
--- a/launcher/themes/DarkTheme.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#include "FusionTheme.h"
-
-class DarkTheme: public FusionTheme
-{
-public:
-    virtual ~DarkTheme() {}
-
-    QString id() override;
-    QString name() override;
-    bool hasStyleSheet() override;
-    QString appStyleSheet() override;
-    bool hasColorScheme() override;
-    QPalette colorScheme() override;
-    double fadeAmount() override;
-    QColor fadeColor() override;
-};
diff --git a/launcher/themes/FusionTheme.cpp b/launcher/themes/FusionTheme.cpp
deleted file mode 100644
index cf3286ba..00000000
--- a/launcher/themes/FusionTheme.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "FusionTheme.h"
-
-QString FusionTheme::qtTheme()
-{
-    return "Fusion";
-}
diff --git a/launcher/themes/FusionTheme.h b/launcher/themes/FusionTheme.h
deleted file mode 100644
index ee34245a..00000000
--- a/launcher/themes/FusionTheme.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#pragma once
-
-#include "ITheme.h"
-
-class FusionTheme: public ITheme
-{
-public:
-    virtual ~FusionTheme() {}
-
-    QString qtTheme() override;
-};
diff --git a/launcher/themes/ITheme.cpp b/launcher/themes/ITheme.cpp
deleted file mode 100644
index 7247b444..00000000
--- a/launcher/themes/ITheme.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "ITheme.h"
-#include "rainbow.h"
-#include <QStyleFactory>
-#include <QDir>
-#include "Application.h"
-
-void ITheme::apply(bool)
-{
-    QApplication::setStyle(QStyleFactory::create(qtTheme()));
-    if(hasColorScheme())
-    {
-        QApplication::setPalette(colorScheme());
-    }
-    if(hasStyleSheet())
-    {
-        APPLICATION->setStyleSheet(appStyleSheet());
-    }
-    else
-    {
-        APPLICATION->setStyleSheet(QString());
-    }
-    QDir::setSearchPaths("theme", searchPaths());
-}
-
-QPalette ITheme::fadeInactive(QPalette in, qreal bias, QColor color)
-{
-    auto blend = [&in, bias, color](QPalette::ColorRole role)
-    {
-        QColor from = in.color(QPalette::Active, role);
-        QColor blended = Rainbow::mix(from, color, bias);
-        in.setColor(QPalette::Disabled, role, blended);
-    };
-    blend(QPalette::Window);
-    blend(QPalette::WindowText);
-    blend(QPalette::Base);
-    blend(QPalette::AlternateBase);
-    blend(QPalette::ToolTipBase);
-    blend(QPalette::ToolTipText);
-    blend(QPalette::Text);
-    blend(QPalette::Button);
-    blend(QPalette::ButtonText);
-    blend(QPalette::BrightText);
-    blend(QPalette::Link);
-    blend(QPalette::Highlight);
-    blend(QPalette::HighlightedText);
-    return in;
-}
diff --git a/launcher/themes/ITheme.h b/launcher/themes/ITheme.h
deleted file mode 100644
index c2347cf6..00000000
--- a/launcher/themes/ITheme.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-#include <QString>
-#include <QPalette>
-
-class QStyle;
-
-class ITheme
-{
-public:
-    virtual ~ITheme() {}
-    virtual void apply(bool initial);
-    virtual QString id() = 0;
-    virtual QString name() = 0;
-    virtual bool hasStyleSheet() = 0;
-    virtual QString appStyleSheet() = 0;
-    virtual QString qtTheme() = 0;
-    virtual bool hasColorScheme() = 0;
-    virtual QPalette colorScheme() = 0;
-    virtual QColor fadeColor() = 0;
-    virtual double fadeAmount() = 0;
-    virtual QStringList searchPaths()
-    {
-        return {};
-    }
-
-    static QPalette fadeInactive(QPalette in, qreal bias, QColor color);
-};
diff --git a/launcher/themes/SystemTheme.cpp b/launcher/themes/SystemTheme.cpp
deleted file mode 100644
index 49b1afaa..00000000
--- a/launcher/themes/SystemTheme.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "SystemTheme.h"
-#include <QApplication>
-#include <QStyle>
-#include <QStyleFactory>
-#include <QDebug>
-
-SystemTheme::SystemTheme()
-{
-    qDebug() << "Determining System Theme...";
-    const auto & style = QApplication::style();
-    systemPalette = style->standardPalette();
-    QString lowerThemeName = style->objectName();
-    qDebug() << "System theme seems to be:" << lowerThemeName;
-    QStringList styles = QStyleFactory::keys();
-    for(auto &st: styles)
-    {
-        qDebug() << "Considering theme from theme factory:" << st.toLower();
-        if(st.toLower() == lowerThemeName)
-        {
-            systemTheme = st;
-            qDebug() << "System theme has been determined to be:" << systemTheme;
-            return;
-        }
-    }
-    // fall back to fusion if we can't find the current theme.
-    systemTheme = "Fusion";
-    qDebug() << "System theme not found, defaulted to Fusion";
-}
-
-void SystemTheme::apply(bool initial)
-{
-    // 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);
-}
-
-QString SystemTheme::id()
-{
-    return "system";
-}
-
-QString SystemTheme::name()
-{
-    return QObject::tr("System");
-}
-
-QString SystemTheme::qtTheme()
-{
-    return systemTheme;
-}
-
-QPalette SystemTheme::colorScheme()
-{
-    return systemPalette;
-}
-
-QString SystemTheme::appStyleSheet()
-{
-    return QString();
-}
-
-double SystemTheme::fadeAmount()
-{
-    return 0.5;
-}
-
-QColor SystemTheme::fadeColor()
-{
-    return QColor(128,128,128);
-}
-
-bool SystemTheme::hasStyleSheet()
-{
-    return false;
-}
-
-bool SystemTheme::hasColorScheme()
-{
-    return true;
-}
diff --git a/launcher/themes/SystemTheme.h b/launcher/themes/SystemTheme.h
deleted file mode 100644
index fe450600..00000000
--- a/launcher/themes/SystemTheme.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include "ITheme.h"
-
-class SystemTheme: public ITheme
-{
-public:
-    SystemTheme();
-    virtual ~SystemTheme() {}
-    void apply(bool initial) override;
-
-    QString id() override;
-    QString name() override;
-    QString qtTheme() override;
-    bool hasStyleSheet() override;
-    QString appStyleSheet() override;
-    bool hasColorScheme() override;
-    QPalette colorScheme() override;
-    double fadeAmount() override;
-    QColor fadeColor() override;
-private:
-    QPalette systemPalette;
-    QString systemTheme;
-};