From 6f048ef40e9668b401b8ebbc071ac7af61ffd0b2 Mon Sep 17 00:00:00 2001 From: QuickMythril Date: Sun, 27 Jun 2021 03:41:49 -0400 Subject: [PATCH 1/6] add status icons --- src/main/resources/images/icons/icon32c.png | Bin 0 -> 1483 bytes src/main/resources/images/icons/icon32m.png | Bin 0 -> 2492 bytes src/main/resources/images/icons/icon32n.png | Bin 0 -> 1582 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/main/resources/images/icons/icon32c.png create mode 100644 src/main/resources/images/icons/icon32m.png create mode 100644 src/main/resources/images/icons/icon32n.png diff --git a/src/main/resources/images/icons/icon32c.png b/src/main/resources/images/icons/icon32c.png new file mode 100644 index 0000000000000000000000000000000000000000..ac7e895b284aff88b159139b78bc197a9de29576 GIT binary patch literal 1483 zcmV;+1vL7JP)Px#1ZP1_K>z@;j|==^1poj7tWZo;MF0Q*000321qKEU6b~UW96ebkReCIBkuYqX zEM$`$K35MSFa`}10R#pD1qcZhAQv@FCs=?oaH245oEJ1q3Kbs!0Rj^%J|t6lHFBgm zb*4Las6BY7J9nofQ+N_9Jp~OC0RjUE6C4^kR4ZSKF>atofUaGUymX|>g0Itywbp{K z(siWCU6H#gUx^qxQV0?o8$MesV~{a#phtnPY@NlGyxg$T?84yn%;@~E&g8Go<;&>% zvC`|6z1(b_#7BUy96nk$bEH&@w~o2lx!Uo~>HO60{?+gQNoa~mX^hV4`?}fij=0%W zjJO&(Qw0nYS&q1!!{Ev0`P1(HA1+oNE>_d+{+`9*S&z9kbEPU@iW4e6)b9TsDN)Vo z`=7<(R*bhba-#|sAC0)#$mRJRC{W4g`H#8SM}e*wHA?~o2Pav9Y@Eco+3>mA@N1sL zDOrC84ihkKok)PMmA=~#Auh1e>Rge#8a-BYq{+eG^>d=g%jf$qY@IxKsEM@I(Cq#d zAWN&r--)!=FKe8OwARw>{x(c<4H`xZA4*Ymmaod-%;xvg?fr_h)huI_fvnNX=KIv_ z|AC^uE=X<>BTXbeW^j(Jugl@g=J?C!`hl*|EM$-+RC;ux$kOfovCrjZf}txxX%;P4 zKU;r>rNP17@W9{na-qm2RCyacSI6S@mbA`Sa+4!HWie5Am$%QZ(dt@|yBj`O(d_)X z*6NF=!*h_Xsm9!tyxT^At_~nCCs%>Z==#Rt^v~(~xY+P&oWv(regzE^7c@H*O7&J@*1P3Hic%8)IRgAYKQg;$6Jz0*q$>#c4j=45+q!TJURExNcx7ZmtQUweW zz~A++(drvMS{XS~TamjHDLp7yfC&{J0R#smRC*dcS6i^ervLx|32;bRa{vGi!T`DsC1n*=At^O=4NWaAZ5>@TDIrxoeFH_P zG=rFup^>qqiK&^ng{76XjfJh9y@RB&k)r|33?5}8V<%@9S2uSL4^J--4|i`LUq2^f zBmV%1JfFCVu~T4BaEJ#Ggoc60@ZgBZDC6iDuuB>FB~&GygS=xwG9GbpU@A5~Au&l+ zE*a!oCIMj~hm=&H@gNYF2BBlqGctvQv$BB-m~(`ra`V9E0|88dM@W8wlu%(2PytJ^ zP>ESQR2ZSa!@E>XNVp8BfK^CR*A{94vI6(=3Q3_#paM1_sVWPoAhH6F>KZ8_37`T_ zA!$uZs2GZZT5V||BcOshq56hKs2ET|Q!|w1(bys*)CyK0)7B0Z^YG~C?CS36?E|@~ zy&s}rf{^UQNf22em^@|bwCOWu&H{RS_8eKExj+T;grw$IL#2UW!NNt0mn>bj+{0tV zN-3dLKn1H&yb1K)nzifJZ`kPJzG<_h&=#NqZVn+eJ8!5g7;N3PeaB9Z_+7h&g!cdy zFz*$TviAvxN`gV`zWoQn4<3>dI(!7EfcL1dklL~1NS1&=Z14%70VhuZ6)=jPR!wp~ z6Ay`QD2RIIoG3VPXP?(Ij=FH>A}m6I0GMDdT{hOc0*Y-QP|yb^xvReU-cW1Y z;}2dt3rup?Z$RW3#0(rkiMF7$yt=lrvG(SzUG{28#zwc{iIzdp;EoJ za~GWKuOpH@(2OJZ&Ve(IEG*-kyK)05;{ZXnsK|Yw5(p4JEb;*AJ_KNV$WvDNXhL0` lk;LOYM;>BiUL1gd0RV2Y@hRd%836zQ002ovPDHLkV1lAGl{o+a literal 0 HcmV?d00001 diff --git a/src/main/resources/images/icons/icon32m.png b/src/main/resources/images/icons/icon32m.png new file mode 100644 index 0000000000000000000000000000000000000000..d94beadff1dd427d16cfa02ef90c876c351bc63e GIT binary patch literal 2492 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 Date: Sun, 27 Jun 2021 03:44:25 -0400 Subject: [PATCH 2/6] load icons into gui --- src/main/java/org/qortal/gui/SplashFrame.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/qortal/gui/SplashFrame.java b/src/main/java/org/qortal/gui/SplashFrame.java index e0859030..e33d784c 100644 --- a/src/main/java/org/qortal/gui/SplashFrame.java +++ b/src/main/java/org/qortal/gui/SplashFrame.java @@ -44,6 +44,9 @@ public class SplashFrame { List icons = new ArrayList<>(); icons.add(Gui.loadImage("icons/icon16.png")); icons.add(Gui.loadImage("icons/icon32.png")); + icons.add(Gui.loadImage("icons/icon32c.png")); + icons.add(Gui.loadImage("icons/icon32m.png")); + icons.add(Gui.loadImage("icons/icon32n.png")); icons.add(Gui.loadImage("icons/icon64.png")); icons.add(Gui.loadImage("icons/icon128.png")); this.splashDialog.setIconImages(icons); From a78ff08202f2b7de91001d89a0e233e7bfe378b2 Mon Sep 17 00:00:00 2001 From: QuickMythril Date: Sun, 27 Jun 2021 03:44:29 -0400 Subject: [PATCH 3/6] add setTrayIcon function --- src/main/java/org/qortal/gui/SysTray.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/main/java/org/qortal/gui/SysTray.java b/src/main/java/org/qortal/gui/SysTray.java index c456d6fe..3ff1306d 100644 --- a/src/main/java/org/qortal/gui/SysTray.java +++ b/src/main/java/org/qortal/gui/SysTray.java @@ -289,6 +289,25 @@ public class SysTray { this.trayIcon.setToolTip(text); } + public void setTrayIcon(int iconid) { + if (trayIcon != null) { + switch (iconid) { + case 1: + this.trayIcon.setImage(Gui.loadImage("icons/icon32c.png")); + break; + case 2: + this.trayIcon.setImage(Gui.loadImage("icons/icon32m.png")); + break; + case 3: + this.trayIcon.setImage(Gui.loadImage("icons/icon32n.png")); + break; + case 4: + this.trayIcon.setImage(Gui.loadImage("icons/icon32.png")); + break; + } + } + } + public void dispose() { if (trayIcon != null) SystemTray.getSystemTray().remove(this.trayIcon); From 11566ec92359745d9f519286ef43af6369b134d5 Mon Sep 17 00:00:00 2001 From: QuickMythril Date: Sun, 27 Jun 2021 03:45:15 -0400 Subject: [PATCH 4/6] set icon on status change --- .../java/org/qortal/controller/Controller.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/qortal/controller/Controller.java b/src/main/java/org/qortal/controller/Controller.java index 4eff8c93..3d1c85b7 100644 --- a/src/main/java/org/qortal/controller/Controller.java +++ b/src/main/java/org/qortal/controller/Controller.java @@ -854,6 +854,7 @@ public class Controller extends Thread { private void updateSysTray() { if (NTP.getTime() == null) { SysTray.getInstance().setToolTipText(Translator.INSTANCE.translate("SysTray", "SYNCHRONIZING_CLOCK")); + SysTray.getInstance().setTrayIcon(1); return; } @@ -867,14 +868,22 @@ public class Controller extends Thread { String actionText; synchronized (this.syncLock) { - if (this.isMintingPossible) + if (this.isMintingPossible) { actionText = Translator.INSTANCE.translate("SysTray", "MINTING_ENABLED"); - else if (this.isSynchronizing) + SysTray.getInstance().setTrayIcon(2); + } + else if (this.isSynchronizing) { actionText = String.format("%s - %d%%", Translator.INSTANCE.translate("SysTray", "SYNCHRONIZING_BLOCKCHAIN"), this.syncPercent); - else if (numberOfPeers < Settings.getInstance().getMinBlockchainPeers()) + SysTray.getInstance().setTrayIcon(3); + } + else if (numberOfPeers < Settings.getInstance().getMinBlockchainPeers()) { actionText = Translator.INSTANCE.translate("SysTray", "CONNECTING"); - else + SysTray.getInstance().setTrayIcon(3); + } + else { actionText = Translator.INSTANCE.translate("SysTray", "MINTING_DISABLED"); + SysTray.getInstance().setTrayIcon(4); + } } String tooltip = String.format("%s - %d %s - %s %d", actionText, numberOfPeers, connectionsText, heightText, height) + "\n" + String.format("Build version: %s", this.buildVersion); From 1dda9a875ed804ff06a05c90385f92d949e4d9a4 Mon Sep 17 00:00:00 2001 From: QuickMythril Date: Tue, 27 Jul 2021 07:19:58 -0400 Subject: [PATCH 5/6] updating icons design credit: Haoshiro --- src/main/resources/images/icons/icon32.png | Bin 2660 -> 694 bytes src/main/resources/images/icons/icon32c.png | Bin 1483 -> 987 bytes src/main/resources/images/icons/icon32m.png | Bin 2492 -> 762 bytes src/main/resources/images/icons/icon32n.png | Bin 1582 -> 676 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/resources/images/icons/icon32.png b/src/main/resources/images/icons/icon32.png index 43a37510c0dff87600ba3d5088b23b3b490dd0ae..e6503e5011b8f2b02967053cc02e5dfdbf5955d9 100644 GIT binary patch delta 681 zcmV;a0#^Ox6t)GB8Gi!+002a!ipBr{00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z007TWOjJc6ARrwlEema)AtECSXqEu0{~sYC3|@u-qVW(-Y5|_>7CuoKK~)$wMFW}Q z0IL2NF+K)_!v}`N8!R*gd9nbS<^@u909l3rhR6U|g8?Qu0DmGf04zcPGD-kpkpPX- z0FTuGh|2+`_W&wB03$R2YMudqy#R5j0dAuJj?@6D`~Wvo0D{8-e7FEXVE|^C04F*C zE<^xaiUU)70WL)VY@q^+&jod^0+ieWATIz+aRP9r1tc^8S%mD400009a7bBm000id000id0mpBsWB>pGa7jc#R5(wali7NLFc3y@ zVUgBiD{dGxNH79Qaji>jwe9;qQxh^)K-!C*t7QI@FEC$5%2FzqORy}WQk5B11-5xA zs>X9!*3=?Jsp%r-=(W6}+@)fUexFh54^Y2i=yeDssekckKsAH$)JWo{2?b88-AUhN zHkr_E!H#`?&*~$406)WMnM@dBM;sarTtfN?A=?`z1$|5>iGY1alLHSC1{V+tX&`G; zN-qM&!C5OqC_(mrv&^=VnXa$Aj`oxM00z-xDg0himT<(a)nTlu-;(S5Cgv~ z*d2ue#(&OsYf}1$fPG&6udv&1gfNNR0-?XNV%r<~^w3+y@vEB`OgrX;hlN;J$DDxu zfk-ZN@&d+hM}A!!_Z$e|A)sQf(%>SM^S z!qF2i5>U?FoNzr2C?AO;1nU#38I+SFg!TFN=_2I9&DfmZVs}?snM(LO P00000NkvXXu0mjf-gpNk literal 2660 zcmV-q3Y+zbP)yWXAYp6=@ILRGyXjHbG!o}POD_ul{g z-z$-f_Dr6xBkCGsDvSXk1VTu6uj>l?@jOWow(z3_JseO~6_YR6Lo&0AGk>{*s?@|| zJ#;#tDu$T4rmiYf6yqV#c}7(g7!0292$GI_SA=oP)KyJY=I#fC!1ENwBEdLA!V?V$ zp@@?XorxZucYTuoyyD$tp5n5n?ni(B3(P%q-0k6(@|^=R2=Sy(nWyB#zS}qMjDy`$ z7(|$~O;uOax@evW>uF3?Y3FrW*Z6UQPWz0EjxqV3PqOfa8%dKkBTArver3?QX7aw< z$bR@GmQK$SL(V)>!kD@&F;$J2+;f##ojZ-rQ>3R*et?t;VZ&Bx z!uAM3tHq{6*Ry`)Q_PR_n2bEGj0Dqxz!!oGrQy-s@MKyO=LM5@{fzQ=-(z)go@{*u zU1WH^qAE*-@G!MuWO5s2njt;I(IOilJ&BOAK~~okx&UgX4!;@k(VIB4{|5STn|ADR zZ6dk0ExEES*%^C`NkL!?%LW!JkLAf1Vy<}$lkJfF$rI>&=)AXSk~gl!~< zqo!(zR#&AXp^e1O!`IXK*jIV#%D1x`jzAb7LdllM<6z>kuOqo)L^2agOBJ%pu&52^ zD?_azF9jESdl@;jG()98l4vi&%+v1wH~?+;_d`Re~m4BuR^`)6P)hu zMb{E^1)+r}+}GyZ7tKl(v=xLN_+FEahDUBo=jl=rv$X#sOz*n^dF(r!yXOu^%sgAC z^h2Z&;;4ObbjvojeDL#}KkyM2hY3|}Eh+GQ2qXkPLRoeTHY>q|f>RIulUr}Ui{yDb zIITS%&1)8OgDGmrH53}5H4F>ZQo*H}m$Utv>u9Y%!^NjhQRy6^ly642?WFzLpYY65 zN~OyNejqVP0cruU*PnXNNbi6|@QlSo3ug>#hu_!mV{ zIbtfSbe+poysrs; z$+kc-YdPjU7XizivMQVMy{If(L+YY2V)Jgj-bjPlkXc)* zMtIb=h|>bIGK9S57?PS2aq5C&wu_=F9cb&VuRJEAXT$%0Ane^3git75ysF z>ura!=o$}HvwXppK;XHZYq#pvRs2|Cx(UKQw_;?|6ex%T)OZK+)U11MCoEmotZUOa zw-I_oqaXI}hY_B=NI%&4L11k7WV0reXhK^xYN%J1;CtUBn!O)6)pY`6+AYMc?F4I2 zBfk3;@<;A*@7kI#%90yQpBcA&_D+%o_D{*Sj)m$t{I zlyfK1f4>?3jy**0{Tyc7PPpYJiW9eCycS~9i(ymG$#AAiP8G&EXT0Z1@mb;VrElA@ zX1KQELhQuD4yQJ>m1MDm*S-HO#BVypiQDer;lJEPF}elxMaub;lwZ5C+1#c`j>5%TD4^Slx%}#V z?0wlauJ12gvLZQ(v8`4pM0+=4%Ra=G9Wczm4jg&jr1S6_Axj-6Y+tdxLFkfhHcxSW z7A2%|9Ez%fq4qIaxeY9UO8ESnngwkbkph#9k-hVST>I+RGQ9PdJb3pQ*wjpHh5d&x zVF!MFGg#wA)|7#6)bd#kuzXOhHe{<9&)9*)JG#C+&)Avc^u{+c7}?&u%tmuCf?)-# z8ZH$zgWND@64E_a^P;`aXD~iR{;DI;=^-wyARayr`Otw7s)j??LtVP6@oK@0S!V3v zpK|f!eJ8q(NAGDR@4HO3)hP?aREIf3~4JAc7a1JUxOr5VP2wZ=jfBXT;M?S># z!8c&u{AuRKc3_lrN@%^XsNE222bDr&tl?pfC<=@nVDeRrNf8XdBuw^~Xx(=U%P0Os zI#_djw1=H!tVed~qCJOr#x|tV9!#8QDF?(4LXu9G=O6hnt9!5Kj2fqGCe009XaM|g zSv6cdi}=B3Fl4klAyK#I^ghorEZ6eE8af{!WkA^KIGe5ttVhjxP&fnjW=C{S1zbA& z1m!)y;zdzOYix>@T(}|Ah1`X`MAXK4#$bi^soUAT?;xGt4$}2iCpNb2+GE|;ombLd zp2yS`ejK?YoAmwgsO`-oGcy!x>#k3SLE=tDwl65#M1)Vea-RC1e`0T`Xz*4%+X)G%}46^Kd_ zx4H;7_IZr&xZH8Y6q+LKBcvY~Ysey$Dx|jI@)be5Ynv5OyNeVGztyoN<0P~!hNvi^ zw{3|S-CJrlyn+}6@qMSm66fOMiHs$Us^(`fd2vymGm+H SM-T)60000P)t-sARr(eCoKzYo*^P53uu-AtN#G1{vRPB3|@u-qVW(- zY5|_>0j2jRf44kmj}|^r0IB>yRB>)FGI1>}SV>(OK~)$wMFW}Q4V>q7FfbS~J_dxt z9g4|kI6r$fHi0=h2ZqHPEHngpvMqV5i$X({N=lqgPNq{+uYXur0EWl_n&uOh+=xFv zyj@*SCnw8gWy4`%s!~z_jnV**)c}ag(rIZe78c`ja^7!m*K2D5f4u;4r~z)HEohSR zd3o@7c2!22Rd!!IMl>24`F(x%dwZo!Oky`a7<#e(e}DXbei>nnw_IHRfPkMy zNI^+qXfiojLVr<`LPJ$4D=J-s0FKmOFE|2lrXO^tCvKd%S62^KdH`yk6go@*W|JfaADeAjE#3YdgGyIJ6VqgoJi^?nUG!6yZ63_c;=J#qUL; zG2$v7+2dcYA&EEKew-v(9E$G;`2-94e5toV?%TNB!37(DUYAnF}8DA0Ob>oJ4HNMDU<}UT9qWJR!6qjDaW1U0Gu_>`8eYFq9965 zSyq%*t6j^W4*o*zI6$Kd%SutGHCu`-Yg(_bD>ZlwR1X*;KjLkr-;+m%VVGu5e@DoB z54eOup^kXZH06+a(IKkx3?CC`=C!%NNlx7&srs|eFc1luEEzyYofKQNO^2Y;VDLEV z1%I72weSebm|_ac2cWT{w?Wb=;mE)k$y{}TYyiX;dLinqo@p4it=-_TX#(}ueI%*n zqOqb^Dp|R@5$hGKXp3r?-X~Xyi^e7Dc+_N|esymoQ|PXI*2P3!4F{e3wJ=raTe
    %vC`|6 zz1(b_#7BUy96nk$bEH&@w~o2lx!Uo~>HO60{?+gQNoa~mX^hV4`?}fij=0%WjJO&( zQw0nYS&q1!!++q(=K0g^{vR$@9xhhX?f#y{;aQKlHglyaUy2hdKGg329Vt=G>HD9> z;Z}^dHFBd079Wkc*~sPj9Vk%A=lPGh*hhh`7&S`*1qUZtfoz<_x!Lf!+VE?h#3@;S z1`ZQ2ZJkJfua&;r4ROPy8$MXk?EJdc z>WintbC9m7#@v*=+eUz{4j?ZlSAosw`o`h(&*}QO*zjtc#3xsN1q~AyG)<1T*vRGh zjkwqtG)w{n2P9H>oy6f)jJG9HcM>W+S&q5M=70KFj=45+q!TJURExNcx7ZmtQUweW zz~A++(drvMS{XS~TamjHDLp7yfC&{J0R#smRC*dcS6i^ervLx|32;bRa{vGi!Tf;B`qT(DbwT*?XoxOvkv5}(z%nTl7BV#9L7gslT4-Zc-4-a>5A74Kw zVa^gZD}DRpn^J~`i4fR7*Ih|GnD1g*dim;3RWP~)(#c(@aX95>h9_7 z1G%ZaAEID_knF@s5LqCYJZ0*%=`&`|0(yJ)99f~cKn3%Jq~=#crGa3Yz*njBZzG<_h&=#NqZVn+eJ8!5g7;N3PeaB9Z_+7h& zg!cdyFz*$TviAvxN`gV`zWoQn4<3>dI(!7EfcL1dklL~1NS1&=Z14%70VhuZ6)=jP zR!wp~6Ay`QD2RIIoG3VPXP?(Ij=FH>A}m6I0GMDdT{hOc0*Y-QP=C+|Cb_G= z`QA`#+~W^kI}1#5*Ka`N8N>`6L5a4Yw7j~uv9b2%tzGtNNybLE;fa<((cq3ADA`xk z%xP$tQ*#%b?5`t|JOKTue8^K) r`Dj92osq=jJx3m5WL_MAfffM(ZnE(y;zJn$00000NkvXXu0mjfync{1 diff --git a/src/main/resources/images/icons/icon32m.png b/src/main/resources/images/icons/icon32m.png index d94beadff1dd427d16cfa02ef90c876c351bc63e..dab63a625029da6e94fb1dec867934a1fb93c387 100644 GIT binary patch delta 722 zcmV;@0xkW#6Z!>^83+Ra002a!ipG&4AAbP|P)t-sARr(gAt4h{Zx2>_AtECXO=k~<27&b)$l-v|LOdTgJ7%@Hqi_aS@G#w-<3vHeNsr&_Xt_)s= z0Gj3nQgr}Xh6`wx1bMOnqVWJ&g8?Qu03tE~EJ6S>N&sPz1c1B%kJSK(%K@eL0Dmez z03$R2YMudqy#R5j0dAuJj?@4*Qvia)0FBZCe7G`ERl~!jEKpqlL16%9nE)p`B0x&8 zwV>S5qZvU}04_uTT#9dda{(?zu%&|7y@=x0uhFMxqLOdYv2xnMkI9uv0w6ETn^kFR zU8kmq%9v22k!uAcGyqwJ0F2NBQ-6B^M{59Vp#V&A1t&QcK2d2wxxWAa010qNS#tmY z4#EHc4#EKyC`y0;00DbRL_t(IPo0xlSAswoKrt6UDJ(LVARKIzF>=ckZ84)vTg(>g z|NoO_n9mgD^w52p`R)aVb3h0Z*^0(s8A?1MieeNtn@BR%lw=A9L6mK-8GrH)440@Y znjxn_aMWFxFGL}5?xtW*MA!UF$YXD1~&+W1Y~&YG40*m(`SSRqtS!sjmG0Yf)UmK z4<-W$9-r)xpg1vI<(URAQ^j>(?e##nTt;s=?fDCHwie)8i6;vR>jB1ZGsGRLhX)v! z-)+~mKR)MyAQr8Gr!?lBs^k0yasHEN*(P{;6gGz-&%P&)rh{Jwvp+8XA{VHwVDJ^x zjI^Kdz+B#Zm2dh&ET}3l*hH$)K!Qyuk(3mHrH>%|04c|80=3PfBme*a07*qoM6N<$ Ef~u$?ApigX delta 2466 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 diff --git a/src/main/resources/images/icons/icon32n.png b/src/main/resources/images/icons/icon32n.png index 5b978370585ae23a1eb303ebfb9ce8f02b9fdfca..c160a221caf2ba36c1653e4a7ba34ddaafd1f709 100644 GIT binary patch delta 623 zcmV-#0+9W#45S5+Kz{(tP)t-sARr(uB`u3WLy|&6GAl44A|u*bT7W%6(o|GpH$Kc! zQD-VBN}onZXd^0UGC8?HL3$@E1tc^8A~FChLIEyCbT&P*Ha5gWM8!o# z!9hXTS6727E)pa!03$RQF+RCEILd^eWnK$4yZQhB)SQ{4!AL!{pN6yd8rHy?N)e@6Q*l{_ zR@E6b4IgE+x&dC-je1$4U711y=Czz?jhqI|Mj>fR8Za9unQq}sqSfSDZR0awcDnh^ z+HmIH&&059Y^OiK!!S&j1s?H5G8~O5wH?Q~tq=LYn12Kz4~XX*`Y^h)sR&q7<2pD6 zEO8ZPDUI)2F;8Nb>0CgjG@&$Y!`=^%&g^M6mjkx{;`FJzea9&aBALgMlXVik^phE-0?*w2gF1_lTS2oDbrA|fJWWMqkniHL}ZczAd(FE0uT3K9|$5D*X+78YDwT#AZ{ zj*gC%m6ev3mXMH;jEszFX=x!LArur8BO@aX4GkR~9ZpV8g@1*Gl$4aGr>C>Cv$nRj zt*xz`oSch`i(+D85fKqVK|y+YdVqj{si~>Jz`)PX&(hM;#>U37va*<%n1O+TeSLjc zSXdk!96UTca&mHXbaaP@htSZ_gw0m*P^1LgM)*6dwWSqNfi|p7#J8VEG%ef zXmD_FnVFfmxPQ3t@bKH)+rz`dq@<*TgoJZ*b8BmBW@ct;YHB(RmS64tl zKrSvWp?{&Fnwpvc0RdH2Rk5+LsHmtK8X5oq05>-`x3{-ZQBi(=eoISBV#~8?00009 za7bBm000id000id0mpBsWB>pIn@L1LR5(u+Q{itKHypK30$+99MMsDsAh7_Srd1Oe zZ0eRML|oTRA_Ug1iG%@*5VAHBmbQrxRRU5qLVvDHgywu8P`Qb6qBK!^yET8|%s+ z0O_)Y46I>&IU0<`<5w$*Bt%=wKFN$U1qd|9BOI_NtyuiiR}X)?jm6Sx%24E_Vq*|d zpnnE64L!)LTVH(p{PCmje^`qhI@}KxT~~58Fy;!hO_mR3t+j`be|+-OcR#PRoP2&{ z7&ZD z4IVm-P|nR)5CWKE4bD3i!hYY4eV7LPs(%v?W}ADJ4wqvy4Jch+N=R^mIadwW&DHGU zu)NoRj;oAT}S}0Cr(7J+Z$9Xx?!C8}%efdE=kLH`S#G(0b7*C4{wWJ+HM-d4GfN zS@p3k7{7S^w(23^>vKv;KJ-qgBWv;glCbr4BD(5fbUJyvxuk(*wL{DKO!i&xcvQa3 z?8I25L233>Zht6E(5(ao&Drd66xPK>(tBjh=NvFv~UU5tLMd79$0Vy@XGST`d|EggB4EfXq!r>HKbfkl zDR+1O!br^y)IzkrF&P~hKzAt#Ijz|3$NzRZBBeo`8`$=io2PS?)dhe>LVrHfx)nQE zTl?~l>!jVEOam#LI+fpfG5rfm!*nPuehj3kVVg3? zxzFz3JE6QZ!o;U(xJ1d3&nF$FKto5mM_9AjWUNd|luw{cMCm+*knWcNP5N5~<%E^X zgb><^^4H3p&vjQ*80xDC$a(zCvlp@5YgRF(Q#qd?&vRE%YNjjURR9ee8c0&uLOt1= z_qkbkBZ~eA9^0!$40M?+3?VAIs0swB5IRn?goU3c!jH-b!}W*=(>> mc)#u4Ovc#G+1O6nk<|a||2MgGqNu+B0000 Date: Tue, 27 Jul 2021 07:20:15 -0400 Subject: [PATCH 6/6] updating icons design credit: Haoshiro