d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 18:04:32 +00:00
Code Issues Projects Releases Wiki Activity

Support fallback when selecting theme icons

Browse Source 
Fallback icon theme are not supported everywhere. Hence we mimic
signature of QIcon::fromTheme().
This commit is contained in:
Eugene Shalygin 2017-01-13 17:01:36 +01:00
parent 3c1f747c25
commit 9d3378bd3b
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/guiiconprovider.cpp
View File

@ -57,10 +57,17 @@ GuiIconProvider *GuiIconProvider::instance()
} }
QIcon GuiIconProvider::getIcon(const QString &iconId) QIcon GuiIconProvider::getIcon(const QString &iconId)
{
return getIcon(iconId, iconId);
}
QIcon GuiIconProvider::getIcon(const QString &iconId, const QString &fallback)
{ {
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
if (m_useSystemTheme) { if (m_useSystemTheme) {
QIcon icon = QIcon::fromTheme(iconId, QIcon(IconProvider::getIconPath(iconId))); QIcon icon = QIcon::fromTheme(iconId);
if (icon.name() != iconId)
icon = QIcon::fromTheme(fallback, QIcon(IconProvider::getIconPath(iconId)));
icon = generateDifferentSizes(icon); icon = generateDifferentSizes(icon);
return icon; return icon;
} }

1
src/gui/guiiconprovider.h
View File

@ -44,6 +44,7 @@ public:
static GuiIconProvider *instance(); static GuiIconProvider *instance();
QIcon getIcon(const QString &iconId); QIcon getIcon(const QString &iconId);
QIcon getIcon(const QString &iconId, const QString &fallback);
QIcon getFlagIcon(const QString &countryIsoCode); QIcon getFlagIcon(const QString &countryIsoCode);
QString getIconPath(const QString &iconId); QString getIconPath(const QString &iconId);