Allow custom tray icons when system icon theme is used. Closes #7403.

This commit is contained in:
Eugene Shalygin 2017-09-11 16:18:10 +02:00
parent 93ed8e98c1
commit 4ec193042f

View file

@ -1943,15 +1943,12 @@ void MainWindow::checkForActiveTorrents()
#ifndef Q_OS_MAC
QIcon MainWindow::getSystrayIcon() const
{
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
if (Preferences::instance()->useSystemIconTheme())
return QIcon::fromTheme("qbittorrent-tray");
#endif
const TrayIcon::Style style = Preferences::instance()->trayIconStyle();
// on Linux we use theme icons, and icons from resources everywhere else
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
switch (style) {
case TrayIcon::NORMAL:
return QIcon::fromTheme(QLatin1String("qbittorrent-tray"));
case TrayIcon::MONO_DARK:
return QIcon::fromTheme(QLatin1String("qbittorrent-tray-dark"));
case TrayIcon::MONO_LIGHT: