d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-22 20:44:15 +00:00
Code Issues Projects Releases Wiki Activity

Allow to modify default UI theme

Browse Source 
PR #18214.
This commit is contained in:
Vladimir Golovnev 2023-01-14 14:02:20 +03:00 committed by GitHub
parent 209850064a
commit 8db2d04dbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/gui/uithememanager.cpp
View File

@ -41,6 +41,7 @@
#include "base/logger.h" #include "base/logger.h"
#include "base/path.h" #include "base/path.h"
#include "base/preferences.h" #include "base/preferences.h"
#include "base/profile.h"
#include "base/utils/fs.h" #include "base/utils/fs.h"
namespace namespace
@ -72,15 +73,16 @@ namespace
QByteArray readFile(const Path &filePath) QByteArray readFile(const Path &filePath)
{ {
QFile file {filePath.data()}; QFile file {filePath.data()};
if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) if (!file.exists())
{
LogMsg(UIThemeManager::tr("UITheme - Failed to open \"%1\". Reason: %2")
.arg(filePath.filename(), file.errorString())
, Log::WARNING);
return {}; return {};
}
return file.readAll(); if (file.open(QIODevice::ReadOnly | QIODevice::Text))
return file.readAll();
LogMsg(UIThemeManager::tr("UITheme - Failed to open \"%1\". Reason: %2")
.arg(filePath.filename(), file.errorString())
, Log::WARNING);
return {};
} }
class QRCThemeSource final : public UIThemeSource class QRCThemeSource final : public UIThemeSource
@ -172,20 +174,19 @@ UIThemeManager::UIThemeManager()
, m_useSystemIcons {Preferences::instance()->useSystemIcons()} , m_useSystemIcons {Preferences::instance()->useSystemIcons()}
#endif #endif
{ {
if (m_useCustomTheme) const Path themePath = m_useCustomTheme
? Preferences::instance()->customUIThemePath()
: specialFolderLocation(SpecialFolder::Config) / Path(u"themes/default/config.json"_qs);
m_themeSource = createUIThemeSource(themePath);
if (!m_themeSource)
{ {
const Path themePath = Preferences::instance()->customUIThemePath(); LogMsg(tr("Failed to load UI theme from file: \"%1\"").arg(themePath.toString()), Log::WARNING);
m_themeSource = createUIThemeSource(themePath); }
if (!m_themeSource) else
{ {
LogMsg(tr("Failed to load UI theme from file: \"%1\"").arg(themePath.toString()), Log::WARNING); loadColorsFromJSONConfig();
} applyPalette();
else applyStyleSheet();
{
loadColorsFromJSONConfig();
applyPalette();
applyStyleSheet();
}
} }
} }
@ -295,7 +296,7 @@ Path UIThemeManager::getIconPath(const QString &iconId) const
Path UIThemeManager::getIconPathFromResources(const QString &iconId) const Path UIThemeManager::getIconPathFromResources(const QString &iconId) const
{ {
if (m_useCustomTheme && m_themeSource) if (m_themeSource)
{ {
const Path customIcon = m_themeSource->iconPath(iconId); const Path customIcon = m_themeSource->iconPath(iconId);
if (!customIcon.isEmpty()) if (!customIcon.isEmpty())