d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-09 06:17:58 +00:00
Code Issues Projects Releases Wiki Activity

Correctly load colors from custom themes

Browse Source 
PR #19448.
Closes #19447.
This commit is contained in:
Vladimir Golovnev 2023-08-12 18:57:34 +03:00 committed by GitHub
parent 69d60b5f1c
commit 56ba5e5182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/gui/uithemesource.cpp
View File

@ -161,13 +161,13 @@ void DefaultThemeSource::loadColors()
return; return;
} }
const QByteArray configData = readResult.value(); const QByteArray &configData = readResult.value();
if (configData.isEmpty()) if (configData.isEmpty())
return; return;
const QJsonObject config = parseThemeConfig(configData); const QJsonObject config = parseThemeConfig(configData);
QHash<QString, QColor> lightModeColorOverrides = colorsFromJSON(config.value(KEY_COLORS_LIGHT).toObject()); const QHash<QString, QColor> lightModeColorOverrides = colorsFromJSON(config.value(KEY_COLORS_LIGHT).toObject());
for (auto overridesIt = lightModeColorOverrides.cbegin(); overridesIt != lightModeColorOverrides.cend(); ++overridesIt) for (auto overridesIt = lightModeColorOverrides.cbegin(); overridesIt != lightModeColorOverrides.cend(); ++overridesIt)
{ {
auto it = m_colors.find(overridesIt.key()); auto it = m_colors.find(overridesIt.key());
@ -175,7 +175,7 @@ void DefaultThemeSource::loadColors()
it.value().light = overridesIt.value(); it.value().light = overridesIt.value();
} }
QHash<QString, QColor> darkModeColorOverrides = colorsFromJSON(config.value(KEY_COLORS_DARK).toObject()); const QHash<QString, QColor> darkModeColorOverrides = colorsFromJSON(config.value(KEY_COLORS_DARK).toObject());
for (auto overridesIt = darkModeColorOverrides.cbegin(); overridesIt != darkModeColorOverrides.cend(); ++overridesIt) for (auto overridesIt = darkModeColorOverrides.cbegin(); overridesIt != darkModeColorOverrides.cend(); ++overridesIt)
{ {
auto it = m_colors.find(overridesIt.key()); auto it = m_colors.find(overridesIt.key());
@ -184,6 +184,12 @@ void DefaultThemeSource::loadColors()
} }
} }
CustomThemeSource::CustomThemeSource(const Path &themeRootPath)
: m_themeRootPath {themeRootPath}
{
loadColors();
}
QColor CustomThemeSource::getColor(const QString &colorId, const ColorMode colorMode) const QColor CustomThemeSource::getColor(const QString &colorId, const ColorMode colorMode) const
{ {
if (colorMode == ColorMode::Dark) if (colorMode == ColorMode::Dark)
@ -246,6 +252,11 @@ DefaultThemeSource *CustomThemeSource::defaultThemeSource() const
return m_defaultThemeSource.get(); return m_defaultThemeSource.get();
} }
Path CustomThemeSource::themeRootPath() const
{
return m_themeRootPath;
}
void CustomThemeSource::loadColors() void CustomThemeSource::loadColors()
{ {
const auto readResult = Utils::IO::readFile((themeRootPath() / Path(CONFIG_FILE_NAME)), FILE_MAX_SIZE, QIODevice::Text); const auto readResult = Utils::IO::readFile((themeRootPath() / Path(CONFIG_FILE_NAME)), FILE_MAX_SIZE, QIODevice::Text);
@ -257,7 +268,7 @@ void CustomThemeSource::loadColors()
return; return;
} }
const QByteArray configData = readResult.value(); const QByteArray &configData = readResult.value();
if (configData.isEmpty()) if (configData.isEmpty())
return; return;
@ -267,13 +278,9 @@ void CustomThemeSource::loadColors()
m_darkModeColors.insert(colorsFromJSON(config.value(KEY_COLORS_DARK).toObject())); m_darkModeColors.insert(colorsFromJSON(config.value(KEY_COLORS_DARK).toObject()));
} }
Path QRCThemeSource::themeRootPath() const
{
return Path(u":/uitheme"_s);
}
FolderThemeSource::FolderThemeSource(const Path &folderPath) FolderThemeSource::FolderThemeSource(const Path &folderPath)
: m_folder {folderPath} : CustomThemeSource(folderPath)
, m_folder {folderPath}
{ {
} }
@ -285,10 +292,10 @@ QByteArray FolderThemeSource::readStyleSheet()
const QString stylesheetResourcesDir = u":/uitheme"_s; const QString stylesheetResourcesDir = u":/uitheme"_s;
QByteArray styleSheetData = CustomThemeSource::readStyleSheet(); QByteArray styleSheetData = CustomThemeSource::readStyleSheet();
return styleSheetData.replace(stylesheetResourcesDir.toUtf8(), themeRootPath().data().toUtf8()); return styleSheetData.replace(stylesheetResourcesDir.toUtf8(), m_folder.data().toUtf8());
} }
Path FolderThemeSource::themeRootPath() const QRCThemeSource::QRCThemeSource()
: CustomThemeSource(Path(u":/uitheme"_s))
{ {
return m_folder;
} }

11
src/gui/uithemesource.h
View File

@ -84,21 +84,24 @@ public:
QByteArray readStyleSheet() override; QByteArray readStyleSheet() override;
protected: protected:
virtual Path themeRootPath() const = 0; explicit CustomThemeSource(const Path &themeRootPath);
DefaultThemeSource *defaultThemeSource() const; DefaultThemeSource *defaultThemeSource() const;
private: private:
Path themeRootPath() const;
void loadColors(); void loadColors();
const std::unique_ptr<DefaultThemeSource> m_defaultThemeSource = std::make_unique<DefaultThemeSource>(); const std::unique_ptr<DefaultThemeSource> m_defaultThemeSource = std::make_unique<DefaultThemeSource>();
Path m_themeRootPath;
QHash<QString, QColor> m_colors; QHash<QString, QColor> m_colors;
QHash<QString, QColor> m_darkModeColors; QHash<QString, QColor> m_darkModeColors;
}; };
class QRCThemeSource final : public CustomThemeSource class QRCThemeSource final : public CustomThemeSource
{ {
private: public:
Path themeRootPath() const override; QRCThemeSource();
}; };
class FolderThemeSource : public CustomThemeSource class FolderThemeSource : public CustomThemeSource
@ -109,7 +112,5 @@ public:
QByteArray readStyleSheet() override; QByteArray readStyleSheet() override;
private: private:
Path themeRootPath() const override;
const Path m_folder; const Path m_folder;
}; };