From 9a3fab7545a6ffc738f4a980a27c945630f8863a Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Thu, 3 Mar 2016 17:40:46 +0100 Subject: [PATCH] fixes #83 [ci skip] --- .../java/org/cryptomator/ui/TrayIconUtil.java | 4 +++- main/ui/src/main/resources/tray_icon.png | Bin 369 -> 588 bytes .../src/main/resources/tray_icon_mac_black.png | Bin 0 -> 369 bytes ...y_icon@2x.png => tray_icon_mac_black@2x.png} | Bin ...y_icon_white.png => tray_icon_mac_white.png} | Bin ..._white@2x.png => tray_icon_mac_white@2x.png} | Bin main/ui/src/main/resources/window_icon.png | Bin 564 -> 588 bytes 7 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 main/ui/src/main/resources/tray_icon_mac_black.png rename main/ui/src/main/resources/{tray_icon@2x.png => tray_icon_mac_black@2x.png} (100%) rename main/ui/src/main/resources/{tray_icon_white.png => tray_icon_mac_white.png} (100%) rename main/ui/src/main/resources/{tray_icon_white@2x.png => tray_icon_mac_white@2x.png} (100%) diff --git a/main/ui/src/main/java/org/cryptomator/ui/TrayIconUtil.java b/main/ui/src/main/java/org/cryptomator/ui/TrayIconUtil.java index 2edb595ae..eb56fb2e2 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/TrayIconUtil.java +++ b/main/ui/src/main/java/org/cryptomator/ui/TrayIconUtil.java @@ -86,7 +86,9 @@ class TrayIconUtil { final Image image; if (SystemUtils.IS_OS_MAC_OSX && isMacMenuBarDarkMode()) { - image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/tray_icon_white.png")); + image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/tray_icon_mac_white.png")); + } else if (SystemUtils.IS_OS_MAC_OSX) { + image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/tray_icon_mac_black.png")); } else { image = Toolkit.getDefaultToolkit().getImage(getClass().getResource("/tray_icon.png")); } diff --git a/main/ui/src/main/resources/tray_icon.png b/main/ui/src/main/resources/tray_icon.png index 68fce050da60520d9f9caab3ac4b54d2c115b971..766b601e0f2bed50cec9e8a188d0a43063f34484 100644 GIT binary patch literal 588 zcmV-S0<-;zP)(v_l+)nd#_QsTrGZC5bM-o6W6N?1ZEwoOnR8Y9&lYd@A)Nxz+h+)>(udO zr!jt*x|BoTz6zEeC5U(F^h#>ABz;%VGB3Y+pk13bmT+i}hh-iG+O~Oa3_D(#BF>kN zSoFESHTT#Y4lXB#*e?atZsmw^V_tOV-ShIIWec!&-72hFvjQtuF9$s@U$q3C`t-U& z46$DcgeIfA$H0D1Y~k?jL7Vb1VVe%NNcfb&?>jqXyBz~Ir^6Zv-6MwBPX$!{8liS= zj!A6RLu{AMd-m<$g#8CL!xjx+;H!Ue|A8%__qIK{9U+ET%6t&0U9LWS&tLLzOt|e3 z_v$`N1z5Jb58Pb%oR?$HE#2K4{g+C?3^eT`hFG=R)%$}WQ!F{cS9N=lQrV~6pjaHA zmiTJoRujf8Y4>!(lFrX2u6M#cq9p`2*=nBYNi1bP2+{#4D^p@786UEuO?EuKsX{-CVNC@a%JV=_uo@0tB$?@o+c0s_z#Qe aFV5H6Esm(f+NUM}0000ASl>zj*#Pa+~I|H?GE< z*DuIym&7w6z9iO}{gjr1#o1t&3vzfWi28SDp5TS-zTmF==B4Y4nz@nIbKUd67xWf% zG$37{P}#+_9;CHkh)>+|UI}rSo&le#4hl=$mjN=WXO;0N;Dr#+TV+%6WfU1@wFc2s z-5tj?S3-Y#QsrHmkLWGGMozk=7CnqtGHR2AAD-^|Dr#Eo z>O}2Tj7}#q879}KPkm#MoN6j#RH}|gE<>XCiMA3Uo`ry|LOie4@kjXpcp{{KuVYq_ P00000NkvXXu0mjfDIuzA diff --git a/main/ui/src/main/resources/tray_icon_mac_black.png b/main/ui/src/main/resources/tray_icon_mac_black.png new file mode 100644 index 0000000000000000000000000000000000000000..68fce050da60520d9f9caab3ac4b54d2c115b971 GIT binary patch literal 369 zcmV-%0gnEOP)ASl>zj*#Pa+~I|H?GE< z*DuIym&7w6z9iO}{gjr1#o1t&3vzfWi28SDp5TS-zTmF==B4Y4nz@nIbKUd67xWf% zG$37{P}#+_9;CHkh)>+|UI}rSo&le#4hl=$mjN=WXO;0N;Dr#+TV+%6WfU1@wFc2s z-5tj?S3-Y#QsrHmkLWGGMozk=7CnqtGHR2AAD-^|Dr#Eo z>O}2Tj7}#q879}KPkm#MoN6j#RH}|gE<>XCiMA3Uo`ry|LOie4@kjXpcp{{KuVYq_ P00000NkvXXu0mjfDIuzA literal 0 HcmV?d00001 diff --git a/main/ui/src/main/resources/tray_icon@2x.png b/main/ui/src/main/resources/tray_icon_mac_black@2x.png similarity index 100% rename from main/ui/src/main/resources/tray_icon@2x.png rename to main/ui/src/main/resources/tray_icon_mac_black@2x.png diff --git a/main/ui/src/main/resources/tray_icon_white.png b/main/ui/src/main/resources/tray_icon_mac_white.png similarity index 100% rename from main/ui/src/main/resources/tray_icon_white.png rename to main/ui/src/main/resources/tray_icon_mac_white.png diff --git a/main/ui/src/main/resources/tray_icon_white@2x.png b/main/ui/src/main/resources/tray_icon_mac_white@2x.png similarity index 100% rename from main/ui/src/main/resources/tray_icon_white@2x.png rename to main/ui/src/main/resources/tray_icon_mac_white@2x.png diff --git a/main/ui/src/main/resources/window_icon.png b/main/ui/src/main/resources/window_icon.png index f7a10f8edffc2496a4b5361bb90b612f13d0b402..766b601e0f2bed50cec9e8a188d0a43063f34484 100644 GIT binary patch literal 588 zcmV-S0<-;zP)(v_l+)nd#_QsTrGZC5bM-o6W6N?1ZEwoOnR8Y9&lYd@A)Nxz+h+)>(udO zr!jt*x|BoTz6zEeC5U(F^h#>ABz;%VGB3Y+pk13bmT+i}hh-iG+O~Oa3_D(#BF>kN zSoFESHTT#Y4lXB#*e?atZsmw^V_tOV-ShIIWec!&-72hFvjQtuF9$s@U$q3C`t-U& z46$DcgeIfA$H0D1Y~k?jL7Vb1VVe%NNcfb&?>jqXyBz~Ir^6Zv-6MwBPX$!{8liS= zj!A6RLu{AMd-m<$g#8CL!xjx+;H!Ue|A8%__qIK{9U+ET%6t&0U9LWS&tLLzOt|e3 z_v$`N1z5Jb58Pb%oR?$HE#2K4{g+C?3^eT`hFG=R)%$}WQ!F{cS9N=lQrV~6pjaHA zmiTJoRujf8Y4>!(lFrX2u6M#cq9p`2*=nBYNi1bP2+{#4D^p@786UEuO?EuKsX{-CVNC@a%JV=_uo@0tB$?@o+c0s_z#Qe aFV5H6Esm(f+NUM}0000=@B;)#?`d*z*cjk`9 zD5pNn={M(|^Si%u&z-SonidhxW(oHKVQ-co$0dRt3VF=|OvBA@BvAy{pegS8T}aIe zM{osB*dQlkhh|l4o zgg1CKNT3H?25~R%?3tzX+gg~(08|)c+5pW4aU1lq-yUcIHwRTgfx$%cuw@Vz2dG* z_Bp9ZXcrv2BoKM6y(}F6H7`E~2+K#^f<|((5P1><33I zHpKUmegGZZK+!T_P#P~Dj&2^dKmN)5_x~!s1Q-C(p0fXHgQu1N0000