From 5cfcc7e6e9ead939ead6e16f50b631f40531c741 Mon Sep 17 00:00:00 2001 From: pompurin404 Date: Wed, 28 Aug 2024 21:53:03 +0800 Subject: [PATCH] adjust tray --- changelog.md | 8 +++----- resources/iconTemplate.png | Bin 3048 -> 5991 bytes resources/iconTemplate@2x.png | Bin 4048 -> 0 bytes src/main/resolve/tray.ts | 2 +- .../src/components/sider/conn-card.tsx | 4 ++-- src/renderer/src/utils/calc.ts | 2 +- 6 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 resources/iconTemplate@2x.png diff --git a/changelog.md b/changelog.md index c888e04..6e2bf3a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,7 +1,5 @@ -### New Features - -- 调整UI细节 - ### Bug Fixes -- 修复MacOS托盘绘制网速导致的占用异常 +- 修复MacOS系统代理修改失败的问题 +- 修复Windows URL Scheme失效的问题 +- 修复DNS策略无法删除的问题 diff --git a/resources/iconTemplate.png b/resources/iconTemplate.png index 6212d2a0d1c568b80b3b9688ba90340c4553cf7b..d10e85d77527d522539b825ddcbeefbd7c93333b 100644 GIT binary patch delta 3311 zcmbVP3pmqzA4e<0i3mxZnrTFKXSSJ3*<22D$r7ii*=Ad_i(T5L%Q`M0j-t0*Dh@ev zauOoRoZN~MUA>Vgak>a+^3e6<{VRDo@6-F9=Y9Xrv;Y71|NTF|&-e4aKF^*ldy241 z4GQpHtZ%8WrKPpl*N40jczVqKz>9$UX>RO5rPVQgl{rjH%N(ZdyK#+1OA9p4rG-hu zsQyHTkdL4NnBIR;9LXJfU#cU*+Kp-Gd7$gRxf&&n^L@AKc6>x#X`ZEQY zC1HrUA}LoWfXq_Tql7Z4D-_WB$qT+{o>w55ixdzuq=GI&q7kTBr#=FijCq_$CXV@N zoykD5Vpx2ZKq^71&xT8C22K0aZoLMAs_`By9kPs5;zPR>Lu zfc*jr)Dx2~rT;CM$sk4x#e6#8GM7(hvydVI8w!~ZB+*kPj1h_f%YZ)YM;TNq(N`dm z(gh5bFWD6ec#Yt4nM6Fw**V$?C>1&$Plsa}jyPb2Bftr0lrw`s$DtT_$Is`k`k_($dZFC9kI`j*s>6(zmjf z>uMg33WVmIGe3KIc$k)+*}lZsXwBo`l=XKlkipjIqLkemml8b4C=d0`A=r0~7RWW0 z43rJdi#oA0(I@bldheAk^JLhS6DIj^y;!MqL^N`H z61_FTn5O6l5zMO%cfpOxu~tW;s^dD#25c)#Chw@<$7aHI?MG*p_)J#8%*X82W@+e* z{+fIE4=IwKcVIQhn@&*WAM~sMPgZK3ZFIuBcXlYT?kA#sCdHsK%_en-!!QY*oKOMk z5S8Yvo3?pmH#(v@p8Z(78`|0NWm5t6n6h+kvraks4&fb{L&F=BosaL$W%S~JqO>ht#$duf|fPD zf95n%UgOJ4tH*}&%v6UOkCS+=OXUE=9t_i>i-gf0pGkS$Z zw7mtdCRFZhu$#e)f*Fs+`t_1 zjmM72EtI39S8j-m_gZIVv@~8yOsFnt&uW8ob}Wp$$!%D2(}ezPt!X$Wn0d9cSujI} z_o6&s>y}@cq8uefzIzYJEZ`(YhD7ZeJ=cA}p%u`qon$atvx7ODAk_(MO&(`-j*Nk-D-c+~4pUgH`c(P63@?8uhU zzT(iT0@yG=wZCrpD?Oc^2hPn%k94%UfkxRHcrmc>1SHSK z@XmvGJiR@YSq*w&Nkf)~p>61HMZaKBnD$}FsIaxOKc-i|BT?DHP^QzhG=04O z46(5DS&QXe5Kx3ipZs1cI+pYP;r=81Aya+T6zm4w?^}YcrR=%;nwK5mn_I%le(?G?%H7@O77a-my zo2SHIg@-*fSRUamGkak>s2U#mv%APvl>eG=4c9VhDA#B0+RrJ8GaC1wd}&x1f-?;l ztDF~%$#rRC{IaC;ZsEU9+oPYil_mG5J{F4mp(vP{)jtZIYTCrcC>G)-$tuCuY$@q=Vi->)@_I_urqz~Wcn4m+c?hve+XN@ jplL=ghp!#IVrD_J*~aQVE4N=}|C0Dp0?6eXw#WYqImC7y delta 345 zcmV-f0jB=vF6b8_iBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVX+~b3V#a| z000XU0RWnu7ytkP2}wjjR5*>L(?2LhQ5*;G&(&L$$*LHTVlya|k{Bq9k{FT`pR8{gX=Rf8B>x?x zq%1)l4|py(4`QT%y~sGK#|b{LB_nDv!pATb=?i$pI^JUrZZV2kd_{PpP%ga(y*R^l roL~h*c#}P4E4c_A&0{!e_dEXrGk!FGtRG+p00000NkvXXu0mjf?2U<; diff --git a/resources/iconTemplate@2x.png b/resources/iconTemplate@2x.png deleted file mode 100644 index 47da2ff9d1d02f272f0ba095313251c3a2a8406f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4048 zcmV;>4=?bEP)StO&>uS)ve<0AYj>5AR{$W90N^4L=L-RlQUJ&DC0@ZjPh;=*jPLSYvv5M~MFBAl0-BNIsH z15C~g000{K(ZT*WKal6<?_01!^k@7iDG<<3=fuAC~28EsPoqkpK{9G%|Vj005J}`Hw&=0RYXHq~ibpyyzHQsFW8>#s~laM4*8xut5h5 z!4#~(4xGUqyucR%VFpA%3?#rj5JCpzfE)^;7?wd9RKPme1hudO8lVxH;SjXJF*pt9 z;1XPc>u?taU>Kgl7`%oF1VP9M6Ja4bh!J9r*dopd7nzO(B4J20l7OTj>4+3jBE`sZ zqynizYLQ(?Bl0bB6giDtK>Co|$RIL`{EECsF_eL_Q3KQhbwIhO9~z3rpmWi5G!I>X zmZEFX8nhlgfVQHi(M#xcbO3#dj$?q)F%D*o*1Pf{>6$SWH+$s3q(pv=X`qR|$iJF~TPzlc-O$C3+J1 z#CT#lv5;6stS0Uu9wDA3UMCI{Uz12A4#|?_P6{CkNG+sOq(0IRX`DyT~9-sA|ffUF>wk++Z!kWZ5P$;0Hg6gtI-;!FvmBvPc55=u2?Kjj3apE5$3psG>L zsh-pbs)#zDT1jo7c2F-(3)vyY4>O^>2$gY-Gd%Qm(Z8e zYv>2*=jns=cMJ`N4THx>VkjAF8G9M07`GWOnM|ey)0dgZR4~^v8<}UA514ONSSt1^ zd=-((5|uiYR+WC0=c-gyb5%dpd8!Lkt5pxHURHgkMpd&=fR^vEcAI*_=wwAG2sV%zY%w@v@XU~7=xdm1xY6*0;iwVIXu6TaXrs|dqbIl~ z?uTdNHFy_3W~^@g_pF#!K2~{F^;XxcN!DEJEbDF7 zS8PxlSDOr*I-AS3sI8l=#CDr)-xT5$k15hA^;2%zG3@;83hbKf2JJcaVfH2VZT8O{ z%p4LO);n}Nd~$Sk%yw*Wyz8XlG{dRHsl(}4XB%gsbDi@w7p6;)%MzD%mlsoQr;4X; zpL)xc%+^yMd)ZNTI#eJ*$O)i@o$z8)e??LqN_gLa_%;TM>o2SC_ zkmoO6c3xRt`@J4dvz#WL)-Y|z+r(Soy~}%GIzByR`p)SCKE^%*pL(B%zNWq+-#xw~ ze%5}Oeh2)X`#bu}{g3#+;d$~F@lFL`0l@*~0lk45fwKc^10MvL1f>Tx1&sx}1}_Xg z6+#RN4Ot&@lW)Km@*DYMGu&q^n$Z=?2%QyL8~QNJCQKgI5srq>2;UHXZ>IT7>CCnW zh~P(Th`1kV8JQRPeH1AwGO8}>QM6NZadh`A)~w`N`)9q5@sFvDxjWlxwsLl7tZHmh zY-8-3xPZ8-xPf?w_(k!T5_A(J3GIpG#Ms0=iQ{tu=WLoYoaCBRmULsT<=mpV7v|~C z%bs^USv6UZd^m-e5|^?+<%1wXP%juy<)>~<9TW0|n}ttBzM_qyQL(qUN<5P0omQ3h zINdvaL;7fjPeygdGYL;pD|wL_lDQ-EO;$wK-mK5raoH_7l$?~Dqf!lNmb5F^Ft;eT zPi8AClMUo~=55LwlZVRpxOiFd;3B_8yA~shQx|tGF!j;$toK>JuS&gYLDkTP@C~gS@r~shUu{a>bfJ1` z^^VQ7&C1OKHDNXFTgC{M|V%fo{xK_dk6MK@9S!GZ*1JJzrV5xZBjOk z9!NTH<(q(S+MDf~ceQX@Dh|Ry<-sT4rhI$jQ0Sq~!`#Eo-%($2E^vo}is5J@NVEf|KK?WT&2;PCq@=ncR8z zO#GQ^T~S@VXG71PKNocFOt)Y6$@AXlk6rM*aP%VgV%sIRORYVwJx6|U{ozQjTW{-S z_si{9Jg#)~P3t?+@6&(!YQWWV*Z9{iU7vZq@5byKw{9lg9JnRA_4s!7?H6|n?o8ZW zdXIRo{Jz@#>IeD{>VLHUv1Pz*;P_y`V9&!@5AO~Mho1hF|I>%z(nrik)gwkDjgOrl z9~%uCz4Bzvli{bbrxVZ0epdf^>vOB;-~HnIOV3#R*zgPai_gEVd8zYq@2jb=I>#f& zAH2?aJ@Kaet(^xB>_oNB=7(L1o25kK~#90?b~ap6;%|#@!!o}S{hVZidd9HFVnOLGeV)hM5Mh) ziykCWNsxVzGU)XogOuo9L=+j71wJSu=_OR4mT4~`lA=t|G7~A&GP4isT<^K}oVo5Z zGv^*n|1jKP&+Ij8*4dA>)~wsMbLUR`G6%F;fmXBM0IgP_)$BJws}*Q9`@8`Ttk*bh z){?$B3xhDQaty+;Sb)cRO2Hglft#=i>#)A^cO6zPo<91Q>YM8t0Ml`I#K<+!lHet&gsDANxZh?O{}M49y%EQ~!WN8jW%ATNEe6c?2&x1C}50w?6`U-Q1r z@&w<)btTIjhtF_i0U0$@yP2-=i@3ccS(oAi98{9LT{Jruco+{9lraVKOVEWn+j~z0 zLwDiXoPB2$=v$8-odVTN!P5=)nU0xF(4`YS84ll!mlN-O5Dzs`mtABqotSOKh z3_T-)lI7Tld-E!igBNgP<$NP<%Oj-d6gax-{66V%c~NHTczNibS5Q#{bnXA7g7J9* zcL*P$nqGN@6@+0Apd=T)%i zHkiU@ktQ3D_wj2&pWY&?v|QQ<`X{e)Sq3P3WNZ_QV=7yPla)&DDbTD%a8D&UAySh) z{hyGW5J??UMf`)I4ni@acOq1z@=w6UUcEtAw$d`;zeBfpMy8G)n3 z;`F6ZJP(^NElbS6w`3XM5nNt5PhAjuiR!W|MFq$1*eKSS_F{)c ziO=bScX7PN9I;;bR@52nBFg|n#V?eHeu?*O6-A3n@RcZHOraOfRA)s`AbA(KSfsq$ zq>q3$F#@(UpwLoWCRXWGeix&le*?M^`fcdi*xeeClDR2^1v&fGyi6X-Op2b58*o^O zGV9TXtHc^rSpTBCz;IE&Gf78{;Lmuwpxo~0hq;yW&7$UDo~R*em^=nJ1rx+e536eb zT9mCW$)iXE{DJFnt*9lKS~)i8Fh;V2mTG_#MOJr`aF5&hPORPwbl%gO$qrFqF$c$q z4<-|Fu5gB?;irmT^YKY{!rJQn-{81eO9=P3UHF))%WJEIFU$WPr888=k5pYnx>}6P zh2kG3I(5o2z*O;}vz_+gHD6SR@9CVT!x*Pmwa;BVee|U28?&ascH#Rk!t3IL#@@uL z$}v+oO%sGMYQp!rBVb=*e~nP96=*g44bW-@TFrl}qUBV1H5%Rk0000 { tray.setContextMenu(menu) } if (process.platform === 'darwin') { - const icon = nativeImage.createFromPath(templateIcon) + const icon = nativeImage.createFromPath(templateIcon).resize({ height: 16 }) icon.setTemplateImage(true) tray = new Tray(icon) } diff --git a/src/renderer/src/components/sider/conn-card.tsx b/src/renderer/src/components/sider/conn-card.tsx index bb33826..67eee81 100644 --- a/src/renderer/src/components/sider/conn-card.tsx +++ b/src/renderer/src/components/sider/conn-card.tsx @@ -223,7 +223,7 @@ const drawSvg = async (upload: number, download: number): Promise => { if (upload === currentUpload && download === currentDownload) return currentUpload = upload currentDownload = download - const svg = `data:image/svg+xml;utf8,↑↓${calcTraffic(upload)}/s${calcTraffic(download)}/s` + const svg = `data:image/svg+xml;utf8,${calcTraffic(upload)}/s${calcTraffic(download)}/s` const image = await loadImage(svg) window.electron.ipcRenderer.send('trayIconUpdate', image) } @@ -247,4 +247,4 @@ const loadImage = (url: string): Promise => { }) } -const trayIconBase64 = `data:image/png;base64,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` +const trayIconBase64 = `data:image/png;base64,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Uk0AAHomAACAhAAA+gAAAIDoAAB1MAAA6mAAADqYAAAXcJy6UTwAAAAJcEhZcwAAFiUAABYlAUlSJPAAAATuaVRYdFhNTDpjb20uYWRvYmUueG1wAAAAAAA8P3hwYWNrZXQgYmVnaW49Iu+7vyIgaWQ9Ilc1TTBNcENlaGlIenJlU3pOVGN6a2M5ZCI/PiA8eDp4bXBtZXRhIHhtbG5zOng9ImFkb2JlOm5zOm1ldGEvIiB4OnhtcHRrPSJBZG9iZSBYTVAgQ29yZSA5LjEtYzAwMiA3OS5kYmEzZGEzLCAyMDIzLzEyLzEzLTA1OjA2OjQ5ICAgICAgICAiPiA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cGhvdG9zaG9wPSJodHRwOi8vbnMuYWRvYmUuY29tL3Bob3Rvc2hvcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgMjUuNiAoV2luZG93cykiIHhtcDpDcmVhdGVEYXRlPSIyMDI0LTA4LTE0VDIyOjE4OjAwKzA4OjAwIiB4bXA6TW9kaWZ5RGF0ZT0iMjAyNC0wOC0yOFQyMTo1NzozMCswODowMCIgeG1wOk1ldGFkYXRhRGF0ZT0iMjAyNC0wOC0yOFQyMTo1NzozMCswODowMCIgZGM6Zm9ybWF0PSJpbWFnZS9wbmciIHBob3Rvc2hvcDpDb2xvck1vZGU9IjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6ODA3N2Y1ZGYtYTg4YS0zYzQ2LWE4NjktOTEwN2M5YTYwYzg0IiB4bXBNTTpEb2N1bWVu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` diff --git a/src/renderer/src/utils/calc.ts b/src/renderer/src/utils/calc.ts index 6e8db3b..87dd1fe 100644 --- a/src/renderer/src/utils/calc.ts +++ b/src/renderer/src/utils/calc.ts @@ -1,5 +1,5 @@ export function calcTraffic(byte: number): string { - if (byte < 1024) return `${byte} B` + if (byte < 1024) return `${formatNumString(byte)} B` byte /= 1024 if (byte < 1024) return `${formatNumString(byte)} KB` byte /= 1024