github/qBittorrent
1
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2024-10-17 13:01:11 +02:00
Code Releases Activity

Use the SVG for the tray icon.

Browse Source
This commit is contained in:
sledgehammer999 2017-09-26 02:17:32 +03:00
parent 48d7bdee0e
commit 09cb95d3da
No known key found for this signature in database
GPG Key ID: 6E4A2D025B7CC9A2
8 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -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+

1
dist/unix/CMakeLists.txt vendored
View File

@ -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

9
src/gui/mainwindow.cpp
View File

@ -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

2
src/icons.qrc
View File

@ -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>

0
src/icons/qbittorrent-with-font.svg → src/icons/skin/qbittorrent-tray-with-font.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 740 B

After

Width:  |  Height:  |  Size: 740 B

0
src/icons/qbittorrent.svg → src/icons/skin/qbittorrent-tray.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/icons/skin/qbittorrent22.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

3
unixconf.pri
View File

@ -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/