From 0b535d8143e6a73d79cbdd7b22338b75c1a6deff Mon Sep 17 00:00:00 2001 From: "dennis.sheirer" Date: Sat, 6 Dec 2014 20:20:50 +0000 Subject: [PATCH] Decoder icon updates. Changed from colorized icons to a standard set of decoder icons and will now color the text of the channel node to reflect the status (green - processing, red - no tuner, no color - disabled ) --- images/acars.png | Bin 0 -> 498 bytes images/ais.png | Bin 0 -> 495 bytes images/am.png | Bin 0 -> 456 bytes images/aprs.png | Bin 0 -> 504 bytes images/dmr.png | Bin 0 -> 520 bytes images/fm.png | Bin 396 -> 378 bytes images/fm_green.png | Bin 558 -> 0 bytes images/fm_red.png | Bin 571 -> 0 bytes images/fm_yellow.png | Bin 566 -> 0 bytes images/ltr.png | Bin 0 -> 379 bytes images/ltr_net.png | Bin 505 -> 379 bytes images/ltr_net_green.png | Bin 687 -> 0 bytes images/ltr_net_red.png | Bin 692 -> 0 bytes images/ltr_net_yellow.png | Bin 691 -> 0 bytes images/ltr_standard.png | Bin 371 -> 0 bytes images/ltr_standard_green.png | Bin 532 -> 0 bytes images/ltr_standard_red.png | Bin 528 -> 0 bytes images/ltr_standard_yellow.png | Bin 532 -> 0 bytes images/motorola_type_2.png | Bin 0 -> 405 bytes images/mpt1327.png | Bin 657 -> 435 bytes images/mpt1327_green.png | Bin 829 -> 0 bytes images/mpt1327_red.png | Bin 842 -> 0 bytes images/mpt1327_yellow.png | Bin 859 -> 0 bytes images/nxdn.png | Bin 0 -> 470 bytes images/p25_1.png | Bin 0 -> 493 bytes images/p25_2.png | Bin 0 -> 462 bytes images/passport.png | Bin 649 -> 443 bytes images/passport_green.png | Bin 802 -> 0 bytes images/passport_red.png | Bin 806 -> 0 bytes images/passport_yellow.png | Bin 815 -> 0 bytes images/site_green.png | Bin 712 -> 0 bytes images/site_red.png | Bin 723 -> 0 bytes images/site_yellow.png | Bin 673 -> 0 bytes images/system_green.png | Bin 983 -> 0 bytes images/system_red.png | Bin 1003 -> 0 bytes images/system_yellow.png | Bin 900 -> 0 bytes src/controller/BaseNode.java | 6 ++++ .../ControllerTreeCellRenderer.java | 22 +++++++------ src/controller/channel/ChannelNode.java | 31 +++++++++++------- src/controller/site/SiteNode.java | 25 +++++++------- src/controller/system/SystemNode.java | 28 ++++++++-------- 41 files changed, 65 insertions(+), 47 deletions(-) create mode 100644 images/acars.png create mode 100644 images/ais.png create mode 100644 images/am.png create mode 100644 images/aprs.png create mode 100644 images/dmr.png delete mode 100644 images/fm_green.png delete mode 100644 images/fm_red.png delete mode 100644 images/fm_yellow.png create mode 100644 images/ltr.png delete mode 100644 images/ltr_net_green.png delete mode 100644 images/ltr_net_red.png delete mode 100644 images/ltr_net_yellow.png delete mode 100644 images/ltr_standard.png delete mode 100644 images/ltr_standard_green.png delete mode 100644 images/ltr_standard_red.png delete mode 100644 images/ltr_standard_yellow.png create mode 100644 images/motorola_type_2.png delete mode 100644 images/mpt1327_green.png delete mode 100644 images/mpt1327_red.png delete mode 100644 images/mpt1327_yellow.png create mode 100644 images/nxdn.png create mode 100644 images/p25_1.png create mode 100644 images/p25_2.png delete mode 100644 images/passport_green.png delete mode 100644 images/passport_red.png delete mode 100644 images/passport_yellow.png delete mode 100644 images/site_green.png delete mode 100644 images/site_red.png delete mode 100644 images/site_yellow.png delete mode 100644 images/system_green.png delete mode 100644 images/system_red.png delete mode 100644 images/system_yellow.png diff --git a/images/acars.png b/images/acars.png new file mode 100644 index 0000000000000000000000000000000000000000..428961aad4d120f77e6291e6e8a69cb897903395 GIT binary patch literal 498 zcmVe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00CM_L_t(Y$L-WROI%SD1>jE| z8)IyQpx8*jQq)Qto2>DN+Ue1HnG1*educOhgD05QM1L zX5aBJ-pLSfIu{%k=k9e6o3$T2;{orH1?PBy&$z@c2J7gvICr?fha@(OGyKAIQ34y- z3eNEn>uARe_Uh=f;3mAm?Nai)S zrwgyJhAWK3+_uFoXoRkUmEe9%RVBCFKwV`DO3C8sD`+SU(p3_;4StP-f0XR0b(OW) ogGmhI3;tphZ)27_@uLAc_s>>u&EIaCNdN!<07*qoM6N<$g008X{{R30 literal 0 HcmV?d00001 diff --git a/images/ais.png b/images/ais.png new file mode 100644 index 0000000000000000000000000000000000000000..723c9fdd312ad13cd6b968459e0e9d610f4239d2 GIT binary patch literal 495 zcmVe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00CD?L_t(Y$L-WVOWR=(!0}I_ z#o9Hrh$V|bp@V}{g;pxA1&K&O9HnE&(xrU?Lg-5<0dcTvL2#2gxY(uOqC!Xi6pB*| zu>@T%;o(OT!Thp$@NmyPcii)Rp1bGaUV6(Eu9NXB@wL{VggP#8g;Q*y(l5YT2H77ex@ z&uSJkc!bXbifhY<(9?LGfqOr|xONW=hyI1hq{*_9cU&8wnY`zd9wo~=uKjI3#R8sV l6aO)X#rV}q(dl`|xdH#`dO9ZLe#HO)002ovPDHLkV1hS)(+mIr literal 0 HcmV?d00001 diff --git a/images/am.png b/images/am.png new file mode 100644 index 0000000000000000000000000000000000000000..716483db54b1732a4a18f522bf982decb93f6f51 GIT binary patch literal 456 zcmV;(0XP1MP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00A&bL_t(Y$JLa*N&`U@g}*fx zVjCiX#YQn|VPWN8L`f@zfY{jT69maK2qEvF;1dXfFA!4X1^huvK|xYk1W96ZvJ97X z-N-EBh2iYIbC^AI?_uB{MF|)=Yt`9v>!E5}rXCwp69_1qeCHe9o^U(Op_2$0|FDxF z;MoXx@;QQgwenE-5Ho^H;7+v{;Nqtdq>X|O>8We)%IA!LQ{krY#Fv1Y4!Ko+qr7GW ztO&1#%f19Ojibk_X#@bg0Yl(5X7AS~EIXYDfa3%sw#8}tGT#i)*DdB%TU6fHzI)5M zzUyf^@aGW-kAR|FeGYuc$?L!@(8`DxMMJm-92jwD8S)|%PCGBzk~2FSzIl;=fp7tM yOcM#~6W literal 0 HcmV?d00001 diff --git a/images/aprs.png b/images/aprs.png new file mode 100644 index 0000000000000000000000000000000000000000..73e29da66990e28c82332e03521f928c73c36c1f GIT binary patch literal 504 zcmVe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00Cf0L_t(Y$L-WHOB`_!1@NEo zqQO=Pf`t+Y+E`e~rMX}%6pR?=!}Hg~PBa%~i37e1aRscl^akSdxiHF|K5@a^#a^&O#Lru^tv? zp$}^*>uz8XA5*zck#9vn&4TUlyoMvpqbsKNyHS%JjHPnpk#AK1OkykXUWo0##Lw7= z`-9rnzCk}8$0DBNSxlq{n{BGAV>RL^W>eyp+gMk>2XYaA;b{}k@4Buopc3&3el)S{ uuIqG09Ek1B<8xd#1e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00D4GL_t(Y$L-X=OIKkO2JnwR zmb5_#B5;$!5*(VWAqsH|YKo{eS6ht!3k65FqJ|(Us3p*?uPxEk67*vfa%dvY@ozT*xSN@sV2lek>DJmiIg((SZhdnZ2Q zRHX&w+Hc*Cf#1O~d}!$5e(MYbM|0Ot;bA8A0=QxbINC?;Ucu#^KgL`#C*n|Oi#~0py z*;6C~Fpt+U|BqK7nfuJPVfm>{aDaW>;UiMrM+f(XbQNxcPjQu*yD6xvGSE(bwc{ko zIhxj020nw2@VsGUP3!CicQM8p9V!Z delta 325 zcmV-L0lNPB0*nKYEH5Jf00}IFN&o-=32;bRa{vGf6951U69E94oEQKA00(qQO+^RY z2^0?lF~P7CERkC%fAmR2K~zY`#Z@~_#4r?`F*NZ?e9yo+Fm3F1MMK3kXmX#2sC)n) z0BIW}BqU1ikR}?ctgICjDdLRe;uX(tp2wP@nFRpz0f2&aQO_yo)$jtK?DzXs37jrW zGn)qwXb3YK00h_Q+5bYRnQQ_x8{CqHl#)_Ps_M7C@1Fr6f5!M2V|-mo!YyscIkPHn zopTQWK=K~I_38vpa06f$LO7Fj)r3GTfusunU*7vCNk1enn@T{klXM{YLh@bGuBil) zIshLe@1|)w0PwBe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00EXsL_t(Y$Gw$5OT$1MhTpr~ z#kN|dJuyU6@ef$6gNlPVnXP^T9h?gN1bz<1$xU##=-}oc6hYkTmLha&y0kPDYGY&5 z7>8o%;t(Nurn}{M?tPEnky5Fo1JLd7ROp;$;iNtAegp|j zR=`|}?#d8r_X%{@Jx~YHRzSXh-m-_8CPR01II1HcjJy871*8FBFL|R>JV0`T32@g3 zxqP^AZ+2fJp9PzihQiyykf!>vX3ok)K8SKw2C06mDV?4aW|a=vOZc->0MJf!L%;c9 wV+(q1`D2c#R}4T|_!^Gh<>G!^i~KwO0j@Zee5$d)g8%>k07*qoM6N<$g7^CE$^ZZW diff --git a/images/fm_red.png b/images/fm_red.png deleted file mode 100644 index 129971dde81e917ff9fc2b696ef68d269508bc6a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 571 zcmV-B0>u4^P)02y>e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00E;(L_t(Y$Gw%YOB+!f$3O4g zr5;=^9O~JmmrywB5CavexVU6+Q2Q|ZcY1I8{J!7c`##Zbx0^uIxV~%|aa1YyI;I%k7MPHN`f{W!J5Z(R z9bjJvn#J(fcJ1h}>iAve{1YZA$M4#q*RanQSGN<#MK`W5TeYLZYU4|rJT&K@{2j7- zwzAfeMjTZfzf0b7{4PcuRb;u>F(+;Nznm!dI;PCBaGUiFHtQRA_t)+cpGs8#4y+1q zp1jBeA;z}_nU#F^bnosQ>yJ1t&I0h=oFUP&KOXr%Hpa4m5*jx^BK3R#?nf|?I&S)# zuO*k6kz$Ys!2JkPso|+UJG1l5t3FC-`9?4llBdI%V5*3x`V1ccppS(d0S~I)RA|)F zgx%9UZh%zF1~3+KBtE};d-eR|dpqwgxbPPEw!RffW!XXKHF7Va&}*P9JJ4Rf+H#a- zKO34>3BbGxCqDU)r6%W#t3LCt*o_z`f~2y@gFxUo1|thJP7~*002ov JPDHLkV1jfe`O5$R diff --git a/images/fm_yellow.png b/images/fm_yellow.png deleted file mode 100644 index 9cddbfe5b2e12c3de2ecff6acb734bc7e7581f28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00Ev!L_t(Y$Gw%mPTNov#((}3 zlg12bgQHYQiW(7ySjrGKraSd_kBbE+s6@Su^?wQW-e&5l(QorAC18ua2ZdUj6m69!Gh*_5IpPI3lnax-OcKyW}1D{P_cOZ=aSmZoz|7J zx}P_U0cp!H24rvVSLbaoc~!NC?MClvrLEVG5qO@O4#4{ed|#zpo^f_orce<0 zehL8ZBM3ur z`y_fp0_(IlACDVx9FuB|$Bo!J?agH|%S{}|O#LBp91}6iO_aUeZy#R7%Jw|?qyXr; zv(&-Q&kcsdHn)$hFn;~|T?Nh~Z-bjVt$Y8}O#M6l1V!Z diff --git a/images/ltr.png b/images/ltr.png new file mode 100644 index 0000000000000000000000000000000000000000..fca9507c599fc1f5feee6bd7a3b2ec908c80aca7 GIT binary patch literal 379 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6kC$Fy9>jA5L~c#`DCC7XMsm# zF#`j)FbFd;%$g$s6l5>)^mS#w$HOMVWWk!SWfD+Gvcxr_#5q4VH#M(>!MP|ku_QG` zp**uBL&4qCHz2%`PaLS|v8Rh;h{y4>R}8(F0|nR~=hY zmp5f`+bj-MX|(aN3U{`D7S<6w=YJb!wJ;n9$n|6Cg@#z&DH%kh7wPhYIWtk&?wmpR$yF$VThU1zoa!Qot3@X#-=MSj z3@*i&@JU<+S3$*Da1#mzk+`HkZTOSY(jOdp;BrVfNlxy)3I7D4W}L?K{22F58Ymfq z1AJ%n{bXGz#8L(VzA(t>Uuq1@z3?Ii_V9`Aj6TfCz|6iIdP|h+9gnz94w&GzW=(4< zvNsKdny2GqJZJW~TqFZ)tTE}zE9{_yJB(tZ9bpT@hIAEfBOl^CF?Z9TuKEYskw36s zcq*&bRR(?|ckxyz*{XFmBk$r2Jv`tCC%C|A{C1xj(D?&|#$)-#rgiNA0000DWLB^)0T)-n(J5Ps$r?}`#L4~v z2XQcyyT3qJIow_+5#FTE4(?slK?kSekeo{+M`(+bwmAsA`*`o}yN}BqF>?%{{s6#Z zv8MBQtCD*FKF{-o5@;4o%v>ifuta0#0zhn*B>On?0AQQ4e`i@H&N-^jV;+8p$O;ji zIOp!vy<_Lxjef5!P1DbQzrR-dd7gV__GTJI=N#3+)VWhtRRZ9$as6moEFxMRhnrcn z8w>_703wZv$a}Zj-BK0zvMl>b)AUfQI~M{`6m5&hYoo$zYwdx8&dRdf18|`goeO~= z2v|h+H5P{9d4q`TDnc7U5Ihsn=CoL5#t!~A#)OUEsv;t-${T>4;c&P<@_&*f>HLep zgzndJp8~jQ;$>N~>WOm^xevqeY2@EpYab^KgjS513j-h?jmKptkM$&sTM*!H7Zfcn dBTsFw<6r%8ov1EQONsyh002ovPDHLkV1m=Sy@&t+ diff --git a/images/ltr_net_green.png b/images/ltr_net_green.png deleted file mode 100644 index 32bd7950c83f1730e1b7d7ae84f0f3abad614f7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 687 zcmV;g0#N;lP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00I|DL_t(Y$HkRTZxT@y#m@{w zr!dlCn3f0~Vk}h)n#R_|KsSOL_r?%Sj7GaK=}r?97p(jMeuZvKOhDthu84`UY9_G> zpbKIO8Kg3lf6p?2j2jC~F_;j+-|D`Td*8eFyq7#G9*>6rgvx9qQe}xtc4j%9(#@C< z>qT#c*SLa1I~4TCompVRvk)6Gt>_fdLSUNeQ0n(c4j$x)PviJm3o^U$83ehZnTDTuQ)^QVuBqxF-uHC znoj9vdK~-eXF8ZI8B3e?E-Xr4lisliKXl;q`x%3~CmE{&+gApS#g0K!u4{0A=(}+C ztp&T!s_@3G21ox%1D9Xe@ab{gpsAPI;4@5bJzFs$7!_dsZW_54Gfo2?s}8zF4UIxP zT`cVVeyle zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00JCIL_t(Y$HkRFXwy&_$Nx!_ zbY04pZl)GzyP0XxrBGo9hjpw6Cm!@919$KucyiQJg`psL^5Vs#M=v|%xFLdy!_x*L z1)EirMYq-x8*y2eXwzn^2U%!VsZebFoxbnSd++x(%<$V0DwDLUNX9wEgm_OIXY;Iq^X_y8;^o=G1pc z?5NJVTg42{Zx>wq8<{;ZjfIcTT~37LEJ3z`FscpUdOSFvy?>T>j-H1J?(9Jjx`b!l<)8*;vYlW);INFSTTSEje+SyVd>uzNPD zq^D_;h-Dz-4*~!N>NV)yQ=%hsTG-COuIuI`OsA zd)$qjL3-pI0AR9QM0z;Uw1>#voT-b?B>WHLi!&fqF;*`LV_h#^62_p4u{vpTtgZ=S z*Bj6T5hlm#o-0>x_$opAti=p^0D#@nIzIX5@g(vSr>j4GqYo(n%Z5LS^(k*kjmNtF a9sdFh0mxW{YKuw$0000L?lj diff --git a/images/ltr_net_yellow.png b/images/ltr_net_yellow.png deleted file mode 100644 index 5b00924351bc4ac5ef6be3eeec4847189adec338..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 691 zcmV;k0!;mhP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00J9HL_t(Y$Hi4aOB+EH{<2w{ zbYqqzu$x-lkV7fO6(R`skOp!vJyqz*l7p9!qaXK2s zCMKsEFle&VYFI;>gbmw+xMWR9AvD_$2HyL4^X9#89y2ysmZJcoozY5?aj1TQ&(b5% zF)VynrnN?kt=j7^b^sjH0HQWeX=Q5c%*}Cm@cada369ItgoxwCo7ok;76jcHtt6+$ z&fKCX!wT^H#bcB1oaRhYj6?NvTpm_~;|6(eqWIfJ>mvT1)e;_(<#sRNS|0?E=;zky4q_l#tZcCF^b=H@AOci)&|4-Y5$ zc3iJJdbknjpazjI7*s*Xa}($FHc>7!hQGfbKs^2)M@KJB>ORFl1zcXT5QKXZ7mJl~ zax!lCviu4g8>dL6UYivCCk1S6&0ux)tBDJRexOkB8vfm#6Ot4`waWC(MGsPd%cY^+ zwwpVlfIy&*Ooj&l_>NcrYMt^KSYW$i7O?fQH>T`B}BBm z0767GT5Q$+>0^TZskvtKUmnN9fRUkhUMfXVyqUeXsS}@R0LOYQh@9q3GRm}HAl81z ZzX7AcC9ic}39tYF002ovPDHLkV1lEZC3pY; diff --git a/images/ltr_standard.png b/images/ltr_standard.png deleted file mode 100644 index 88ac7b414932fe1fb00c09cd70cdf7defbd3bae3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6kC$Fy9>jA24w~YPMsDnpa^Gy zM`SSr1Gg{;GcwGYBLNg-FY)wsWxvZQ!e^<`xPgBWP)M@GHKN2hKQ}iuuY|$5C^fMp zHASI3vm`^o-P1Q9ypc~FsOYw*i(`n#@uO2W<{mZ>aJ?VsHIX+clXd+At-KpqZ2lAG zO|3p(SWwPf&?fTk>e91JR^di0j%+%Ih3p*~7z+RYw{H0E8v6Y}0fW)&q&1UYPpn`o zy1i|+)C@D7RaPA8W-Y7K66DRKe#?Bi;VHNxYt?j-BNBJds2qD?e7^qOKSd>Xs7hbid9~B|L(rQ((qs4 z(DPMna(@^YT%NF7=s%P;ON^>!wU0Qd>BE%deP^?RD9>V@rH_BG^=C!-Ec|+4Hqe_4 Mp00i_>zopr02^Y49{>OV diff --git a/images/ltr_standard_green.png b/images/ltr_standard_green.png deleted file mode 100644 index 28867b57528756a020c1e3ba5d2d4139cd566686..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 532 zcmV+v0_**WP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00DeSL_t(Y$HkSuO9EjS$G`7& za^;(OcqV8{gB5y#gi}tPlY7HWQiDTtdw)SgQ+taLDE$F$ZcZUIoYElSi6Y#Yzpgly zuE`-P@FLIe^uojQ@Oi#G@AHsiu_ytMdfZqZa7M5iXi$q-E-XpOZnW<;X~$=7766o4 z08*Rwa+Od$tOzPph!$Ad3s3x@LO@`CWgv<;$ zBd7=}oR%V}7;r|AsRkN!*|z`YL^aT$tet_&$bOUx8Zxr~Tg>D?fT@Mrg@NwzWTAQ% zv0Thw=t~6+rGob5&Gi{PUJbE-Pi@s={?pdc?hNZ1vpN9J3ybm2Y;^!fHy%7)j#dXS zb6a30#2x^#$ka~4Pd{L;=d(A&?-n0IVv#AiF5SN7#WL^oE{N-4WEH8;cum?7^@!t( zNYo?nnzXZaewy9pO}giqY-|C5<{mD+^OM#gQtenP@b1mC0Lmf5hjcR`C%aL{&+#X+ WBb9N}O@oO50000e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00DSOL_t(Y$HkSgO9EjS#-BUS zGdYQiI1@sO3#2;3z(s2C{s0}Kq2{11ZVVi2YH4X`Xl#oc8gz7Uv?T;R4+5`D0_ld1 z^vKggn;fD7FS_%YUijd7fA7Qhy&oaVvIsz=2Th4FOg5s_2-t8TJvW(I9FI@mA zQ2@kH_aPT8S7=UC5Z3B&Q=Fy{Ixoz%QdX`Tih-gBO(|Ng&_Yp$7Yb|j@sM;Q9gs-I zFj-Dh;I%kS0b`gf8BuD4+p+(aL`10(l#>gWUCSV^7LZ-bd^=<99&8XeYFDw{X-{To z1LR-m^J)QkweY1js2Q9--{G2Db>v0yJ%_x8e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00DeSL_t(Y$Hi5#YQj(yJ<*6Z zYRHmUX#<&!gCMxL0~diswVt^Bn|hMj9YHR2ykI1A&LX| z4N)9`3p)u`mip|uZ9n9MO#19m4Ob}WXt$qGDCmFo1mPR5%b-$uK|Vk8#1{euEUQQ< zg{RPU{oq>HbvhdHv|QFa^I2Ar22N?KqBtPr>ZqKP3K)-h$nx@X0ve4hYPILf35Z5r zY&OB;1Z=?^mGIvL>`^McqS;hEb8W!@txkPw+bPeTd#bSQ6m50t+rVng+k~jTKSYG6 zSgmjA5L~c#`DCC7XMsm# zF#`j)FbFd;%$g$s6l5>)^mS#w$HOMVrS7oNI3Fk^S>hT|;+&tGo0?a`;9QiNSdyBe zP@Y+mq2TW68xY>eCk|Bf*VDx@#N+te%jdOR14Y{jB-m2UOEXOT+f3O~2 zxc%|cqfDv4`lTg&c+4Y?=N|cfqw~@29o~ORtE~EN$==|($Mx=kQ2vesC7+s%{)Q{R zcx0#xk(E0z}nhq_&v*40?Jd%sF@0|1n58w^SM!>n3IiHrK9YPntAVPjE*pPiUIRe8-CiZBq9{HDlq)260U#b_ zpaI|q$>rg2xE)1NQcLskS;bqe){ zsQwFa9KRd=I_7gj&XbNzn*Anb(syj$=;T5@h`17eYw%!2#~hf$A5J&ykZ Yi}DiaDZgD()&Kwi07*qoM6N<$f`y3#egFUf diff --git a/images/mpt1327_green.png b/images/mpt1327_green.png deleted file mode 100644 index 5d6f17830b382a850aa0d6c4fe19d2cf12dfa125..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 829 zcmV-D1H$}?P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00N~+L_t(Y$Gw$ZNK;`L$A9OX z_sqF3KhAKOQ_{l9h^z?7iy8#wWf#>&UI|Nx!VBptx`+yb=!>AcpoP3AX>$`|v*R^ZcLx^S;k3jf{-=0H5xN_?OhQXT}{8 z1`_2$SJa!WGpu2Is^JMRDF9!rW^r(`VZj;DLIkx%%87vH6&rCHXqJ79-JTvtuPNKyC_)Q=sp{z+@f=EfIsnTbdYB90J zl)p>q*GueGPY&`xu3)ctbL1^x*mFgn+K+;G#|8q*3h0d{jjt`F>rK>Exg@Cbn?kzQ z+;V@ruh#MT>`KvY9jj)(cb%x~t4gBHTqht5nZ%APZDTePJ5A(tX}}{lYWZ?zb;|^% z?#J2lydb&uUIkeqzCT;scZ3vHwigHp0BNltvm-1>v}OzK*no*=u`MUJMkJJsgyF~o z&^B7l+@(~BPjy5l?KU9_LM4xq0lmpATrLw7aA%)q2LQ>Zk!Lfn*;spe- zE-PdldDLhg>A|ae#?#%?6`uurV_y0`9nH#hhBe#~Yp(bp>WDQ{XIR5Z@9935$CM7+ z(yl6is4Y?U%8xJZ!xw2u)+8Gr3t&=P_R?co{9RFR#lPcU^q&u7XK|z}00000NkvXX Hu0mjfH*|1? diff --git a/images/mpt1327_red.png b/images/mpt1327_red.png deleted file mode 100644 index 4403906c77812977a73b108a9914c7eb42e6206b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 842 zcmV-Q1GW5#P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00Oc}L_t(Y$Gw$ZNRwd{$A9nF zzMMKgwvt)an363t8bt|}Py|6;bQ2X+S9M`vh*uWf^hE@95fpUOMO{Q0b)gqtL`4OC zKqAaJ6P+?br%Rk|&Uf#-k1kv*wLk)QuAT$`bDsbCKj)lB=%zVWuWiuc7;To~^K;AHK7QV6t!ee8~fIb45eSu!P^;`vYy0GHP7V9-=X z+e9Bt@ky>az4Te_oFDI77Jnm^MFfb+27J~^0Q!q6h)YTy6qQX}4t?U0eG>p(fo{42 z-TCvunK5)p&g0L8eOwQH;E`hie=0J_?a_BUbkyf#?hn6W!~85jj)1733KD4`F3O7t z0BlIch$!a2O4$_jDPb=JN^$!I!QNpFp^0cy+T6GpxkQODp zShI^`)59w!aChW257ul3;ESaa0oaL#$)&^p@KQ1I{gCsUFU UFS?LOK>z>%07*qoM6N<$f^7tE<^TWy diff --git a/images/mpt1327_yellow.png b/images/mpt1327_yellow.png deleted file mode 100644 index ba095ac0f9fd8237f7682bdd3ad2b89accc4761d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 859 zcmV-h1Ele zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00P5FL_t(Y$Gw$LNRwe4$3NTN z zNCwW5&=fUZ*GoF_b-mkkZ->=e%K{197an+iJikBR=llGg=P`xD;UEwc#f=tGOuC%T z8Jo$JvvNp~<#S0*bI6)j9s*tpK+tag+~M&|S4q+wm6h)~Oi0q4Ls0^b)zwQKs_I4% z#f=t^XSym72vZDHR=)qa$*QHLrWUg(CS8&=N3kJEbBJQnWp+AeY=kxe_Pu;gM+Ub9zJWtJbCg0uXhW89|WvunuWbR zP*tIT0D#xKjiMa=tCXFc@dDfF{D!VWE|<4YpWdOQB!}IeHGJana_Z{7{vwb{3Ao)m zOisF~sL)8I3JHArbeys>?ZD^T+k1uEw?7(oC{#mx`v=2bSU5pV&2I{1G8TNkEkdDM zYHPR9G)qCkd-pDI>(;`72@DNQ^7N@6fOqdsVlqK}{a0gsWu+9idj|jkAe}Z-UA>Jg z+wu9fNT&-4jEy}%aPdS!B$KgFTAG)9bhMV9p4cBg$B?9NtgnNh>*j1GW3hTXDv`(p zdwY3B{uhrQH?Xo|r?)p>baC+nckWy@8Zh73CD`p5blsdK8Xee7B>cLrQ`C`2`1NRX zVAHH=4p~tGMSqACC4ie zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00BNpL_t(Y$L-b6E5tz<2Jnx? zVYw(J<>p6D4o=HKBqz#2DK4D%OyWOqk^B#CjxNfd;KD&E<>o@UNmiE2``vce*EVVQ zW@>uonR$Ae_nnz{_-}kgU(1=B4ZKEAto7igX+7%|++j1(zk%GMkRv#Y@qX}w;Ac77 z0bHVr#YF#x2)1$rV|d3KmIEso&oje(@bg6f8hOS8dUH&VgI5DjeoH6%gFmJEXJjX^ zoMSrP6vcCB69r%dnw$b8<>iu=ae zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00C7=L_t(Y$L-azOIJ}G1@Mm< zA!;NlBDe)k733hc7}6pnI0$Y|LVHv+J2d3b)F03ip@Rsy1>)f7pAa}!C~7|}3Pfx< z>f`bJrTu=ttpk@Y=brQKJ@>x*?&CksaZ+fEaTc4s17GTV>vt035C;i+<1zu-QfG7O2k<)Y z`9Tg*QMsY0`T+6zCEM;Ob+ jbA)kBV*-8HYJtxm`>2wEq3sqB00000NkvXXu0mjf?bgg3 literal 0 HcmV?d00001 diff --git a/images/p25_2.png b/images/p25_2.png new file mode 100644 index 0000000000000000000000000000000000000000..d7094220d859d737347767af498c420adca33075 GIT binary patch literal 462 zcmV;<0WtoGP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00A~hL_t(Y$L-a>D}_-Q2k_6u zf>B9PN*QmFMCwY6Vi13Y!6Gvoga5*06$@oC5N>{q%49JZ6d~QN<#D~e>ALBCvv}(5 zoag&|&wIY-JkL3YfBUj(;(Nmdh9WkFE4<(o#lX8$?Bk;%YH^N`aQb2MCj#Heqz<0tw4F3Ul7|%jL74NvjKq5Ym zN=(!nSQ(2LiE&q1r66s?QJClG`6k|yN?Eneq`wldhh4O$@S`{x(=qlSuN}Bgt!g#! z60Y%t{WzAt7Vsxlh;{*8=)`*DaukDT!)8vrnyo}zjC>}=E$7J7l&E63MSmh!-&K2- zyqbVYw0*d#ld`ONniG%8WLzj)aS@d;i;1{`Pjle;0Fla&r+!L>f&c&j07*qoM6N<$ Ef=*Py7XSbN literal 0 HcmV?d00001 diff --git a/images/passport.png b/images/passport.png index cdf282141c38d38675b098b802465ff085b1874d..8424e5416fc6e2f766a0399b04d2de9d696c3703 100644 GIT binary patch delta 372 zcmV-)0gL{L1-k=~EHD26|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RZ z3-lDWk#Uq)1j}Gn`e~k<4rc z{sAkCGMFiU04ak(l))e=l9M9w8r6(2?eBt}>#HIJ_zGb)yr9Kk&4xZ(WA2knpx@6WB|} zRm5x@uvvj;IKx`R7I0s-f)vNtuiK^iGbrwN8olVjYCK3e452-_*|pY{uoQL>lV!y% z)=^jb3tGcoI%1&8PHU|z74R0e9~V_tR%@M>uzi?_hhz({7{wIE(S@Tr=zIW{YiDIt Sx}W6$0000B> z{{n*uHbz^KEwmJDvsaU9ox;RBE{-6->9eu+E-vSzb6)dEHvRvgDef8rK1j5v;4K+Vla_HmJw zD4|#^<0OcdVIkze4j^}w-fOkW=%e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00N3hL_t(Y$Gw$bNK4RDRP0%oK2Af6r9=0fo5}^j+gVLk)P`%ZoJqG=wK=UE!B`gpMM?vjH zrXoqW<=F5#r@PLnb3Ld_nJ*dh`}F1f&hMP>Ip@du>4t`e+<<#QOnBm=R_ZUAkutiB zkvyR}a(vO6lEU_sc@P*C0Qa1<(CsUmbOe+j6H17DBA^82I<;JGovZ0C)9eTfV#4Dq zn{*7H^l=!NP(nLJI@)I&J^Hw)l?Id`hmC*|Bra;DdVk4`G@*oW-?HQGvT<~*Ag_tt zUAAl|{3SDze&@l7i+aBIFH!Zzlve?wX2|l4E@Ra1K1@`kF{uXHdS%XES2#8z0#NZ@ z#O1Z+@UuNK7p^Ked#%V50sx9%z~!~!^4d`RTeh|yIa@hEho>mZ_Xx23GO#MA`T8Kv z*y9){UT<}yYFOgiy?73nA_51KIqEP)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00NFlL_t(Y$Gw$LNRx3G$3L6% zo%5Zw;Wj5^>YIPkO%#H%A|04vkcTKip)e=|4R`AxL5JuRL?A(dc&SS<4?#g5q6~=) zJSgt9EPe40=-f0{Zu8I7bx>zAFB#kS^nIQmJkR&}!}C+QTrLOT5W*8q(H}HeWw(ko z;s#HtJrXpC{?+8{cA!TCIP`(q`N{-8l^mE9_fGR)Qdvoz#a)0<|EYvP9d z>S!mdvRkFzUO2xdg?p1$rTrRBP?ZGSnUKw+^ zmRA+Sn0y#-TvX>+;4OALu7hEmhX zSPjJ_)NHKtGfCL7_fmDm`;FGz3evZN-aT}j2H!{w2e_VBg>GYwW{(?y8?!QxGRpvH zof(XYedhNxx3f>vseAxH<-S!Hv32k72-Ox{*fr08ge zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00NguL_t(Y$GuhEOIl$V|7oYp z&o%NKi_PK9Xk^1+P>hi|T(N<{f<6=qYpJB+P0&@)MgKq$47ylXUFt>9pzc<5wK@>u zQ5=jB3HfnW6AeR9o?Wy~h21RBA3X4TpZDSU=6z+MP{;(q$Sh+P(nTWdPV@Eywd+?FU+xje+Chs3ll7#)zW%Ng~xVPdO8qiYD#pYCq7L z%^}nS92dVXQY)03J#v*IZ(!LN>J65SL8ZtW|gsCZe z7592=7#{wBK){Mv>@fg<=k;*A?Qpy8;CVd&z~{3`l>@-gkmDw(AdC_b$l-8MBJqf( zr{7XO&rm9*B&TzLh(P1xgOp6Fs<^}9pi)UjdwcCPH)kaxkk8joJg=w2Lp{yTS|z(e zp+VwAAR>?;jMAMBEH1u=)AK0GgTzy}fCio~i)=nT!e+ z%WqgLXGo{jlAT6VxpyRY5(tNPFgTb*IQ$%|tNW7P>y6{&L|erHpip4I^Bna0%YVyt ziD*=hXtWguL$N9#!&Gp7-gI-mFRO`(1cE^;T3fH2E-m%I<@!;@0bpjv4yCdTzh3|V zcswzztaJkag270Y@4miMEG)di`uevk#gQ;3&E$XO_B3VusIuJ#qgdbX_%9#xghR`79%29h002ovPDHLkV1j+)XPy86 diff --git a/images/site_green.png b/images/site_green.png deleted file mode 100644 index 22b28d0874c3b245b32fe674320fab3c1f25dc43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 712 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 FV1j!e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00UD=L_t(Y$Gw%kZ(3Iv#(!Ks z3|xaQIM)s~STe3`60j_%QDw=gisY(k2M?(f50iBYLGI;a=|G@4NeW_I^X~Tt^xCvA>ziwO_L7sJDqdS`##Tkp7Y*wbm4F~2n5Zg z{Gz#Bbe)br5_O%nk@pnJne)Y(O;T!h=TE@80SNZzcCUIiBW^jl#bEOBe**k&a}hYm z<7m~7trhfr#H>y}E-P=Wmy=sk&g+*_({ooV@(6;tlwb60M%@1U;kS~fOd_{NX8x5N zz|pF6Yh;F$Nqi&5VDd5k`(Zqr5x2RNUlh#cqDxM0y_0=+2gX^-B>>16MV3crxit9& z%cHYoj4w%-atZDZjB7Q^qq8)0LJv+uC-8HngSlLE38&+a#J4H$#)c?!p_Bn&#Wh7t zJVjH`6BAFd;+g{BLMg+BC5E@AonDXR+u-K8EjMmh+7;zpxyakqe|Xj2H=5xn1#YN0Jnz%T%P=#+d}~W z77E+!nED0Hn^ngcAtg%0=3;5$Ga@z@AtlPHV@xA)Hfv;!765$JLeB=e^Q_T=vsu%| z?s^4)HOWm)Ft8@M0dUtVsCon12GV`~_^O4TL|?T)y02d&nNf2*unz+eQlbRZeGKgu z0d=2{64g}Cs5#AzZvA{Qjk(=qzL?hd#8wkS7u;R15Vts(FQ!?O+{_o##4Qd@0l=l_ zPx!|B374P$&2U5I=FY=oeR4;h;M?SHT0g8h#t7~G!S!b`u0M-$)bY`J`IQ3;g>6<` zQ_PhW?j(L?uB@=)n$pe?z;mc_V|RmszEAu1wKv#v58T+@z;mbqa3%K_8Ix7}3%a=t zoj}H9W%^+Ml>--xDJ~XMTH<%fb-sVHeoW!(mrUl!5jk4*W9vs<>gF0dZEo&7WNX5M z(9sEv*GZ0ozR&3Bgod!^JEvy7XF2J}de5@wJEsaYo22Bt{u3cx{qq-Xob&pr*(62( zVj;)Ue&U@$|4(jL`O^=Bq^9T62hO1%4ZwOu9%1{VPZyOl=TH1O ZegVEGSkcIaoj?Ep002ovPDHLkV1l7_&fWk3 diff --git a/images/system_yellow.png b/images/system_yellow.png deleted file mode 100644 index 3402560094d5c55824260a03beda1752689d3b03..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 900 zcmV-~1AF|5P)e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00QhuL_t(Y$Gw$5OcQYw$3Hz= zs2mz-Z9_?GVj$YcL4s2UG)+j18b~0qOLv+WQf9ijIk}VpMje=hV~2KPXXN@{;%R`+mRg{a$`AKUXf7ivw}mN;6*hpex*?x;zN} zm+kBhiF&PLANz6^c;N=(=Q`hIu0~$91p?aygRg%p@bYB{MX~7a{`|vPrP7Y3`M7!W z<1hJvz_!aY2fB+N?96esA9BwgTbh;-LU5v&O0t-kxc6Jk#Kb*OD#<5mX<9<$o;|iC zuYAxI2yFk+_?DLXNG6K_7=}zH6Jv7nE}2XW!;k?;CW|aB^*NkOCPt$nwdgb&63fd1 zuYAxYg?m)jNn>x?)>eR#5d(m^xj{7T5=Tep(6md;%?$!DGGef`6#(Gr(`)qh9^mnO zY0>d`zHsqkk^N7GOKLv2)zt{8R2)_H(`ZPjs-ILU&gyE!AzGG~VDJ!tw{N>!M4Ndq zc!*_r0od5+Wqf=GfQ1ExMB)w$3km?^<2&f33plgM=dX}Xt88wDNG5NyxfvpzR>|kD zI7NKEI_2_t0HV=KO9RckTt1J_S9juYxC+49T9|s>&DvTRfN;1*sLfUb8EjaFKK z(P#x-?{ta`51VXk^a7Aht0>AIZuc>YvPU|tI=3DkHl1lS`JAQoXT)xg(Te*B4eRohu^;*Zi zX%3u8(R}{76PxA$^;*ZiE0@bX{F~3{U) 16 ) - { - - } - else - { - setIcon( icon ); - } + setForeground( foreground ); } } diff --git a/src/controller/channel/ChannelNode.java b/src/controller/channel/ChannelNode.java index 9bf26c0b..281e2c52 100644 --- a/src/controller/channel/ChannelNode.java +++ b/src/controller/channel/ChannelNode.java @@ -17,6 +17,7 @@ ******************************************************************************/ package controller.channel; +import java.awt.Color; import java.text.DecimalFormat; import javax.swing.JPanel; @@ -98,21 +99,27 @@ public class ChannelNode extends ConfigurableNode implements ChannelEventListene @Override public String getIconPath() { - StringBuilder sb = new StringBuilder(); - - Channel channel = getChannel(); - - sb.append( channel.getDecodeConfiguration().getDecoderType().getIconPrefix() ); - - if( channel.getEnabled() ) + return getChannel().getDecodeConfiguration().getDecoderType() + .getIconFilename(); + } + + @Override + public Color getForegroundColor() + { + if( getChannel().getEnabled() ) { - sb.append( channel.isProcessing() ? "_green" : "_red" ); + if( getChannel().isProcessing() ) + { + return Color.GREEN; + } + else + { + return Color.RED; + } } - sb.append( ".png" ); - - return sb.toString(); - } + return null; + } @Override public JPanel getEditor() diff --git a/src/controller/site/SiteNode.java b/src/controller/site/SiteNode.java index 6e30141e..f37014e8 100644 --- a/src/controller/site/SiteNode.java +++ b/src/controller/site/SiteNode.java @@ -18,6 +18,7 @@ package controller.site; +import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Enumeration; @@ -59,27 +60,27 @@ public class SiteNode extends ConfigurableNode public String getIconPath() { - String retVal = "images/site.png"; - + return "images/site.png"; + } + + @Override + public Color getForegroundColor() + { @SuppressWarnings( "unchecked" ) Enumeration nodes = children(); while( nodes.hasMoreElements() ) { ChannelNode child = (ChannelNode)nodes.nextElement(); - - if( child.getIconPath().contains( "green.png" ) ) + + if( child.getForegroundColor() != null ) { - return "images/site_green.png"; - } - else if( child.getIconPath().contains( "red.png" ) ) - { - retVal = "images/site_red.png"; + return Color.BLUE; } } - - return retVal; - } + + return null; + } @Override public JPanel getEditor() diff --git a/src/controller/system/SystemNode.java b/src/controller/system/SystemNode.java index 7452c0cd..bab503e7 100644 --- a/src/controller/system/SystemNode.java +++ b/src/controller/system/SystemNode.java @@ -18,6 +18,7 @@ package controller.system; +import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.Enumeration; @@ -29,6 +30,7 @@ import javax.swing.JSeparator; import javax.swing.tree.DefaultMutableTreeNode; import controller.ConfigurableNode; +import controller.channel.ChannelNode; import controller.site.Site; import controller.site.SiteNode; @@ -58,28 +60,28 @@ public class SystemNode extends ConfigurableNode @Override public String getIconPath() { - String retVal = "images/system.png"; - + return "images/system.png"; + } + + @Override + public Color getForegroundColor() + { @SuppressWarnings( "unchecked" ) Enumeration nodes = children(); while( nodes.hasMoreElements() ) { SiteNode child = (SiteNode)nodes.nextElement(); - - if( child.getIconPath().contains( "green.png" ) ) + + if( child.getForegroundColor() != null ) { - return "images/system_green.png"; - } - else if( child.getIconPath().contains( "red.png" ) ) - { - retVal = "images/system_red.png"; + return Color.BLUE; } } - - return retVal; - } - + + return null; + } + @Override public JPanel getEditor() {