From aed2c13a08dbe54836128f97b6b9d45b22e0015f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 25 Mar 2019 22:21:21 +0100 Subject: [PATCH] icons: move some icons into own sub-directory Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/0780c5c9698152d8e6d6615ea7c3f29b55029b25 Author: vanhofen Date: 2019-03-25 (Mon, 25 Mar 2019) Origin message was: ------------------ - icons: move some icons into own sub-directory ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- configure.ac | 1 + data/icons/status/Makefile.am | 1 + data/icons/status/ca/Makefile.am | 19 ------------------- data/icons/status/camd/Makefile.am | 22 ++++++++++++++++++++++ data/icons/status/camd/cccam_green.png | Bin 0 -> 304 bytes data/icons/status/camd/ci+_green.png | Bin 0 -> 189 bytes data/icons/status/camd/ci+_grey.png | Bin 0 -> 186 bytes data/icons/status/camd/dec_card.png | Bin 0 -> 241 bytes data/icons/status/camd/dec_fta.png | Bin 0 -> 209 bytes data/icons/status/camd/dec_int.png | Bin 0 -> 206 bytes data/icons/status/camd/dec_na.png | Bin 0 -> 257 bytes data/icons/status/camd/dec_net.png | Bin 0 -> 200 bytes data/icons/status/camd/doscam_green.png | Bin 0 -> 283 bytes data/icons/status/camd/doscam_yellow.png | Bin 0 -> 283 bytes data/icons/status/camd/gbox_green.png | Bin 0 -> 285 bytes data/icons/status/camd/mgcamd_green.png | Bin 0 -> 285 bytes data/icons/status/camd/ncam_green.png | Bin 0 -> 266 bytes data/icons/status/camd/ncam_yellow.png | Bin 0 -> 304 bytes data/icons/status/camd/newcs_green.png | Bin 0 -> 278 bytes data/icons/status/camd/oscam_green.png | Bin 0 -> 278 bytes data/icons/status/camd/oscam_yellow.png | Bin 0 -> 338 bytes data/icons/status/camd/osemu_green.png | Bin 0 -> 270 bytes data/icons/status/camd/osemu_yellow.png | Bin 0 -> 317 bytes src/gui/infoviewer_bb.cpp | 2 +- 24 files changed, 25 insertions(+), 20 deletions(-) create mode 100644 data/icons/status/camd/Makefile.am create mode 100644 data/icons/status/camd/cccam_green.png create mode 100644 data/icons/status/camd/ci+_green.png create mode 100644 data/icons/status/camd/ci+_grey.png create mode 100644 data/icons/status/camd/dec_card.png create mode 100644 data/icons/status/camd/dec_fta.png create mode 100644 data/icons/status/camd/dec_int.png create mode 100644 data/icons/status/camd/dec_na.png create mode 100644 data/icons/status/camd/dec_net.png create mode 100644 data/icons/status/camd/doscam_green.png create mode 100644 data/icons/status/camd/doscam_yellow.png create mode 100644 data/icons/status/camd/gbox_green.png create mode 100644 data/icons/status/camd/mgcamd_green.png create mode 100644 data/icons/status/camd/ncam_green.png create mode 100644 data/icons/status/camd/ncam_yellow.png create mode 100644 data/icons/status/camd/newcs_green.png create mode 100644 data/icons/status/camd/oscam_green.png create mode 100644 data/icons/status/camd/oscam_yellow.png create mode 100644 data/icons/status/camd/osemu_green.png create mode 100644 data/icons/status/camd/osemu_yellow.png diff --git a/configure.ac b/configure.ac index 9b85820ec..b6c48a2bc 100644 --- a/configure.ac +++ b/configure.ac @@ -339,6 +339,7 @@ data/icons/radar/Makefile data/icons/slider/Makefile data/icons/status/Makefile data/icons/status/ca/Makefile +data/icons/status/camd/Makefile data/icons/status/channel/Makefile data/icons/status/info/Makefile data/icons/status/markers/Makefile diff --git a/data/icons/status/Makefile.am b/data/icons/status/Makefile.am index 5489bd956..f44df6400 100644 --- a/data/icons/status/Makefile.am +++ b/data/icons/status/Makefile.am @@ -1,5 +1,6 @@ SUBDIRS = \ ca \ + camd \ channel \ info \ markers \ diff --git a/data/icons/status/ca/Makefile.am b/data/icons/status/ca/Makefile.am index dec8eeae7..8378a40b7 100644 --- a/data/icons/status/ca/Makefile.am +++ b/data/icons/status/ca/Makefile.am @@ -4,9 +4,6 @@ install_DATA = \ biss_green.png \ biss_white.png \ biss_yellow.png \ - cccam_green.png \ - ci+_green.png \ - ci+_grey.png \ conax_green.png \ conax_white.png \ conax_yellow.png \ @@ -16,37 +13,21 @@ install_DATA = \ d_green.png \ d_white.png \ d_yellow.png \ - dec_card.png \ - dec_fta.png \ - dec_int.png \ - dec_na.png \ - dec_net.png \ - doscam_green.png \ - doscam_yellow.png \ - gbox_green.png \ ird_green.png \ ird_white.png \ ird_yellow.png \ - mgcamd_green.png \ nagra_green.png \ nagra_white.png \ nagra_yellow.png \ - ncam_green.png \ nds_green.png \ nds_white.png \ nds_yellow.png \ - newcs_green.png \ - oscam_green.png \ - oscam_yellow.png \ - osemu_green.png \ - osemu_yellow.png \ powervu_green.png \ powervu_white.png \ powervu_yellow.png \ seca_green.png \ seca_white.png \ seca_yellow.png \ - srv_green.png \ tan_green.png \ tan_white.png \ tan_yellow.png \ diff --git a/data/icons/status/camd/Makefile.am b/data/icons/status/camd/Makefile.am new file mode 100644 index 000000000..4e83590a3 --- /dev/null +++ b/data/icons/status/camd/Makefile.am @@ -0,0 +1,22 @@ +installdir = $(ICONSDIR) + +install_DATA = \ + cccam_green.png \ + ci+_green.png \ + ci+_grey.png \ + dec_card.png \ + dec_fta.png \ + dec_int.png \ + dec_na.png \ + dec_net.png \ + doscam_green.png \ + doscam_yellow.png \ + gbox_green.png \ + mgcamd_green.png \ + ncam_green.png \ + ncam_yellow.png \ + newcs_green.png \ + oscam_green.png \ + oscam_yellow.png \ + osemu_green.png \ + osemu_yellow.png diff --git a/data/icons/status/camd/cccam_green.png b/data/icons/status/camd/cccam_green.png new file mode 100644 index 0000000000000000000000000000000000000000..005d544644bc4d985167d9454d11a2eaad351691 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-G!3-py-CZXQq>KZ6LR@{;2LO@xO8*BB9ymEU zUAuPe(xpomFJ5eKZ!az`21>c6xD^!@-MxGF^5x6-?%gXbE!`cRw+5)4u_VYZn8D%M zjWiG^$=lt9p@UV{1IXbl@Q5sCVBi)8VMc~ob0mO*>?NMQuI!JPc}0Xw#eeZu0ENmt zT^vI!PG6l8$#p=1$E7*4VBzV%{?Ti{y7TOC$YgJGJaO33fZ>?`DTWyileySzd{5Ui z+m-iZEw@nG;vy#cW1g$3>LH&aQavluw{5lHlIOg0X{O}y{BvKu_i>8*Uwv0$P?>c# rayO^-$-|{(2kU=Hc%M#4<&9m=BIen$?a6GQ3m80I{an^LB{Ts5;C*j` literal 0 HcmV?d00001 diff --git a/data/icons/status/camd/ci+_green.png b/data/icons/status/camd/ci+_green.png new file mode 100644 index 0000000000000000000000000000000000000000..5bf5166aea506080bca31e22b05ab73399ba03cc GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^DnKm4!VDzELz>utlwyESh^x=~03h;S>F?y^>v28?3}4Qkn7>;;uum9mn^{L%FM;1 zbu8mRr=mpci76F|pCea`Nk{9tiEWB$)nj?o$RVKSbb>2|VVQtuT4aLNp*7sT9X|QV g+)m2^Ocro3?ED=s#CWpa4`?QXr>mdKI;Vst06sfAB>(^b literal 0 HcmV?d00001 diff --git a/data/icons/status/camd/ci+_grey.png b/data/icons/status/camd/ci+_grey.png new file mode 100644 index 0000000000000000000000000000000000000000..58557a74325b2277e958f3132cc9b3c19d6b6706 GIT binary patch literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^DnKm4!VDzELz>utlw5#Mh-)br6crUYIXMLd1r-+; z0|hQ!x^(&SdMXq*pPM6i%at1_8y*XAET%qdL`GmTlk2su(OK c6~Mw^cQk&_6$PdXKrutlx~1eh^x=~03h;S>F?y^G+ zPZ!6KinwF}E>~tQ9<5^;2RaocVoyw|Q0y*#FL!%ybu7=J0L9tm3Jc3;J4$G!e3xiZ z6bOA`#G%Z+w|cuo?A6`jCto<7kC$GYU9%_OXp&a;1ZBDFxok7pMUC#W3vH_7G2&No kS+{*7t75Q*Q~(P@gm~4qPuopb1MOz;boFyt=akR{01fI^%>V!Z literal 0 HcmV?d00001 diff --git a/data/icons/status/camd/dec_fta.png b/data/icons/status/camd/dec_fta.png new file mode 100644 index 0000000000000000000000000000000000000000..7b6406b94c9ffa2cb338377e069340de54b20456 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^DnKm4!VDzELz>utlzMF?y^P-o1D4-h&4Z=AP4;2-Lz{666=`ANZ~8oT)sJ8|LZa7*Y|J zEWqW;%*CU1EaO0@qD1V8DHV#djnny>H~gFutlwyESh^x=~03h;S>F?y^sZEtPDP2>6H_V_SBI_^ix!=&zm3T$W#P$b8cyAfhfc3HXbC&#bajWsBFSKmVCA~U z4`=Cwt<7>1HhLX3kw--7_U#)@6EsD5HJBK_ZO(qRd5+;spd}2Ru6{1-oD!MutlvaRGh-)br6crUYIXMLd1r-+; z0|nNtTX*TwrOTHu-@SYH-o1PG@85s$;K5Pl>?=TB%q2m7!Ty2Y%Fda}1G&wfE{-7; zamfN+&dgjqTE{XDbSg^5p6IDiynTAx^xocFz1e5?3i1f=;uBhBn^XBc&)DY$pT~utlyrbkh^x=~03h;S>F?y^GG@LSnAQ+Xga($mE;q#`a^fXkJci%08N#(_>n ziP#fUDipiZ6yCgGNS+ZOy)3{wV8u;|B{J(aDl-SKSafsIVoBE(dzqbAtYvmiE@oX8 tz;=UC!$~Z|DWyuKZ6LR@{;2LO@xO8*BB9ymEU zwYRrlym;}_rAybYT?2|27Z+c?eAzX{t*EHz?%lih?%gXbEj^_l{TQg7xg^Lh*gx=F z**Q~rAa{zVi(^Pd+|?uWo*dyXdt!zL5)o?ql$D^>bP0l+XkKze{<7 literal 0 HcmV?d00001 diff --git a/data/icons/status/camd/doscam_yellow.png b/data/icons/status/camd/doscam_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..835e125ac7184cc8d6da98463941eb51c2a1a21d GIT binary patch literal 283 zcmV+$0p$LPP)l)6>&@YCGNC-QM2bb#-;I^z&E% z000AYQchD(QTBGuH6H)~0F+5YK~#8N)s%}00wEMcUC;R3-Rl3pHqc0L4Z(nDK*qUp z^dhL)Y+jT##-3W#X-(F$^6y~)7p2EhJvxAzq16deU;yK!%r8NR>Qy=QiE0$gk`Mb)S9Ug$AAZCe`8=WX}!{K9}Fx#C^!HXg!hm!hlQ@&x|F hhw&#*7)IrKLqhMboBD+b^Zo0yKoV zB*-t=Kk!@GIa7HccY>#jV@O5Z)hVa>m<%~wXEN2E_5S<6Uo=NJt^JW(K2yt4&xKnK zOezZCRCp_KWu8KE#Lw~vw@)d#d@aeaQwl$Fif_-RgFeRUtlN86GaE^JA!jxFvzr~Gqs h|Hr#V4L_u!=CLsdRn1FU3UnF+gQu&X%Q~loCIIS2eIft= literal 0 HcmV?d00001 diff --git a/data/icons/status/camd/mgcamd_green.png b/data/icons/status/camd/mgcamd_green.png new file mode 100644 index 0000000000000000000000000000000000000000..df32b2a396e2927786c3b849cea2aa8f334ee9c9 GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-G!3-py-CZXQq>KZ6LR@{;2LO@xO8*BB9ymEU zwYRrlx^(HKZ6LR@{;2LO@xO8*BB9ymEU zwYRqex$D-gyL9Q&wQJYz-@jj6TPmO|mC4JQ#j?&QZsT8EcSzjB#$&;E(TY22 zt9Aa~y3wG$@BW^c*~!U?S6WS1S8wKDoz8ur{*&RizQ!ZxFMMQ^Jto2t^zp_6pmP{J MUHx3vIVCg!0D#tP!T=c<~}os;H>w^5x4lS=M*&-o1D4UTJA*mYHfEP%mRikY6x^!?PP{ zAWo9Ey9+}HtE>l*!&%@FSuZ;I4vHhv$@Q0Zuo1j~1k=?(qxG3o>Jj rW@wCPI(mn5xk>J#7Kfq(^Jg%WDo+*+|Mz=7&=Cxtu6{1-oD!MKZ6LR@{;2LO@xO8*BB9ymEU zty{P5+O=z!E?oi&-oJmpy}kYN<;$)qZbd~!7cX8cE-o%DEuA9P#{|^QToU9L>>v28 z?3}4QklXL+;uum9cXi5bE@nj@m(6~Ua`XTGU$48wOH}ISt?6$YS_Juc)Y`013z7Yw>*OjZCIa#s6dqc_EPiOXJPMr4m)r6F1cX--2RWtv8dHhGNKZ6LR@{;2LO@xO8*BB9ymEU zUAuPe(xpomFJ5eKZ!az`21>c6xD^!@-MxGF^5x6-?%gXbE!`cRw+5)4xg^Lh*gx=F z**Q~rAh+Ms#WAEJ?&_7>T+E6*u7SsEg-X+^e*Ryt+tRdDA?WudHYcBgy&AK&?a_Dh z)0B_uQC=Qc+<2i>Js<@R2F^Hu0E@n$M=*+X6sLu|1S^!cxUYK`u>G) Z47(1C#fN;|@CoQN22WQ%mvv4FO#sd;deZ;^ literal 0 HcmV?d00001 diff --git a/data/icons/status/camd/oscam_yellow.png b/data/icons/status/camd/oscam_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..53809cba32a188f9fc2e41d82462fd6417229430 GIT binary patch literal 338 zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-G!3-py-CZXQq>KZ6LR^0z&;_E8JM|tsc;MvZ zbm`KiYuB!|x3?D;7hk-15hztuRCM|B<(e$(yLa#2yLYd&v~=T_&k;cFj3q&S!3+-1 zZlr-YN#5=*3>~bp9zYIffk$L90|U1(2s1Lwnj--eWH0gbb!C6Z%_d?f)5Q`4a=;8v z7sn8b(^scl09Bq_L$&~?f0gZ$=}gZ)31D1G%UM6Rs4^?{NoD- c7DjD(t;}M9*Q15*0^P{q>FVdQ&MBb@016+D2><{9 literal 0 HcmV?d00001 diff --git a/data/icons/status/camd/osemu_green.png b/data/icons/status/camd/osemu_green.png new file mode 100644 index 0000000000000000000000000000000000000000..7f007190d7b946736552f4e9a2d08a40c84e857d GIT binary patch literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^Hb5-G!VDypb)BVvlx~1eh^x=~03h;S>F?y^yo{tRbZ3#7(mR*^!&Eos68#VWLA1`~~P_gN0vbBQCq-~Yo^EQ9A zUhyS0x+K$j1%t%?Iql)U-rD9|3VR=c<~}os;H>w^5x4lS=M*&-o1D4UTJA*mYHfEP%mRikY6x^!?PP{ zAWo9Ey9+}HtE>l*!&%@FSFVdQ&MBb@ E0O&w$00000 literal 0 HcmV?d00001 diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 0a0504f8f..a84b53241 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -1055,7 +1055,7 @@ void CInfoViewerBB::paint_cam_icons() if ( getpidof(icon_name[i]) ) { buf.str(""); buf << icon_name[i] << "_green"; - if(strstr(icon_name[i], "doscam") || strstr(icon_name[i], "oscam") || strstr(icon_name[i], "osemu")) { + if(strstr(icon_name[i], "doscam") || strstr(icon_name[i], "ncam") || strstr(icon_name[i], "oscam") || strstr(icon_name[i], "osemu")) { if(camCI && useCI && filter_channels) { buf.str(""); buf << icon_name[i] << "_yellow";