Use the SVG for the tray icon.

satyamisme · Oct 30, 2017 · 09cb95d · 09cb95d
1 parent 48d7bde
commit 09cb95d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 8 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -34,7 +34,7 @@ Code from other projects:
   license: GPLv2/3
 
 Images Authors:
-* files: src/icons/qbittorrent.svg (and related pngs)
+* files: src/icons/skin/qbittorrent-tray.svg (and related pngs)
   copyright: Provided by HVS <hvs linuxmail org> (raster first proposal) and Atif Afzal(@atfzl github) <atif5801@gmail.com> (vectorized and modified)
   license: GPLv2+
 

diff --git a/dist/unix/CMakeLists.txt b/dist/unix/CMakeLists.txt
@@ -38,6 +38,7 @@ if (GUI)
             COMPONENT data)
 
     install(FILES
+            ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray.svg
             ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray-dark.svg
             ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray-light.svg
         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/status

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -1960,6 +1960,8 @@ QIcon MainWindow::getSystrayIcon() const
     }
 #else
     switch (style) {
+    case TrayIcon::NORMAL:
+        return QIcon(QLatin1String(":/icons/skin/qbittorrent-tray.svg"));
     case TrayIcon::MONO_DARK:
         return QIcon(QLatin1String(":/icons/skin/qbittorrent-tray-dark.svg"));
     case TrayIcon::MONO_LIGHT:
@@ -1969,11 +1971,8 @@ QIcon MainWindow::getSystrayIcon() const
     }
 #endif
 
-    QIcon icon;
-    icon.addFile(":/icons/skin/qbittorrent22.png", QSize(22, 22));
-    icon.addFile(":/icons/skin/qbittorrent16.png", QSize(16, 16));
-    icon.addFile(":/icons/skin/qbittorrent32.png", QSize(32, 32));
-    return icon;
+    // As a failsafe in case the enum is invalid
+    return QIcon(QLatin1String(":/icons/skin/qbittorrent-tray.svg"));
 }
 #endif
 

diff --git a/src/icons.qrc b/src/icons.qrc
@@ -359,10 +359,10 @@
         <file>icons/skin/logo2.gif</file>
         <file>icons/skin/mascot.png</file>
         <file>icons/skin/paused.png</file>
+        <file>icons/skin/qbittorrent-tray.svg</file>
         <file>icons/skin/qbittorrent-tray-dark.svg</file>
         <file>icons/skin/qbittorrent-tray-light.svg</file>
         <file>icons/skin/qbittorrent16.png</file>
-        <file>icons/skin/qbittorrent22.png</file>
         <file>icons/skin/qbittorrent32.png</file>
         <file>icons/skin/queued.png</file>
         <file>icons/skin/ratio.png</file>

diff --git a/src/icons/qbittorrent-with-font.svg → ...icons/skin/qbittorrent-tray-with-font.svg b/src/icons/qbittorrent-with-font.svg → ...icons/skin/qbittorrent-tray-with-font.svg
diff --git a/src/icons/qbittorrent.svg → src/icons/skin/qbittorrent-tray.svg b/src/icons/qbittorrent.svg → src/icons/skin/qbittorrent-tray.svg
diff --git a/src/icons/skin/qbittorrent22.png b/src/icons/skin/qbittorrent22.png
diff --git a/unixconf.pri b/unixconf.pri
@@ -91,7 +91,8 @@ nogui:systemd {
     statusIcon192.files = $$DIST_PATH/menuicons/192x192/status/qbittorrent-tray.png
     statusIcon192.path = $$DATADIR/icons/hicolor/192x192/status/
 
-    statusIconScalable.files = $$PWD/src/icons/skin/qbittorrent-tray-dark.svg \
+    statusIconScalable.files = $$PWD/src/icons/skin/qbittorrent-tray.svg \
+                               $$PWD/src/icons/skin/qbittorrent-tray-dark.svg \
                                $$PWD/src/icons/skin/qbittorrent-tray-light.svg
     statusIconScalable.path = $$DATADIR/icons/hicolor/scalable/status/