From 8615f0fd8cf80ac96ac0c911db8e4ca1cb1692a5 Mon Sep 17 00:00:00 2001 From: Nick Denry Date: Mon, 18 May 2020 17:51:43 +0300 Subject: [PATCH] Hotfix tray icons for each platform --- modules/tray-service.js | 22 +++++++++++++++++++--- resources/images/envelope-16x16.png | Bin 0 -> 488 bytes resources/images/envelope-48x48.png | Bin 0 -> 1585 bytes resources/images/icon-16x16.png | Bin 0 -> 701 bytes resources/images/icon-48x48.png | Bin 0 -> 2339 bytes 5 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 resources/images/envelope-16x16.png create mode 100644 resources/images/envelope-48x48.png create mode 100644 resources/images/icon-16x16.png create mode 100644 resources/images/icon-48x48.png diff --git a/modules/tray-service.js b/modules/tray-service.js index 0476d04..4f978a3 100644 --- a/modules/tray-service.js +++ b/modules/tray-service.js @@ -11,9 +11,23 @@ let tray = null let trayService = {} +let getTrayServiceIcon = (iconName = 'icon') => { + let iconImage = '' + if (process.platform === 'darwin') { + iconImage = iconName + } + else if (process.platform === 'win32') { + iconImage = iconName+'-16x16' + } + else { + iconImage = iconName+'-48x48' + } + return path.join(__dirname, '/../resources/images/' + iconImage + '.png') +} + trayService.initTray = (window) => { trayServiceWindow = window - let iconPath = path.join(__dirname, '/../resources/images/icon.png') + let iconPath = getTrayServiceIcon() tray = new Tray(iconPath) tray.setToolTip('Chimeverse') tray.on('click', function() { @@ -26,11 +40,13 @@ trayService.initTray = (window) => { } trayService.showEnvelope = () => { - tray.setImage(path.join(__dirname, '/../resources/images/envelope.png')) + let iconPath = getTrayServiceIcon('envelope') + tray.setImage(iconPath) } trayService.hideEnvelope = () => { - tray.setImage(path.join(__dirname, '/../resources/images/icon.png')) + let iconPath = getTrayServiceIcon() + tray.setImage(iconPath) } module.exports = trayService diff --git a/resources/images/envelope-16x16.png b/resources/images/envelope-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..95ef4acc5ba41733be5f061dcbe1d7f534c22418 GIT binary patch literal 488 zcmVP)L}000McNliru>|f$z^lMB^zB%N#P&2*e@UkanbsE35UgftP~cO*J?@^w$jGZ zLP5a;U&uxaUtopYOqxW3T#`OyV5(srehctKLlgZ?$-|v4b7K?Yj?^}jp{Hs(de>*9IdeXG^FSglrHUTV;jBMpbc)4^b1 z=JWZGhy;KT5$n3n00e-P%jMZ-vx$vHBU40ZpI|+*YS9K+iW&3-ns!1L9f?~ e1Mok{FFXPsdz`2%yuh{q0000L}000McNliru*f8I zlCRA95deM@1OW(w0F6ddP^;A?Q53P04j#vG#Bp3}CXG;`UzBZy!nkA#}rF zFqFExyR*~N)B2sAotEL@;j~__FPqF|IF6%}dgAeTo6qMnS1J{ZVVH!?X4{g`ugQK3+jCnhFVX`0UOssFDE zz>n%7y7OqSxz-Ukkii0ssI& zlBCEm%u086_jWWIl?MU=lOPBU?FUg5F_vYGi;Ii$Q>RXCU%Pf~MJknwNA}8b9PRSu z%c*nc&hg93%WXcN&y>w(TN)93Hk)nn`Fy5$JWloY_GX<ur0^A_V|p-?7%$*V{%$ zMp73pTu8@aF`3`*H|6tryq<+oQcv_e&$s$~KC>u_*zoXh+HSXR?r+3qW@dDOK)__T z+xbW&q67dK9UVs z8+N-r`-RPJjgOD7Nu^R@c6L@Rl}g32v9UF))w;Dm#%{M~FI~Enl1L=r^ZCplKYpZY zQKA+F#5Zr=sORVBH55gauU@^H)ai7E1C5BAOs2fs?Ou&Wqa9YOHK$UkN(T~#ojG$R zr`2l9!C=tvEK5JE6BGoyR;>Xk+=mzO*q&#F$RJ8ZLsDV56d z#fuj?l}c4UY>ZZ`EqcA)ghHVxzkdB%{rvfJ{c%o!RTC(cN_Z#~(k(13D9vW`uGi~L zbaZr-8{uLynXKaVdJ|n;UAyn!zgL7pAziUptg5-IDIt{4=Ot59Q=O?)O4{4o%MT0; z@Dhmx)#Kj>l^{t{93LNFpPQRgy?ggg#c>?za=F$himKGLo#r@>ynp|`ndf=w`Sa&_ zhr_|`1>bNG1c3$z2f4n!KAz`!a&mIAE0f8P$1Wj+5bPc6s6ZfKESJmp;NalKz`#KI zBu-@g{rww5Lqi*tN(EzC))Ylc6L^~xVWgGD5~OgI+I$hw$P}R zyBaZUHrr-rXJ_%zqeq6vj~{oQJ$rU@b90lzFzm1YB!FSq&2&2bYdW1)Vi<-9g4hX% z!>s_&`YrB-2!hxV1VOQ|u&{p~zj>4bzXL!Q0Q`gyGIAWJ{MHv+dzV`Y0Qdy}{%GDu jHqk^AO*GL&6Ai-O#zL9dA4Lvh00000NkvXXu0mjfyC?NI literal 0 HcmV?d00001 diff --git a/resources/images/icon-16x16.png b/resources/images/icon-16x16.png new file mode 100644 index 0000000000000000000000000000000000000000..272cd853118e685427d371bb9d068790f7e79dd0 GIT binary patch literal 701 zcmV;u0z&R`YuLJ9O5rD^_o=DaG#yS^?lR1LnM|G!D;$u$y}kXmUay}JkxoQ4BKk!{zb(sZ2%sPa&}c! zr;EiR5mB9pj)>@lh|Y+}Afm?c@$reOswx0X+(zIy&bwGFb_&1)zy*K<5CC)mG^eJf zY@g5fgsApmgSfzib^05h|SN>ABm#a>HF2|^<1`XSNjC6-QC>*eWg;#Tv%8* z^LRWzbzT2hE|-O7vw5F$?h^#T#TdiE!NGn$pZ~hKxjFhT6bc2BBv=fPhG_c0uQ*JaG4=v03W?5F%w(aW5%1U{8dHL1S($ZwN+kK;H+Tuu? jH#RnIt!FZs8;|`1%v23oI;E0&00000NkvXXu0mjfl~+m6 literal 0 HcmV?d00001 diff --git a/resources/images/icon-48x48.png b/resources/images/icon-48x48.png new file mode 100644 index 0000000000000000000000000000000000000000..0bd6e8914610c16f7a8868d64f9b228f1cca508b GIT binary patch literal 2339 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 JPDHLkV1fo8SIqzb literal 0 HcmV?d00001