From 52499c78dd2f122b55df8b5bf9030fbf8effc021 Mon Sep 17 00:00:00 2001 From: Johannes Millan Date: Mon, 16 Jan 2017 22:03:43 +0100 Subject: [PATCH] add icon mac --- electron/assets/icons/tray-ico.png | Bin 1231 -> 1784 bytes electron/assets/icons/tray-ico@2.png | Bin 0 -> 1784 bytes electron/main.js | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 electron/assets/icons/tray-ico@2.png diff --git a/electron/assets/icons/tray-ico.png b/electron/assets/icons/tray-ico.png index ed6f59ca0dd797a437e41c6a5d5452638667acd3..276f18eb73e9b6ee19d7f5414c9331b9a6b55d7a 100644 GIT binary patch literal 1784 zcmY*ad0f)j7DrTEMsvy0N=qIzHfnV|sKf(c5`bb+ zs0tJWf@NV8CIw(5!daB`3_6B|LwrPF6!wN2jeviIFb?7nk$Xbm-XINtJD}`Q)(AIE zI2?|p9Z10t@xGta6(<}bmBFB5&}b%;iDKHJKpF{cnihFfSd4FEFesUQRUG3Eb)p9^Bq8(sWQSDz$*^eQyFX=2e| z?$1p# z;Gulop<}FdT)q}300gU~=VFUGM2HWs(Bo^41vE@W-l&&a`E7SWK>^x}>E5imz(rBb zw!k_#hZ9`4sF*f2HR+tWeP>jvKdVhGJ+;NU5kTgB(8(K#YcHPYC~dj$vxdr_1lUv_ zc<8su{JieCQ9k&{JJ+~p9MetHCX_2_o%dYXK_wF1bttXQa1!Z_`5(>|?ne39d0x_~ ziW$$5V=XO1T~%7K1*)XWw-HCWjWzDkWn`>%LJu;b3eVKo^??l=T{KU1*EDm9df7Nn zs!(hCT_}@4PX+Vl=T^eaJewX2y>f;0g&ssTyiP_9Np3^Vbm(`r#+DcjEm=PwZM*qG zeB&3D0yMyT|2Bd{I4z5M7+Goi_45?{qwQq>U!jo9U6=dr>RW5u*T?23%AvgDUQ$f+ zr6^p(4a>!}bQWxMweR%7r*UIw%v5`P!L$KYYgPHx*wvO}?o$t5R)x<@zAQYx%6?~f zLwl3Y&FcDlnKRYx@S>hcM_9I6e#GU+;%1}VwN0?Y9wWs&pZ0Xa^HC&W@Mz)XP7TU3 z;FkpTWM46t$zIdC?iiOA%#Q!y{Ny#%W4w+bHw-E^9;&?)UQh1*E*)b}T$pnrTXvbV zU>$d$*wFX3L;iB}RO%hz2mb?Eu=%DY6fMb#$rTmFzeu^-EfZ==b# z&pHXyqSYPqXFNK4kgwjW%-fxJ`Bu2z2v%*)Fc@Edt%0tI(d2^if?fI2(l+f-D{wx zNsv?e0gn8e4=sjP(k`CJ56RgxcT+7{TQzpc*f;pdH0P{raP#Z3sHmGF`_NlCrULzC@8-g4MNoWKKy$9Yv}k80kH; zvlXSh!f7Y`w201D&7G*koXK>$*1??>AxSITy`-Py5Y4RkmT65PNIOznr6TIzeZIOs zXlgw#MFrDZ=gz|}#`wQgS@bdUPEqAWKAK)C95T4y{%x(Py34vn7T}D2GU$N7uO)^2 zj5Qr>wJv$~LtW6;mCakr)dGjUZ_j#BGvP+8lKWkg*qFo8Eqm3svoCQ44!rQQ8FAN7 zlz9scOOo!Ace+F8egD}41@v;(;~4M0Uk5nsdqc~Sw%gks!ivAjv#{~sAHn3>a``)O zbj~ACP3Ti-mhC7w6~Bs5=3VRzl$K0uTU0`>!%PkT`lU%;*3Gjz8j9JWJYO55*8mQz z-j@zW{3|zYf28&@LF(9J33^faO1)y(45}X#ir$1q(}LjVp%);o9?_zpZos3UUT;o^ zyVObG>u7Ozab$r(Vx@3yC8s{O8zL%u7t!#S-Q8`*=c*F)DVR34rxD*2pH=-7Nf delta 1211 zcmV;s1VsDz4bKUXB!32COGiWi000000Qp0^e*gdg32;bRa{vGf6951U69E94oEQKA z00(qQO+^Rc0SOT#E@6HllK=n!8FWQhbVF}#ZDnqB07G(RVRU6=Aa`kWXdp*PO;A^X z4i^9b1UE@UK~#9!?V3$&R8B3AflqEeAXHptBFQQDJf}*^LNqv%yaD5%-r|U z_Wd{a-N}3B+;iSN|98&00~s=8$dDmJhS>^BO0lF%fK9-SKnu_SEC2-j3G@Kp0$so- zW_Er?cwEvpNq^s~e0(gaZ8{r%pQOK3J-(9EG@T5um9$s>@#1tazCqGyMTh;8ER`fE zX%%o1$VKeu<7U=e>BG5*j9&~KiNSb)CQ18K(h~QNC^Xew6eO)Svs2z3AgLbM4r~LKrZ@?`8t~@;NvnZ3fLo_Y3DWG110=ob-g-GW z>+1R(kOzi=kqPc!STY}+^}Qxzs8c_*XM%{x4j?WQu;@u8%; zvOj~8u73c21+J`coeSKUcjH`-+q;|;`!1kg(hE~|fTRNO15jJ(3X8?!u)7RKpY5!X z3Z8jJ(l^1*oR9+~{RlKxvr9|liUfO)B^UtKnAz`Reg!1$tkU?vsqX^kfC8`uIK*g! zQyyg31GiQ9{6)Y?Np)s6^uJG?$Es|ZliA|tPk(tN!FxTd@4K-$;1!Qs?ShigX9)PH zU)D+L{5J$7UCd~Y-WS>>4FD@cU7Nc-$-c&uoM$ENH0OX0;3Z}s-VPkF54gdj;MZJZ zWEt=vun#!sfdm280{8f$lz>=BX>z_a&+d#-`Gzs_{DBzt?-;MxI2_XgdQ0@~mQ;*M_koF;qVs@0 zV0j!IU}o=0S`U03Q{49hE6uDpZe=BD32-bXCv*cF@q2bK9{Paha6{B4sJrI@pML?@ z&XBriH*jb0<|l11n%S_KwE-P7!1#yFti9Cua=I`DN$+?dpSL9aGRZxAJd)j;lKlN! zO;TRc6OxXUv4}&Gw!4rDLt2-{G?q&3R@e4EiyGp0805om^HUMi}muY@TSD&jb4gy_fc7_ZYGGxe*Awz~K Z;2%iNfkBqV|sKf(c5`bb+ zs0tJWf@NV8CIw(5!daB`3_6B|LwrPF6!wN2jeviIFb?7nk$Xbm-XINtJD}`Q)(AIE zI2?|p9Z10t@xGta6(<}bmBFB5&}b%;iDKHJKpF{cnihFfSd4FEFesUQRUG3Eb)p9^Bq8(sWQSDz$*^eQyFX=2e| z?$1p# z;Gulop<}FdT)q}300gU~=VFUGM2HWs(Bo^41vE@W-l&&a`E7SWK>^x}>E5imz(rBb zw!k_#hZ9`4sF*f2HR+tWeP>jvKdVhGJ+;NU5kTgB(8(K#YcHPYC~dj$vxdr_1lUv_ zc<8su{JieCQ9k&{JJ+~p9MetHCX_2_o%dYXK_wF1bttXQa1!Z_`5(>|?ne39d0x_~ ziW$$5V=XO1T~%7K1*)XWw-HCWjWzDkWn`>%LJu;b3eVKo^??l=T{KU1*EDm9df7Nn zs!(hCT_}@4PX+Vl=T^eaJewX2y>f;0g&ssTyiP_9Np3^Vbm(`r#+DcjEm=PwZM*qG zeB&3D0yMyT|2Bd{I4z5M7+Goi_45?{qwQq>U!jo9U6=dr>RW5u*T?23%AvgDUQ$f+ zr6^p(4a>!}bQWxMweR%7r*UIw%v5`P!L$KYYgPHx*wvO}?o$t5R)x<@zAQYx%6?~f zLwl3Y&FcDlnKRYx@S>hcM_9I6e#GU+;%1}VwN0?Y9wWs&pZ0Xa^HC&W@Mz)XP7TU3 z;FkpTWM46t$zIdC?iiOA%#Q!y{Ny#%W4w+bHw-E^9;&?)UQh1*E*)b}T$pnrTXvbV zU>$d$*wFX3L;iB}RO%hz2mb?Eu=%DY6fMb#$rTmFzeu^-EfZ==b# z&pHXyqSYPqXFNK4kgwjW%-fxJ`Bu2z2v%*)Fc@Edt%0tI(d2^if?fI2(l+f-D{wx zNsv?e0gn8e4=sjP(k`CJ56RgxcT+7{TQzpc*f;pdH0P{raP#Z3sHmGF`_NlCrULzC@8-g4MNoWKKy$9Yv}k80kH; zvlXSh!f7Y`w201D&7G*koXK>$*1??>AxSITy`-Py5Y4RkmT65PNIOznr6TIzeZIOs zXlgw#MFrDZ=gz|}#`wQgS@bdUPEqAWKAK)C95T4y{%x(Py34vn7T}D2GU$N7uO)^2 zj5Qr>wJv$~LtW6;mCakr)dGjUZ_j#BGvP+8lKWkg*qFo8Eqm3svoCQ44!rQQ8FAN7 zlz9scOOo!Ace+F8egD}41@v;(;~4M0Uk5nsdqc~Sw%gks!ivAjv#{~sAHn3>a``)O zbj~ACP3Ti-mhC7w6~Bs5=3VRzl$K0uTU0`>!%PkT`lU%;*3Gjz8j9JWJYO55*8mQz z-j@zW{3|zYf28&@LF(9J33^faO1)y(45}X#ir$1q(}LjVp%);o9?_zpZos3UUT;o^ zyVObG>u7Ozab$r(Vx@3yC8s{O8zL%u7t!#S-Q8`*=c*F)DVR34rxD*2pH=-7Nf literal 0 HcmV?d00001 diff --git a/electron/main.js b/electron/main.js index 5d8a4f7a6d..1031017acf 100644 --- a/electron/main.js +++ b/electron/main.js @@ -163,7 +163,7 @@ electron.ipcMain.on('CHANGED_CURRENT_TASK', (ev, task) => { if (task.timeSpent && task.timeSpent._data) { task.timeSpent = moment.duration(task.timeSpent._data); - timeStr += task.timeSpent.asMinutes().toString() + 'm'; + timeStr += parseInt(task.timeSpent.asMinutes()).toString() + 'm'; } if (task.timeEstimate) { timeStr += '/' + moment.duration(task.timeEstimate).asMinutes() + 'm ';