diff --git a/AUTHORS b/AUTHORS index c6aa0ecfd..3aa3c64c8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -34,6 +34,14 @@ Code from other projects: license: GPLv2/3 Images Authors: +* files: src/icons/skin/qbittorrent-tray.svg (and related pngs) + copyright: Provided by HVS (raster first proposal) and Atif Afzal(@atfzl github) (vectorized and modified) + license: GPLv2+ + +* files: src/qbittorrent_file.ico src/icons/fileicon.svg + copyright: 'uknown.svg' (LGPLv3+) from Oxygen Icon Theme was used as base which was slightly modified and 'qbittorrent-tray.svg' (GPLv2+) was overlayed above it. + license: GPLv3+ + * files: src/icons/*.png copyright: Gnome Icon Theme license: GPLv2 diff --git a/dist/mac/qBitTorrentDocument.icns b/dist/mac/qBitTorrentDocument.icns index 4132085e7..dfe357306 100644 Binary files a/dist/mac/qBitTorrentDocument.icns and b/dist/mac/qBitTorrentDocument.icns differ diff --git a/dist/mac/qbittorrent_mac.icns b/dist/mac/qbittorrent_mac.icns index bcfffe69b..63851e77a 100644 Binary files a/dist/mac/qbittorrent_mac.icns and b/dist/mac/qbittorrent_mac.icns differ diff --git a/dist/unix/CMakeLists.txt b/dist/unix/CMakeLists.txt index 2dfb3f4fa..e32b25b8c 100644 --- a/dist/unix/CMakeLists.txt +++ b/dist/unix/CMakeLists.txt @@ -25,10 +25,6 @@ if (GUI) DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor FILES_MATCHING PATTERN "*.png") - install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.png - DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps/ - COMPONENT data) - install(FILES ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ COMPONENT data) @@ -38,6 +34,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/dist/unix/menuicons/128x128/apps/qbittorrent.png b/dist/unix/menuicons/128x128/apps/qbittorrent.png index d66343bac..b212352d9 100644 Binary files a/dist/unix/menuicons/128x128/apps/qbittorrent.png and b/dist/unix/menuicons/128x128/apps/qbittorrent.png differ diff --git a/dist/unix/menuicons/128x128/status/qbittorrent-tray.png b/dist/unix/menuicons/128x128/status/qbittorrent-tray.png index d66343bac..b212352d9 100644 Binary files a/dist/unix/menuicons/128x128/status/qbittorrent-tray.png and b/dist/unix/menuicons/128x128/status/qbittorrent-tray.png differ diff --git a/dist/unix/menuicons/16x16/apps/qbittorrent.png b/dist/unix/menuicons/16x16/apps/qbittorrent.png index 440f254fa..07ded05d6 100644 Binary files a/dist/unix/menuicons/16x16/apps/qbittorrent.png and b/dist/unix/menuicons/16x16/apps/qbittorrent.png differ diff --git a/dist/unix/menuicons/16x16/status/qbittorrent-tray.png b/dist/unix/menuicons/16x16/status/qbittorrent-tray.png index 440f254fa..07ded05d6 100644 Binary files a/dist/unix/menuicons/16x16/status/qbittorrent-tray.png and b/dist/unix/menuicons/16x16/status/qbittorrent-tray.png differ diff --git a/dist/unix/menuicons/192x192/apps/qbittorrent.png b/dist/unix/menuicons/192x192/apps/qbittorrent.png index 9ec69b38a..7aec0d9e1 100644 Binary files a/dist/unix/menuicons/192x192/apps/qbittorrent.png and b/dist/unix/menuicons/192x192/apps/qbittorrent.png differ diff --git a/dist/unix/menuicons/192x192/status/qbittorrent-tray.png b/dist/unix/menuicons/192x192/status/qbittorrent-tray.png index 9ec69b38a..7aec0d9e1 100644 Binary files a/dist/unix/menuicons/192x192/status/qbittorrent-tray.png and b/dist/unix/menuicons/192x192/status/qbittorrent-tray.png differ diff --git a/dist/unix/menuicons/22x22/apps/qbittorrent.png b/dist/unix/menuicons/22x22/apps/qbittorrent.png index 6da1543cd..94c664545 100644 Binary files a/dist/unix/menuicons/22x22/apps/qbittorrent.png and b/dist/unix/menuicons/22x22/apps/qbittorrent.png differ diff --git a/dist/unix/menuicons/22x22/status/qbittorrent-tray.png b/dist/unix/menuicons/22x22/status/qbittorrent-tray.png index 6da1543cd..94c664545 100644 Binary files a/dist/unix/menuicons/22x22/status/qbittorrent-tray.png and b/dist/unix/menuicons/22x22/status/qbittorrent-tray.png differ diff --git a/dist/unix/menuicons/24x24/apps/qbittorrent.png b/dist/unix/menuicons/24x24/apps/qbittorrent.png index 32267058c..a9943176d 100644 Binary files a/dist/unix/menuicons/24x24/apps/qbittorrent.png and b/dist/unix/menuicons/24x24/apps/qbittorrent.png differ diff --git a/dist/unix/menuicons/24x24/status/qbittorrent-tray.png b/dist/unix/menuicons/24x24/status/qbittorrent-tray.png index 32267058c..a9943176d 100644 Binary files a/dist/unix/menuicons/24x24/status/qbittorrent-tray.png and b/dist/unix/menuicons/24x24/status/qbittorrent-tray.png differ diff --git a/dist/unix/menuicons/32x32/apps/qbittorrent.png b/dist/unix/menuicons/32x32/apps/qbittorrent.png index ba838a3d3..e3e2c3256 100644 Binary files a/dist/unix/menuicons/32x32/apps/qbittorrent.png and b/dist/unix/menuicons/32x32/apps/qbittorrent.png differ diff --git a/dist/unix/menuicons/32x32/status/qbittorrent-tray.png b/dist/unix/menuicons/32x32/status/qbittorrent-tray.png index ba838a3d3..e3e2c3256 100644 Binary files a/dist/unix/menuicons/32x32/status/qbittorrent-tray.png and b/dist/unix/menuicons/32x32/status/qbittorrent-tray.png differ diff --git a/dist/unix/menuicons/36x36/apps/qbittorrent.png b/dist/unix/menuicons/36x36/apps/qbittorrent.png index ba3d44999..3b66e3c53 100644 Binary files a/dist/unix/menuicons/36x36/apps/qbittorrent.png and b/dist/unix/menuicons/36x36/apps/qbittorrent.png differ diff --git a/dist/unix/menuicons/36x36/status/qbittorrent-tray.png b/dist/unix/menuicons/36x36/status/qbittorrent-tray.png index ba3d44999..3b66e3c53 100644 Binary files a/dist/unix/menuicons/36x36/status/qbittorrent-tray.png and b/dist/unix/menuicons/36x36/status/qbittorrent-tray.png differ diff --git a/dist/unix/menuicons/48x48/apps/qbittorrent.png b/dist/unix/menuicons/48x48/apps/qbittorrent.png index 2c49158cd..bcf474882 100644 Binary files a/dist/unix/menuicons/48x48/apps/qbittorrent.png and b/dist/unix/menuicons/48x48/apps/qbittorrent.png differ diff --git a/dist/unix/menuicons/48x48/status/qbittorrent-tray.png b/dist/unix/menuicons/48x48/status/qbittorrent-tray.png index 2c49158cd..bcf474882 100644 Binary files a/dist/unix/menuicons/48x48/status/qbittorrent-tray.png and b/dist/unix/menuicons/48x48/status/qbittorrent-tray.png differ diff --git a/dist/unix/menuicons/64x64/apps/qbittorrent.png b/dist/unix/menuicons/64x64/apps/qbittorrent.png index edfe65866..110b77d08 100644 Binary files a/dist/unix/menuicons/64x64/apps/qbittorrent.png and b/dist/unix/menuicons/64x64/apps/qbittorrent.png differ diff --git a/dist/unix/menuicons/64x64/status/qbittorrent-tray.png b/dist/unix/menuicons/64x64/status/qbittorrent-tray.png index edfe65866..110b77d08 100644 Binary files a/dist/unix/menuicons/64x64/status/qbittorrent-tray.png and b/dist/unix/menuicons/64x64/status/qbittorrent-tray.png differ diff --git a/dist/unix/menuicons/72x72/apps/qbittorrent.png b/dist/unix/menuicons/72x72/apps/qbittorrent.png index 8958cfb45..b4bed8952 100644 Binary files a/dist/unix/menuicons/72x72/apps/qbittorrent.png and b/dist/unix/menuicons/72x72/apps/qbittorrent.png differ diff --git a/dist/unix/menuicons/72x72/status/qbittorrent-tray.png b/dist/unix/menuicons/72x72/status/qbittorrent-tray.png index 8958cfb45..b4bed8952 100644 Binary files a/dist/unix/menuicons/72x72/status/qbittorrent-tray.png and b/dist/unix/menuicons/72x72/status/qbittorrent-tray.png differ diff --git a/dist/unix/menuicons/96x96/apps/qbittorrent.png b/dist/unix/menuicons/96x96/apps/qbittorrent.png index a7e8f781e..b7357e7fe 100644 Binary files a/dist/unix/menuicons/96x96/apps/qbittorrent.png and b/dist/unix/menuicons/96x96/apps/qbittorrent.png differ diff --git a/dist/unix/menuicons/96x96/status/qbittorrent-tray.png b/dist/unix/menuicons/96x96/status/qbittorrent-tray.png index a7e8f781e..b7357e7fe 100644 Binary files a/dist/unix/menuicons/96x96/status/qbittorrent-tray.png and b/dist/unix/menuicons/96x96/status/qbittorrent-tray.png differ diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index f923729ac..793df0026 100644 --- 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 index 4d75fcd5c..974393ce5 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -251,7 +251,6 @@ icons/flags/zw.svg icons/L.gif icons/loading.png - icons/qbittorrent.png icons/qbt-theme/application-exit.png icons/qbt-theme/application-rss+xml.png icons/qbt-theme/application-x-mswinurl.png @@ -359,10 +358,10 @@ icons/skin/logo2.gif icons/skin/mascot.png icons/skin/paused.png + icons/skin/qbittorrent-tray.svg icons/skin/qbittorrent-tray-dark.svg icons/skin/qbittorrent-tray-light.svg icons/skin/qbittorrent16.png - icons/skin/qbittorrent22.png icons/skin/qbittorrent32.png icons/skin/queued.png icons/skin/ratio.png diff --git a/src/icons/fileicon.svg b/src/icons/fileicon.svg new file mode 100644 index 000000000..640f9320d --- /dev/null +++ b/src/icons/fileicon.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/icons/qbittorrent.png b/src/icons/qbittorrent.png deleted file mode 100644 index 9ec69b38a..000000000 Binary files a/src/icons/qbittorrent.png and /dev/null differ diff --git a/src/icons/skin/qbittorrent-tray-with-font.svg b/src/icons/skin/qbittorrent-tray-with-font.svg new file mode 100644 index 000000000..ddfb0cfac --- /dev/null +++ b/src/icons/skin/qbittorrent-tray-with-font.svg @@ -0,0 +1,20 @@ + + + qbittorrent-new-light + + + + + + + + + + + b + + + q + + + diff --git a/src/icons/skin/qbittorrent-tray.svg b/src/icons/skin/qbittorrent-tray.svg new file mode 100644 index 000000000..7bbcf9ba0 --- /dev/null +++ b/src/icons/skin/qbittorrent-tray.svg @@ -0,0 +1,16 @@ + + + qbittorrent-new-light + + + + + + + + + + + + + diff --git a/src/icons/skin/qbittorrent16.png b/src/icons/skin/qbittorrent16.png index 765c83492..07ded05d6 100644 Binary files a/src/icons/skin/qbittorrent16.png and b/src/icons/skin/qbittorrent16.png differ diff --git a/src/icons/skin/qbittorrent22.png b/src/icons/skin/qbittorrent22.png deleted file mode 100644 index 2d99147b4..000000000 Binary files a/src/icons/skin/qbittorrent22.png and /dev/null differ diff --git a/src/icons/skin/qbittorrent32.png b/src/icons/skin/qbittorrent32.png index 2086b4343..e3e2c3256 100644 Binary files a/src/icons/skin/qbittorrent32.png and b/src/icons/skin/qbittorrent32.png differ diff --git a/src/icons/skin/splash.png b/src/icons/skin/splash.png index 8565f3175..bf87569ea 100644 Binary files a/src/icons/skin/splash.png and b/src/icons/skin/splash.png differ diff --git a/src/qbittorrent.ico b/src/qbittorrent.ico index a9784dfbf..2bfbb006f 100644 Binary files a/src/qbittorrent.ico and b/src/qbittorrent.ico differ diff --git a/src/qbittorrent_file.ico b/src/qbittorrent_file.ico index 243639661..f05b9a94b 100644 Binary files a/src/qbittorrent_file.ico and b/src/qbittorrent_file.ico differ diff --git a/unixconf.pri b/unixconf.pri index 2280f282a..4ff3672b5 100644 --- 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/