From 00007768f1e3f19d7ae40ca599244b533c59242e Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 6 Jul 2015 09:10:57 +0000 Subject: [PATCH] Fixed overlay icon (star) for tray icon. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8578 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-gui/src/gui/MainWindow.cpp | 3 ++- retroshare-gui/src/gui/icons.qrc | 1 + .../src/gui/icons/star_overlay_128.png | Bin 0 -> 4893 bytes retroshare-gui/src/gui/images.qrc | 1 - retroshare-gui/src/gui/images/rstray_star.png | Bin 341 -> 0 bytes 5 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/star_overlay_128.png delete mode 100644 retroshare-gui/src/gui/images/rstray_star.png diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp index 2bfb4bcf2..411d72944 100644 --- a/retroshare-gui/src/gui/MainWindow.cpp +++ b/retroshare-gui/src/gui/MainWindow.cpp @@ -123,6 +123,7 @@ #define IMAGE_NOONLINE ":/icons/logo_0_connected_128.png" #define IMAGE_ONEONLINE ":/icons/logo_1_connected_128.png" #define IMAGE_TWOONLINE ":/icons/logo_2_connected_128.png" +#define IMAGE_OVERLAY ":/icons/star_overlay_128.png" /* Images for toolbar icons */ //#define IMAGE_NETWORK2 ":/images/rs1.png" @@ -743,7 +744,7 @@ void MainWindow::updateFriends() QIcon icon; if (notifyMenu && notifyMenu->menuAction()->isVisible()) { QPixmap trayImage(trayIconResource); - QPixmap overlayImage(":/images/rstray_star.png"); + QPixmap overlayImage(IMAGE_OVERLAY); QPainter painter(&trayImage); painter.drawPixmap(0, 0, overlayImage); diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index ace4e200d..875ce19d0 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -44,6 +44,7 @@ icons/security_high_128.png icons/security_low_128.png icons/security_medium_128.png + icons/star_overlay_128.png icons/switch00_128.png icons/switch01_128.png icons/switch10_128.png diff --git a/retroshare-gui/src/gui/icons/star_overlay_128.png b/retroshare-gui/src/gui/icons/star_overlay_128.png new file mode 100644 index 0000000000000000000000000000000000000000..7474fecf821d4794933664c47f5351fa2bb0a78a GIT binary patch literal 4893 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 literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc index 51cc7470a..611ff6510 100644 --- a/retroshare-gui/src/gui/images.qrc +++ b/retroshare-gui/src/gui/images.qrc @@ -427,7 +427,6 @@ images/reload24.png images/reset.png images/resume.png - images/rstray_star.png images/security-high-16.png images/security-high-48.png images/security-low-48.png diff --git a/retroshare-gui/src/gui/images/rstray_star.png b/retroshare-gui/src/gui/images/rstray_star.png deleted file mode 100644 index 3840855365650c276be875850785119c74f648b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmV-b0jmCqP);gng5qWR`hh6Z81ym}D(?WIYL>d_1hR5AF<0*3$E z@pr-Os|%GGbP~vSHRHKi4Euq!1BfGOkia0Jp9q$CadAGw^9u`L>JAvCF*uTB@bSqE z|1ENWuKc(Uy9$0Mh7(hi87y;2b3Nn!9