0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-378 add basic custom theme support

Browse Source 
Files you can customize are created in themes/custom/
This commit is contained in:
Petr Mrázek 2016-11-06 04:29:12 +01:00
parent 13b575f7a9
commit bc753859b5
15 changed files with 335 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/logic/Json.h
View File

@ -23,16 +23,16 @@ public:
};
/// @throw FileSystemException
void write(const QJsonDocument &doc, const QString &filename);
MULTIMC_LOGIC_EXPORT void write(const QJsonDocument &doc, const QString &filename);
/// @throw FileSystemException
void write(const QJsonObject &object, const QString &filename);
MULTIMC_LOGIC_EXPORT void write(const QJsonObject &object, const QString &filename);
/// @throw FileSystemException
void write(const QJsonArray &array, const QString &filename);
MULTIMC_LOGIC_EXPORT void write(const QJsonArray &array, const QString &filename);
QByteArray toBinary(const QJsonObject &obj);
QByteArray toBinary(const QJsonArray &array);
QByteArray toText(const QJsonObject &obj);
QByteArray toText(const QJsonArray &array);
MULTIMC_LOGIC_EXPORT QByteArray toBinary(const QJsonObject &obj);
MULTIMC_LOGIC_EXPORT QByteArray toBinary(const QJsonArray &array);
MULTIMC_LOGIC_EXPORT QByteArray toText(const QJsonObject &obj);
MULTIMC_LOGIC_EXPORT QByteArray toText(const QJsonArray &array);
/// @throw JsonException
MULTIMC_LOGIC_EXPORT QJsonDocument requireDocument(const QByteArray &data, const QString &what = "Document");

3
application/CMakeLists.txt
View File

@ -111,8 +111,11 @@ SET(MULTIMC_SOURCES
themes/FusionTheme.h
themes/BrightTheme.cpp
themes/BrightTheme.h
themes/CustomTheme.cpp
themes/CustomTheme.h
themes/DarkTheme.cpp
themes/DarkTheme.h
themes/ITheme.cpp
themes/ITheme.h
themes/SystemTheme.cpp
themes/SystemTheme.h

5
application/MultiMC.cpp
View File

@ -15,6 +15,7 @@
#include "themes/SystemTheme.h"
#include "themes/DarkTheme.h"
#include "themes/BrightTheme.h"
#include "themes/CustomTheme.h"
#include <iostream>
#include <QDir>
@ -1010,9 +1011,11 @@ void MultiMC::initThemes()
{
m_themes.insert(std::make_pair(theme->id(), std::unique_ptr<ITheme>(theme)));
};
auto darkTheme = new DarkTheme();
insertTheme(new SystemTheme());
insertTheme(new DarkTheme());
insertTheme(darkTheme);
insertTheme(new BrightTheme());
insertTheme(new CustomTheme(darkTheme, "custom"));
}
void MultiMC::setApplicationTheme(const QString& name)

11
application/themes/BrightTheme.cpp
View File

@ -26,9 +26,18 @@ QPalette BrightTheme::colorScheme()
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, 0.5f, QColor(239,240,241));
return fadeInactive(brightPalette, fadeAmount(), fadeColor());
}
double BrightTheme::fadeAmount()
{
return 0.5;
}
QColor BrightTheme::fadeColor()
{
return QColor(239,240,241);
}
QString BrightTheme::appStyleSheet()
{

2
application/themes/BrightTheme.h
View File

@ -11,5 +11,7 @@ public:
QString name() override;
QString appStyleSheet() override;
QPalette colorScheme() override;
double fadeAmount() override;
QColor fadeColor() override;
};

227
application/themes/CustomTheme.cpp Normal file
View File

@ -0,0 +1,227 @@
#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(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 (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);
qDebug() << "Loading theme" << m_id;
if(!FS::ensureFolderPathExists(path))
{
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(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(Exception e)
{
qWarning() << "Couldn't write css:" << e.cause() << "to" << cssFilePath;
}
}
}
QString CustomTheme::id()
{
return m_id;
}
QString CustomTheme::name()
{
return m_name;
}
QPalette CustomTheme::colorScheme()
{
return m_palette;
}
QString CustomTheme::appStyleSheet()
{
return m_styleSheet;
}
double CustomTheme::fadeAmount()
{
return m_fadeAmount;
}
QColor CustomTheme::fadeColor()
{
return m_fadeColor;
}
QString CustomTheme::qtTheme()
{
return m_widgets;
}

28
application/themes/CustomTheme.h Normal file
View File

@ -0,0 +1,28 @@
#pragma once
#include "ITheme.h"
class CustomTheme: public ITheme
{
public:
CustomTheme(ITheme * baseTheme, QString folder);
virtual ~CustomTheme() {}
QString id() override;
QString name() override;
QString appStyleSheet() override;
QPalette colorScheme() override;
double fadeAmount() override;
QColor fadeColor() override;
QString qtTheme() override;
private: /* data */
QPalette m_palette;
QColor m_fadeColor;
double m_fadeAmount;
QString m_styleSheet;
QString m_name;
QString m_id;
QString m_widgets;
};

11
application/themes/DarkTheme.cpp
View File

@ -26,9 +26,18 @@ QPalette DarkTheme::colorScheme()
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, 0.5f, QColor(49,54,59));
return fadeInactive(darkPalette, fadeAmount(), fadeColor());
}
double DarkTheme::fadeAmount()
{
return 0.5;
}
QColor DarkTheme::fadeColor()
{
return QColor(49,54,59);
}
QString DarkTheme::appStyleSheet()
{

2
application/themes/DarkTheme.h
View File

@ -11,4 +11,6 @@ public:
QString name() override;
QString appStyleSheet() override;
QPalette colorScheme() override;
double fadeAmount() override;
QColor fadeColor() override;
};

26
application/themes/FusionTheme.cpp
View File

@ -1,32 +1,6 @@
#include "FusionTheme.h"
#include "rainbow.h"
QString FusionTheme::qtTheme()
{
return "Fusion";
}
QPalette FusionTheme::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;
}

3
application/themes/FusionTheme.h
View File

@ -8,7 +8,4 @@ public:
virtual ~FusionTheme() {}
QString qtTheme() override;
protected:
QPalette fadeInactive(QPalette in, qreal bias, QColor color);
};

26
application/themes/ITheme.cpp Normal file
View File

@ -0,0 +1,26 @@
#include "ITheme.h"
#include "rainbow.h"
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;
}

4
application/themes/ITheme.h
View File

@ -11,4 +11,8 @@ public:
virtual QString appStyleSheet() = 0;
virtual QString qtTheme() = 0;
virtual QPalette colorScheme() = 0;
virtual QColor fadeColor() = 0;
virtual double fadeAmount() = 0;
static QPalette fadeInactive(QPalette in, qreal bias, QColor color);
};

10
application/themes/SystemTheme.cpp
View File

@ -47,3 +47,13 @@ QString SystemTheme::appStyleSheet()
{
return QString();
}
double SystemTheme::fadeAmount()
{
return 0.5;
}
QColor SystemTheme::fadeColor()
{
return QColor(128,128,128);
}

3
application/themes/SystemTheme.h
View File

@ -13,8 +13,9 @@ public:
QString qtTheme() override;
QString appStyleSheet() override;
QPalette colorScheme() override;
double fadeAmount() override;
QColor fadeColor() override;
private:
QPalette systemPalette;
QString systemTheme;
};