From f34449cb56abad7ff9dc0daac0d9f60a58303610 Mon Sep 17 00:00:00 2001
From: henkdegroot <13550012+henkdegroot@users.noreply.github.com>
Date: Mon, 10 Jan 2022 07:47:32 +0100
Subject: [PATCH] Server tray icon update

---
 Jamulus.pro                        |   4 ++--
 src/res/CLEDGreenArrow.png         | Bin 1316 -> 0 bytes
 src/res/CLEDGreyArrow.png          | Bin 1240 -> 0 bytes
 src/res/servertrayiconactive.png   | Bin 0 -> 1309 bytes
 src/res/servertrayiconinactive.png | Bin 0 -> 1292 bytes
 src/resources.qrc                  |   4 ++--
 src/serverdlg.cpp                  |   4 ++--
 7 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 src/res/CLEDGreenArrow.png
 delete mode 100644 src/res/CLEDGreyArrow.png
 create mode 100644 src/res/servertrayiconactive.png
 create mode 100644 src/res/servertrayiconinactive.png

diff --git a/Jamulus.pro b/Jamulus.pro
index 180d02ebf3..28c3978b72 100644
--- a/Jamulus.pro
+++ b/Jamulus.pro
@@ -747,10 +747,8 @@ DISTFILES += ChangeLog \
     src/res/CLEDBlackSmall.png \
     src/res/CLEDDisabledSmall.png \
     src/res/CLEDGreen.png \
-    src/res/CLEDGreenArrow.png \
     src/res/CLEDGreenSmall.png \
     src/res/CLEDGrey.png \
-    src/res/CLEDGreyArrow.png \
     src/res/CLEDGreySmall.png \
     src/res/CLEDRed.png \
     src/res/CLEDRedSmall.png \
@@ -783,6 +781,8 @@ DISTFILES += ChangeLog \
     src/res/mixerboardbackground.png \
     src/res/transparent1x1.png \
     src/res/mutediconorange.png \
+    src/res/servertrayiconactive.png \
+    src/res/servertrayiconinactive.png \
     src/res/instruments/accordeon.png \
     src/res/instruments/aguitar.png \
     src/res/instruments/bassguitar.png \
diff --git a/src/res/CLEDGreenArrow.png b/src/res/CLEDGreenArrow.png
deleted file mode 100644
index 7307ba3774b28e4c9e7327ad887c1033b8355525..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1316
zcmV+<1>5?GP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L0HzoK0HzoLes#%>00007bV*G`2ipY(
z5;-v$UTl5<00g8-L_t(IPmPsbXdG1($A5S3Om=5>HzwI+n~yc7TT@D#Mul3CQc-GK
z(^dn)mpqCVU-KRx?W0gd@YN>+77Ecqph!t=3pG-eG}JV)o0#TfL$V*)WIt!J$A`_v
z^b7pKz|1-K{F!_1J?AK1z}2f)!@!`3^Z~s<>y9e{Oe&?ufRTZLfn+UaFY0N-=;){|
zBE!HC5O~`E6gj2TW#CeOe}7@G;|bww*RI7xWEAKDC>D#PQYmt|9IopEU|ANyV35Yf
zM*Mz%Ep$pL)qml_g?P=dD?Bzf788+MK)dI8EG#S#U;CS^ouW0mk3cYhAmlc4B$ifb
zC^mB-(oHlP#WYQTWu?@~zP`TruJHBi*KHA*0D6kWBGWU|%oz_k_4a$bx&N(a@+Anr
zKDxt=+c)S|M>zQEL3}<RN~tNO)bZ1&PZtaT!!U-m);%J^?4wy`?MW_v^chEAex0J1
zr{LvrzWRpJ+6o0XPr=R8+xZ5c3|!=ab&vRbH3NoW^caRQ3}B3pkB7C^Lt1N=mzVk7
zz0LWPA5gB8NEg;g7m{Q)61Yo`S@(IQc5LZF5?5T_KXIOk;!P5X1g2@CwH_KD9}k;a
z>p>9-6pKZcvI~?WIqW){OfkK?_4c1`GI#bE8>JLTH5oMm{s8%=G|QWdw7c#2{r&(j
zXlkwdM1*WM%R=2Op<sv&H?t>Jh)qs0eYO`VXLd|gXKhI+7-HU==Frw*0)YTPpQ*L(
z1t^tDWSw;?6^|`<V<!Y6_vd+hw1Z7A3nJ{h{||?MxW(O}56Oq?0U;+@%KkFtav7~P
zK(DE_ZUv}RDoDV?qr^fkPS}nBLfiN~e*5?xx_|tI@XRt>%^}iZAM1?@Dx0k36Krb_
zZCCI4j&Q5F^MYkrIJQk$8O-G#qD&!@7Fz#^(^I$2!*>sH?|e6>zWkXxpPrx~Ir82X
z^Z8jE$4{O3v0SSrjH$Iw08z(rXsT-_Yo!2TsWgYHZNB^Z92Lg~pkr!|wWvd~-euEG
zvRTgH^IL$$OI|a!Y1f1krq+5Ah}PHF)8=*JIR$FRvgrs}(rC$|#o*kP3BDgbhAV4e
zf^F`WG#&Xaf_AVbJZWmJ$AEK9O-*zz9U|pCMyTw$P!L=%aQw<&JUIIbR>;Nzs`Xbz
ziNXHOBQ&%$)P%<j!!Sm));Zg@=?HbQzu1HA*f@Kh*0jf&Z~vqrFF1~k?f9Qq)9t-R
zd+25Sem`34oYs0o0mS3+FM#1nrNZL!A~UUb*$Ayxe@CEUK11_NlG!r{s)ju@ZnbfE
z{RI0Wt!S+gkxQ{y>~jS$KR<6Pr6zzL&+}MaTV*l)fVGx6_HMaK^-GDOWj#h`>If~(
z5iH9>M5aXKcvn|fVYhKDE-uD^TS}?+?d@$cnG9)fjdb%O`A{0ySMB3g$;Qbx(wL0W
zXtvPMu$$Lq5jh!+M*nM@HC9$uV!)_Ust3SzU2?e`rBaFQ?QNi106w3OKp=o+RgV#v
z5|RG4wzg**eT~)CRa+@Ftd#m+qe(<A1D7I^$csnQUXsaV7#LJaJ$IOj$QUpZ4u_vR
aO#cN*M*_v8fR~5>0000<MNUMnLSTZRu4se+

diff --git a/src/res/CLEDGreyArrow.png b/src/res/CLEDGreyArrow.png
deleted file mode 100644
index 0c6e7b544f5c3c5441603c7edf13c12f71ea5b62..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1240
zcmV;}1Sk86P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L0HzoK0HzoLes#%>00007bV*G`2ipY(
z5;!~HkhCEH00dY`L_t(IPmPt&OB-7h$3J)OOfr)nnjh6z8~Q@Pu0mUQAZ|pu=)y-q
z+9Jhm|A5lHZ~3}!|AsEy34*+|uB6gUmtv_ds(n6<NnR78lSyVWliatkld7+U_kqiW
z@8Nte_spGh1V3SQbu|ktDW&Ft+rY%PP!-q~LX?4(M~@yg!kmkUtHRpanx&Ll2A%`)
ztMMy1LWq~Zi-m=S?!~|*<Ms9RqEc!NC;_;xOS9R;aU6W#2f#245{U%qbQ;q%!_*xi
z#KMCI5B5W0Xk0Fri%O|2U@`~-4i68h)oK`q!HpX?NF)*f*tSijQXvQeCMG7x=kw^g
z4p0$7%+Alx?+=YPHa0A!)CZvCx-NTrd-%T3+}s?uZr%EJ^kw$;_IUU19j0kAH8n*v
z8bt`PBZQc~fB$}01JE>WSxQ+_O7Z#gXZrm<Po6xXP$<yr_2~6_L|?tauh;QB56|-`
z6bdXZF5-C}2L}gy^C@YXwhW+cZf<6!l+UG<R4Ns|e*Mba+#J5|W7{^iZPRWx36739
zlahA3O}pL3wrzqSV0Lzvdc97yT1D4&q?FG$H#f7olyXTa6?a{iMx#M279$dg;5ZHd
zN-45$-cY-D52xJ@D={P*jS`7OXf~TnPEKN)W*k`3rIhnZDbCK$=ytor<ME+s$i((G
zhqJSAMGvto3&(M2x7)<yae#SUN_iW=^E`qez;PTpoz5^RwY$qdQ&U4Ny}QdV>+5`a
z`V=pdK`BM2(?Kakuh&CL32<ANQceI21_Oi;_`XlIT4i)}6oBH^7Q2rhlP{MUIXIx3
zPGcvNv@8p{U0SUcK@fz7;Xa{<f?*gKhQVMkpi-#-km__ufBZ;62>za)W_M<WUthmw
z`{6@+u8ZrsoSd9s7zR?x;SQinDXTy}7K;&!#qc~2fLg6a5BT%hGgK^wQi}0UpJ=7i
zv^0%wqk-c%NGZ`Y4bwESEGsmw>Qc&WAU`rPLNb|TFc=VG19rEI=6PsBF!S~;8;gqs
zr>DUAEki~}M@b|Sq4BmZr7Q!#WilBunGD_Tc`s2)4U=NFP3ir6_V3(5M5BDS`_9<d
z7^ze$G%jnJrmaXR9m}%F<#JrRb`8TYh(sd8m9}kW%4OoNJNy<GS1y-he0&_!G?7v|
zQpyzpu)n|m2e3RC3^+bM=J@#d(vush*GX3@{B`&4P=oVZB@zj4-n>aJmqSX4QtCyq
zSo~c8eEIUl5<+|cN<k1%uh*&9>ztmRUMk5|QmGWVT#m7^F$}{%DYc`Nnl2Oy-C^52
zIyx!>TSAD*e!owv)uPpEVcRyY>kj*|uIpHqMKYNrl}cT#YegwFo6qOJx6P1~lanH_
zCWI&f_`Z+hIC!2%zuyPWe}HH-N<1FF_$qdkQVZ9wU;l5T52@8^mJniD2=Tv0lTzv>
z@M3&?{O6<TB8^5P3oHpCemG2(Qe|Kzo6Y`knEne1sqd3@94FiW0000<MNUMnLSTYr
C5;Q6R

diff --git a/src/res/servertrayiconactive.png b/src/res/servertrayiconactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..326aea898a278787da2b0cf4db0f78b7dcbb09a2
GIT binary patch
literal 1309
zcmV+&1>*XNP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00009a7bBm001r{
z001r{0eGc9b^rhb&q+i<RCt_~R((vBWfcFtm-k+-h>MAu(4-+Bv4P-1aA2DPQEJpC
z5=0ckjmDrrSGi_O=}RS(WjJ)Stbq<UKw-8b<s+g%VUQzrRyr^h8IJytj~ic?x8Hfa
zFyP+H>}<dLocB5BIluQj=RD7QRZY_{Ulc`ojKdqm-?UfGnpZe%C0-$-32(wc+#*_u
zQu;U1Z87z42tQ)C$_Za8-x14+*XeYD<5xtoEpQ^|syT-8@r1!(ShsQGM#RL#z~A2=
zR;v}=-Q9ub&z}!$ZEek<Uz3e6+4gRSRsLiU!M2Ha2q9T9E3p+^n82};!Og|R#Rv`#
z#(degZy(y*+mVx#v#GPQbJHx-4I%l3uo5oBZJVK!c$z3Dt`hZ`nVII}$B)Bh;2#X{
z$O5z}xb6Q4h9|sdqD4kVqNSw;X=!OVbLNapeL@td+=_a>=^9%WNz@P6vMVG+zZ@SQ
zZ!Re*0k;a4lCLpd->3&QtSE-tq5X3*a&>h@d3iZDY}kN~j*e#--y)fS%5?_cNj08m
zCOipAIoo71t&|LeKo9KgH4|`l7PEzGaO~JItY5!AhH*Ek(*_caaN;o4B55KPHij7>
zIyxGDett6n6nA$h46^v($1o*rb4Vf*5fP!U<@W8EAz@(2;(!=rYeGUo94;O!D~IWY
z%`hcz2P_thfBz%KD$l|tz@IhxaE`CMBuS!G8-YYTo05{^URGA7r|U?pm%A`|^_osH
z^7eZ=fkq+`<8yI#{<a<PQEdn81UtjMw6xSIfyn5|a(%RXRtPmT1a5oY#YD?RSg%}z
zIX%tJf4Yv6$rkcNN};4P77~{yeXuAi6Q-9F;qp`frf%GXCI3?_{^F2S+s?nIr$>gn
zLh@=<R20I)!xtnFG4FhH&a<VU5H3N1Fl~Fup?_UnoeZr)5)~I`zn=?<C7)+(O2hbt
zdMr74LW*kV)7905=4Lq!C>4@bOP4PFUnKZ<6r-mrpcswN`tOr)N(wMzo}8SN>qU-5
z3m+SV#M;o%VBEE9*Q1k6*N%12hKB9TM~)l;FH2DiNTdnLo!Z*k07)+_EbNgu6q2|m
zY=v9?`%qRsZfEB`hpMV7w6(Q;$)@^QNLqMZ2c%}ahP59g;^yEztoHCm=Gp{2>l@*a
z#Qatk6b}!lFX2I3b#*m@f`V2L4i4t2N`S`?%7m72J83!Ybn7YN`oJyx*8dlB*KH?~
z?1Buk&=Ug#Shj4LQz9=fFQlfX%I%S&n$p+)VRTjPoce|aaIp0h0zG~3yl<pFCw(tB
z!qKBg5gQweii!%SB=W_T5>NtF68z-MacFD=DW~=z;M^d3dwbE>*EeIUtgO_@a&vPX
zuHCzLFD_lWB<i@TLA#|u@pMLHH5<_R=kM&IaXVXHULG178<CxzjnL3g{Zq`ZB8rNN
zz>b}E>rzSJXSaHG+Lj5P0lUN2Pv~t`Q&Xd30r{4h;8%u7aO%R7tvwhUqjs0LNSr2`
z2-%A@3q_~MVJuaLch|kR<n#DZJ~+G`7rDEy8rHPC^XJ+Bn>m~#oLzeIBHP&j)`xAS
z@IRDQYbFee(O_hD4<v^Xi`9Ds_Z{B-Tzrp2QB>23R3b>$5LfW<56Efy$TR)}+_SaY
T5~W{b00000NkvXXu0mjfe-dh4

literal 0
HcmV?d00001

diff --git a/src/res/servertrayiconinactive.png b/src/res/servertrayiconinactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f106493b03b8c5684b3bcd3c8a04f5351799134
GIT binary patch
literal 1292
zcmV+n1@roeP)<h;3K|Lk000e1NJLTq000>P000>X1^@s6#OZ}&00009a7bBm001r{
z001r{0eGc9b^rhbzDYzuRCt_~R$WY7MHD`J_wEl11QMv!3dFET5KBcMflxqU`O($~
zE7gL6T|r|ZHArfGF$RKI>)H?`h)}5pfs#;>q6KNO5O@%%0kkc|fS^cy;H52L<*&=G
z-?`ky#a*CI^6fc0bLM<=&YYP$qRnQb|2Bm};RW$JFoW?64*d#<13)Ga2kZd^;1A$O
z;7i!|!^|D}7l0l(DWc<HD3<_V;1w8Mfvg3N$c_)8?;_-0b|MHubbNd~B_}77UayzP
zr>3Sty1KeT1_uX?u)B(`A>c)MZD&OM7=g#+juQZr_&Ef&8xx;_Y)wo|bgQbWqVVu=
zr|64|i)m<Ri1PFE4Wpx@28W^FL^({W9QL2`z%UR6oCmH0Kjh`*xz*Ivkn;8&GUpz{
zj5X4oDkWjhgB#vrVq$1uV1Tl+vZ$@Cjk`VoJ`_1USm{3ec^k-pUIuv-C<j;{F&GSP
zwY9aRR4Qq)=5t!@zA8BtKKYb%AC+y2NTbnEb8|Dr#l_Lc$Ve>w|ILvQlrcDe6Do(<
zFYnKO-cXfF^^g<+2qee5|IMVr?*XT@*@>#Ft0^`%)&ReWqJ02FW^{ZEwUYlQBqXGy
zrKL$L3Jwn5a3FYjkwT>+U0E?{jvRJLVox1N2*vQ~1_=nB;`BsEM-#6+Dk{q5<mIoL
zNPX~W(!7M?TVAHs_Di&K;Tuvu5=^?%_cqz4r>8SXyeJcdLVTN%k>T0Y)Fg%Ls;&KU
zgDlr?lKR;LwD``uwDMgi+015XOqG=AWG|O^fG8iZbCHpeo{f!-TM|f7G@O^@;wck}
zVWFfuQAqcOu1Un&qd89Y@;(Y2Nh%P>8>Q81w<M6P{rpI4%puJS&y#ZBUb0UAPK#xy
z$=!rX)u^59XJ%$t++vcKd6O7BHMf&*ZTi1xDkni7MC!wbT-tYcce5B|lKrWvsXG!l
zwx#z^V-rNW*Lj&d&V7au1t*)au`%lF>tnT^NdkO*eg7AUZDE0yn_Hw(wk<7l{d4tf
zjIXV&Q9(fgS*_M<_<My(ti8RxR9IMe|19?65S3(|y~SRkZ=43IsHmX+em>Jwit}gV
zk-s`RI`re?;}jMac3&I{wVKpPPf7<;2n=u<HyVw^M*$b*85D1?bU|7y7JYVhw#4q?
z;jtr$_SkEr*tK<veSCbVy}g|m9cnh4k247ue-2oQ3!tT?g#rScSLfK4+;y~i_bz#R
zdv9sOJ~A^isjjXrlSwYq`bQ=PSAg`bC@Lx<T<zrV@4so{+}s@Tfh{jDr<9Zws;{r#
zb}<tZ6D%I(tKNpZ<;p}J^YimmQc@xzC@6>m0|T+ABF)au(&XeMSB&JKp`n42l9HtS
zyJ{wr$-em(`&B;<qUWGqWFoua^z^g@SB>8Wxw*O2)6*lBYeYnZRJy~%!&F&WNv*A|
zcGH`p!#sWzOaYH?n}hYX0C+MHN5t5sHP~-qek5>$`9$3T-T<<Icwm=oe4Exk)y+UB
z@DmVB+qa*AI(sA*hk+H~Yx`3O3vh!F_%rG_8~y1J-vc4r5FEt3Rr{X&ib?zgN?~T3
z!($BUk}D7BpT?XgpdP37cNm{!u8JD~=kF{Nu<bv)VXsQ~hOB@90000<MNUMnLSTa6
C)ML#6

literal 0
HcmV?d00001

diff --git a/src/resources.qrc b/src/resources.qrc
index aa50b844c1..aead3fc138 100644
--- a/src/resources.qrc
+++ b/src/resources.qrc
@@ -35,9 +35,7 @@
 
     <qresource prefix="/png/LEDs">
         <file>res/CLEDDisabledSmall.png</file>
-        <file>res/CLEDGreenArrow.png</file>
         <file>res/CLEDGreenSmall.png</file>
-        <file>res/CLEDGreyArrow.png</file>
         <file>res/CLEDGreySmall.png</file>
         <file>res/CLEDRedSmall.png</file>
         <file>res/CLEDYellowSmall.png</file>
@@ -121,6 +119,8 @@
     <qresource prefix="/png/main">
         <file>res/fronticon.png</file>
         <file>res/fronticonserver.png</file>
+        <file>res/servertrayiconactive.png</file>
+        <file>res/servertrayiconinactive.png</file>
     </qresource>
     <qresource prefix="/png/flags">
         <file>res/flags/flagnone.png</file>
diff --git a/src/serverdlg.cpp b/src/serverdlg.cpp
index 8d5e78ed07..becfbf4a9d 100644
--- a/src/serverdlg.cpp
+++ b/src/serverdlg.cpp
@@ -29,8 +29,8 @@ CServerDlg::CServerDlg ( CServer* pNServP, CServerSettings* pNSetP, const bool b
     CBaseDlg ( parent, Qt::Window ), // use Qt::Window to get min/max window buttons
     pServer ( pNServP ),
     pSettings ( pNSetP ),
-    BitmapSystemTrayInactive ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreyArrow.png" ) ),
-    BitmapSystemTrayActive ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenArrow.png" ) )
+    BitmapSystemTrayInactive ( QString::fromUtf8 ( ":/png/main/res/servertrayiconinactive.png" ) ),
+    BitmapSystemTrayActive ( QString::fromUtf8 ( ":/png/main/res/servertrayiconactive.png" ) )
 {
     // check if system tray icon can be used
     bSystemTrayIconAvailable = SystemTrayIcon.isSystemTrayAvailable();