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

Merge pull request #7428 from evsh/allow-all-tray-icons

Browse Source 
Allow custom tray icons when system icon theme is used. Closes #7403.
This commit is contained in:
Eugene Shalygin 2017-09-12 11:09:44 +02:00 committed by GitHub
commit c6cf3a98a4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/mainwindow.cpp
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: