From e518e670f2849ad1428be6466a3095327f50f800 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Mon, 23 May 2016 18:26:41 +0000
Subject: [PATCH] DTG: Add tray icons for Windows and Mac White icon copied
from Android drawable-mdpi/ic_stat_router_active.png for Windows Converted to
black in Gimp for Mac
---
apps/desktopgui/build.xml | 2 ++
apps/desktopgui/images/itoopie_black_24.png | Bin 0 -> 558 bytes
apps/desktopgui/images/itoopie_white_24.png | Bin 0 -> 677 bytes
.../src/net/i2p/desktopgui/TrayManager.java | 16 ++++++++++++++--
4 files changed, 16 insertions(+), 2 deletions(-)
create mode 100644 apps/desktopgui/images/itoopie_black_24.png
create mode 100644 apps/desktopgui/images/itoopie_white_24.png
diff --git a/apps/desktopgui/build.xml b/apps/desktopgui/build.xml
index 1629eeef43..1a1c9105e3 100644
--- a/apps/desktopgui/build.xml
+++ b/apps/desktopgui/build.xml
@@ -75,6 +75,8 @@
<property name="workspace.changes.tr" value="" />
<!-- ideal for linux: 24x24, but transparency doesn't work -->
<copy tofile="${build}/desktopgui/resources/images/logo.png" file="../../installer/resources/themes/console/images/itoopie_xsm.png" />
+ <copy todir="${build}/desktopgui/resources/images" file="images/itoopie_black_24.png" />
+ <copy todir="${build}/desktopgui/resources/images" file="images/itoopie_white_24.png" />
<jar basedir="${build}" excludes="messages-src/**" destfile="${dist}/${jar}">
<manifest>
<attribute name="Main-Class" value="net.i2p.desktopgui.Main"/>
diff --git a/apps/desktopgui/images/itoopie_black_24.png b/apps/desktopgui/images/itoopie_black_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee108ab34c765a94304bc7928c820ffcc6d990a0
GIT binary patch
literal 558
zcmV+}0@3}6P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00009a7bBm0001{
z0001{0o{H7H~;_v;7LS5R7l6I)y<2|VH5}O&)hqqkcDE3WTTNHCT~-UC|P(fk`;?7
zO~y*pY%DZ?f(1fJv#>CdVkvoTGD*{Tjqy57d6_BK6{c%*)b0A+x%2zoIra4XIz7+#
zJm-7P_x$qGSu<Kt#CMZu&A5V6*?NI3lL5XLzbn8?Wxf;jfKSIG9Kr$I3DE1<hdmg;
zx~u_C;wVM}xGnbMv5%kwH>v^TY6Mt?pLmT8_!j<m*o?QBg{4_DxQUloj|J$Cm*2*2
zv`5e)8nOiFPAG2DdXP1PWf+@4fcAPi>3j|Fd&t)lU@9(E0l$icXsmX*u?F~j9Eo<_
zfu3m1FX+RjQ1pB3!jm*FKZwz&!8Y`w3r{hakj?2d;K$<91#HJz9LDDa;6YrAEGKL&
z7>YfQkJw+O4xMPl#xzRq!*YDUiuj(FaPD!ad^T<+0gcyQg-~Y)hNELj;Va-S&S5cD
z22H7F(KLL;YMjBV7#lrUgNxCLomn+7qk``-EQ$J*`xj-Mra$no;`|?6F7pkKH%)6v
zydfxR#mt~&2y^iZpMv`VyvdTm)}W*fYw-+I@I11+kN#-kTw4BfWn33xB#h!z%>Uks
wTI{SwK`p_}34njrkEZz36@#i`%%}hCFLP9^-hZUmQUCw|07*qoM6N<$f(#r7IsgCw
literal 0
HcmV?d00001
diff --git a/apps/desktopgui/images/itoopie_white_24.png b/apps/desktopgui/images/itoopie_white_24.png
new file mode 100644
index 0000000000000000000000000000000000000000..61c0c28f5195ba12ab8c00d733b4b76f7da3069f
GIT binary patch
literal 677
zcmV;W0$TlvP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00004b3#c}2nYxW
zd<bNS00009a7bBm0001{0001{0o{H7H~;_u8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10wPI7K~zYIrIt%bRZ$d%zpIxDG8!0B6w;s&grJ085Euo~pf?od
zs0Km=HHrc!1rij^f(A9{MKlP^20{%QL`V-LiI5%^kv$Lt^GcLa>DS<F;dVRco_kLV
z4(qVk>tBz5uf2Cpr3z^T8i0Oas3H%wlCM#{>EAM-Zc6j51bnyp%YS9ccKm+=%v7JK
z2h@FPPXO&!_o%zn=jz(50XozpY9Ro(1$`{&f_g~3orF=7LeUD~2k;hH2aE>$dtf6l
z2+RhSW+nNK`dV#K8`SF|^ZV*f^`JVcj;pyWEt&#MlSf%wbPAYE-|Sq?+9K48DcL_z
zYm@vd2{2u~mH>WBU8Lrd{PQWLF9Z$)9l$oA3n&01Kp(IH7yv#1JAh}^v}nINrcS6^
z)L!+Z`a*pdQ_cBmDmV(91}=xJw*psy6F_~*+QE?d=W0l9R)>PFRX?e%2|To`Yt;2|
zSV`No4_F3#1eS;Y1u^TM5>0tMa4!z19Ld8#9k3VZ1kM7pfEHj55xJc}6EGj>jsr;>
zv>Ct`U?p$?coPD20jr1xEDy9NBBabfT}i(u)TY2su`Ef#NUPvG@VKPn-@uI`+c0HL
z)3g8pXNU%Al4z?g2EGD!fga!z(ePyou$hR&HefaI5|{?OBC75o(F3405vxr9Yl?dP
z&FGRJQ_mTl|Ggz#Y>&gqY1wB>GcXq@UepiFBf9CvfuBK-!~y&PIYk0DXFXt100000
LNkvXXu0mjfx0MnZ
literal 0
HcmV?d00001
diff --git a/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java b/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java
index 6217e8d88b..fc2c7b59ed 100644
--- a/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java
+++ b/apps/desktopgui/src/net/i2p/desktopgui/TrayManager.java
@@ -38,6 +38,11 @@ abstract class TrayManager {
///Our tray icon, or null if unsupported
protected TrayIcon trayIcon;
+ private static final String PNG_DIR = "/desktopgui/resources/images/";
+ private static final String MAC_ICON = "itoopie_black_24.png";
+ private static final String WIN_ICON = "itoopie_white_24.png";
+ private static final String LIN_ICON = "logo.png";
+
/**
* Instantiate tray manager.
*/
@@ -185,9 +190,16 @@ abstract class TrayManager {
* @throws AWTException if image not found
*/
private Image getTrayImage() throws AWTException {
- URL url = getClass().getResource("/desktopgui/resources/images/logo.png");
+ String img;
+ if (SystemVersion.isWindows())
+ img = WIN_ICON;
+ else if (SystemVersion.isMac())
+ img = MAC_ICON;
+ else
+ img = LIN_ICON;
+ URL url = getClass().getResource(PNG_DIR + img);
if (url == null)
- throw new AWTException("cannot load tray image");
+ throw new AWTException("cannot load tray image " + img);
Image image = Toolkit.getDefaultToolkit().getImage(url);
return image;
}
--
GitLab