d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-03-10 20:31:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #13220 from jagannatharjun/fix-style

Browse Source 
Fix style
This commit is contained in:
Mike Tzou 2020-08-03 10:51:50 +08:00 committed by GitHub
commit 8ff4374325
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/application.cpp
View File

@ -615,7 +615,6 @@ int Application::exec(const QStringList &params)
#else #else
UIThemeManager::initInstance(); UIThemeManager::initInstance();
m_window = new MainWindow; m_window = new MainWindow;
UIThemeManager::instance()->applyStyleSheet();
#endif // DISABLE_GUI #endif // DISABLE_GUI
m_running = true; m_running = true;

2
src/gui/statusbar.cpp
View File

@ -49,7 +49,7 @@ StatusBar::StatusBar(QWidget *parent)
#ifndef Q_OS_MACOS #ifndef Q_OS_MACOS
// Redefining global stylesheet breaks certain elements on mac like tabs. // Redefining global stylesheet breaks certain elements on mac like tabs.
// Qt checks whether the stylesheet class inherts("QMacStyle") and this becomes false. // Qt checks whether the stylesheet class inherts("QMacStyle") and this becomes false.
qApp->setStyleSheet("QStatusBar::item { border-width: 0; }"); setStyleSheet("QStatusBar::item { border-width: 0; }");
#endif #endif
BitTorrent::Session *const session = BitTorrent::Session::instance(); BitTorrent::Session *const session = BitTorrent::Session::instance();

6
src/gui/uithememanager.cpp
View File

@ -88,6 +88,7 @@ UIThemeManager::UIThemeManager()
else { else {
loadColorsFromJSONConfig(); loadColorsFromJSONConfig();
applyPalette(); applyPalette();
applyStyleSheet();
} }
} }
} }
@ -99,11 +100,6 @@ UIThemeManager *UIThemeManager::instance()
void UIThemeManager::applyStyleSheet() const void UIThemeManager::applyStyleSheet() const
{ {
if (!m_useCustomTheme) {
qApp->setStyleSheet({});
return;
}
QFile qssFile(":uitheme/stylesheet.qss"); QFile qssFile(":uitheme/stylesheet.qss");
if (!qssFile.open(QIODevice::ReadOnly | QIODevice::Text)) { if (!qssFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
qApp->setStyleSheet({}); qApp->setStyleSheet({});

3
src/gui/uithememanager.h
View File

@ -45,8 +45,6 @@ public:
static void freeInstance(); static void freeInstance();
static UIThemeManager *instance(); static UIThemeManager *instance();
void applyStyleSheet() const;
QString getIconPath(const QString &iconId) const; QString getIconPath(const QString &iconId) const;
QIcon getIcon(const QString &iconId, const QString &fallback = {}) const; QIcon getIcon(const QString &iconId, const QString &fallback = {}) const;
QIcon getFlagIcon(const QString &countryIsoCode) const; QIcon getFlagIcon(const QString &countryIsoCode) const;
@ -58,6 +56,7 @@ private:
QString getIconPathFromResources(const QString &iconId, const QString &fallback = {}) const; QString getIconPathFromResources(const QString &iconId, const QString &fallback = {}) const;
void loadColorsFromJSONConfig(); void loadColorsFromJSONConfig();
void applyPalette() const; void applyPalette() const;
void applyStyleSheet() const;
static UIThemeManager *m_instance; static UIThemeManager *m_instance;
QHash<QString, QColor> m_colors; QHash<QString, QColor> m_colors;