From 150376bfe0bdbc5e04457f6b8d1faaa88417f986 Mon Sep 17 00:00:00 2001 From: striper Date: Thu, 18 Feb 2010 12:34:15 +0000 Subject: [PATCH] - add upnp icon - optimize icon display in infoviewer an menus - thx bazi98! git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@371 e54a6e83-5905-42d5-8d5c-058d10e6a962 --- data/icons/0.png | Bin 291 -> 274 bytes data/icons/1.png | Bin 286 -> 268 bytes data/icons/2.png | Bin 290 -> 279 bytes data/icons/3.png | Bin 297 -> 284 bytes data/icons/4.png | Bin 292 -> 279 bytes data/icons/5.png | Bin 291 -> 279 bytes data/icons/6.png | Bin 289 -> 277 bytes data/icons/7.png | Bin 296 -> 279 bytes data/icons/8.png | Bin 289 -> 280 bytes data/icons/9.png | Bin 282 -> 274 bytes data/icons/Makefile.am | 2 +- data/icons/blau.png | Bin 276 -> 247 bytes data/icons/dbox_small.png | Bin 301 -> 276 bytes data/icons/gelb.png | Bin 272 -> 248 bytes data/icons/gruen.png | Bin 272 -> 247 bytes data/icons/help_small.png | Bin 303 -> 275 bytes data/icons/power.png | Bin 301 -> 288 bytes data/icons/rot.png | Bin 279 -> 252 bytes data/icons/upnp.png | Bin 0 -> 1400 bytes src/gui/infoviewer.cpp | 14 +++++++------- src/gui/moviebrowser.cpp | 4 ++-- src/gui/widget/icons.h | 8 ++++---- 22 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 data/icons/upnp.png diff --git a/data/icons/0.png b/data/icons/0.png index 9d9ec0475afef6fa275c46aeccc891ae9615f7dc..aa4949c7e897678c12bf8d64250c6737dfde41e4 100644 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=1c~9sz*?k>Qb%F_Fp1 z$+_9Nxdpl9<>gIHO?^Fmv!>0OHFwss#mjErxb5NUq3#|07O01@B*-tA!Qt7BG$3b! zr;B4qMV#$9MZQA@A`K7AnPnKc4~7|(gl=@*%i5~=a`K6+JIhuDa;rb!h+$xnW7XXx z$=T$1qQdpVYX5&1GT-ZlJAbcv(5L-F!YMe%@58z2hUZS(?g^-_)ZWgSDA;9RcEM+9 zddP+FORrnpI#=^;Yr5wW7$nePAg4|hiXEil71q23oczN{o^etPwY}T|{<}0p-0QEAK1o;IsI6S+N z2IO!SctjR6FmMZjFyp1Wb$@_@J)SO(Asp9}6A}_crU+9&~ ha4~2P3=nw5%23p=`Rbo(lPl0&44$rjF6*2UngE@{XygC@ diff --git a/data/icons/1.png b/data/icons/1.png index 52f5d607ee8f1ff624074735060b50bc1b0f8a9c..65c36760360d219bad5658430b10a1f59e838793 100644 GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=1c~9s$7tk&%(f$;r9d zxw!?o<>lo~4NXmLO?`cRv!>0OHFwss#mjErxb5NUp;N8D4ycE*B*-tA!Qt7BG$5zT z)5S5QBF^@lA|I2XfWyU|jAA?-Hp{LyFR*3IoVa4HTw+0Xp-f``0l^&%cN$nW9-ZXN zq3CeJAo^gqf1N~!kIRzg<3Cr-z4n23W7NlQO!D#{PR(ZCbNADtk#)Z?ZhNrHznOVe7#_KSI46mbFaJnRhBMkvu=nv16{@7 M>FVdQ&MBb@0C7iV!2kdN literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^5-sjbPw%OfB-VAix*whvxa0QEAK1o;IsI6S+N z2IO!SctjR6FmMZjFyp1Wb$@_@?Vc`9$`S&pdXqEL|!g?cY*#CBWkPgE`h(ep#AFkFg(=krWl*I^|Om z$Mb2Ex}t(AJ~|n=OB~_UHE$`JGEa49+hI#DExm;S=adDGiyjix(%043=MQHoZio|T bsbFMSJ5kNCbykuB&`AuQu6{1-oD!M<@}6Tc diff --git a/data/icons/2.png b/data/icons/2.png index 3ef72318933cbf82cedf290555fb4c24a274e9b0..604c347beca999e80fded7d5c5a08a9ee17dea21 100644 GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=1c~9s$7tk>Qb%F_Fp1 z$+_9Nxdpl9<>gI{O?`cRv!>0OHFwss#mjErxb5NU5#F%!F;EXeBJGk;`hVm;1dR?MDRP%=S$?k>8r77-{o-w7eo{x>pN*1e2mN5T! Y@T7;)%SwwcKnF5-y85}Sb4q9e0KZsk*Z=?k literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^5EarhwppS#xLg_4Rppc`RGJY}T|{`)*%k0_tTf3GxeOaCmkj z4angv@Q5sCVBi)4Va7{$>;3=*yFFbTLpZJ{CnO~7(coZW;!#leRAnykrkJJpNz9$8 zAx`ObKvw9Tp5D;(I+o&;DO1i)@>Sw@vh;d&%57mmpSMwu^35en((cGv2_AYG5S8Qb%F_FnB z$+_9Nxdpl9W#vtcO?`cRv!>0OHFwss#mjErxb5NUQEySU5U7W-B*-tA!Qt7BG$3b| zr;B4qMV#z8L#{&xBF8?KGxsZWJh*o7nrZjhsO92wc5$qooxG>9P^)il6-)mE)-P;L z3zj6WP?)6k^yjPN=6{aa^K@i*TsiQ&>RGJWg;c4jn)x3>wVzLW%4s*l&SkH?k$`LN zKaaaD7rl-gn8kHV!f@lW12aw^$;hT4Wu4M3Z^>bP0l+XkK%>H+J literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^5%y{W;-5;RfBu^K|5RU7~2?+@zA|iVOa;(&44$rjF6*2UngB}PZ+-v( diff --git a/data/icons/4.png b/data/icons/4.png index 768bd5e4a31db7a2a35dd975a2df26b7dbf39d69..1ba6041a596976adffe31545e94c68b702390fef 100644 GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=1c~9svOXk>Qb%F_FnB z$+_9Nxdpl9<>gI{O?^Fmv!>0OHFwss#mjErxb5NUaU)@lFi;O;NswPKgTu2MX+X|Y zPZ!6Kia6PGhFpgXWZXXf=l#Og)V#Qvb4O|BE3J;sxiZ1#;+|D4X|LW~QLbRoUtliK z()7B$*<-bb@2_R|e`H+fwYop~-uCYIyOz)26t?^E+$XulS8deP%9@Earde}m1q1~2_4F-Uyv)PPW7f1;Eh@KifqEHBg8YIR9G=}s z19CVEJR*x37`TN%nDNrxx<5d{UQZXt5RU7~2?+@zH5wc&Ogst-RoS8fYj|0TQ+!XK zcD7BAV<~>(dsusllZ}0orO~m4ZeD8h*cZxNR#6oempJYueQu)3wrgQVQb%F_FnB z$+_9Nxdpl9<>gIHO?^Fmv!>0OHFwss#mjErxb5NUQGW8`O`smek|4ie28U-i(tw<) zo-U3d6>+lX6!{Jrh#dP^&O9N5L(I|G+F3eA@X1@I7QXhywv3utQd^Y^So9c}`lB{I zh*MB(aT2R|y}a&Z`o9Z5kCr|xwf%T5JEQ05nYa2Mj;dbFEpOr1(}?`Z>>U0=IcSll zaza#ZR=iU{@lxd{Di^nEFI2y+t^Yvxn9E^~i{cp)%!;CEtTx-P=$lUDQ$e767g4|hiX9WZVG&ME#_4Ijoc`RGJY}T|{>06_w0`)SM1o;IsI6S+N z2IO!SctjR6FmMZjFyp1Wb$@_@J)SO(Asp9}6A}_cSem(c6coM{sR^9%W+{Gh$!f}# zsIvX6#ZRVA>gmT-) z@flee1$hOPWtENfja@xmlc!FeGi%P$#Y?YTyW;NZe)LncI#3T|NswPKgTu2MX+X|o zPZ!6Kia6bKhI~y1GHxH=v+2C!dv%K8TGE#TaC%>3^$_V<=MqV}v?cbiXs<+o2EcRu#1E?=@^f%xn;+fAEU*Ka?`-;afcb7y_c+M*c-3bU5-B^rocO4`&hP3fGWl~(kwHuD|*g}+(n XGJBm2>d3AEI*-BA)z4*}Q$iB}wG3~W literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^5n#=x-VV4bn?{6jvgzrfO;8Ag8YIR9G=}s z19CVEJR*x37`TN%nDNrxx<5d{E>9Q75RU7~2?+^PL|GUa*#suc;AHwNbx`JH-={9V z^`ZO+Wh%S-6jUdN${&=GOg6r%QaZgkz;D8=m7H@XFIghO^wdL=JyTtCw@yoe)8vrm z2^Lw7r&I;{JYK22^*!~pPrxr~+oVg+$|Tfvt5+AYPuZ-iV{+pL)1jTO;`mtJHYV^b hRye^g-WbQg@bZD?#CzKmrGTzt@O1TaS?83{1OR^8XEFc) diff --git a/data/icons/7.png b/data/icons/7.png index ee76bf2329d6367533275efa7792dbab9e05363d..4cac8b0b967326dcd7f5fc1de4b4f4bcdc6aa54a 100644 GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=1c~9s$7tk&%(f$;r9d zxw!?o0OHFwss#mjErxb5NUaXPKj5~zoo268LL=wo0t#g7OdDN=DNG((XqZ{&KA)#LN^$^6&yb( z$9r%zHcoKb`Rd84ey)iwUN61A|JBR)lh00Ys$F27c4m5&w?4zu%A0={@bW)avlpIs ztSu^`gs0GVtyASEdz+!I>o5{R=X-CV!C2A*EfF77hQSxD))0FYgs8h?a}{T Xd@Qp*(%s zk|`mZUMbE{UcW?2N^0LLQb%F_Fp1 z$+_9Nxdpl9<>gI{O?^Fmv!>0OHFwss#mjErxb5NU(eX%59jJ$~B*-tA!Qt7BG$3c1 zr;B4qMVxA%A=e=T5r_Z0HZ2{|?PkSducZn-3SKEKSv>nKZ%=UHn=8r{Ecy$~1zK*E z{L$zz@w%8_bNR6^Kb!n{-g(cJ3!@y@2d~`rl=WU#=MD}250gBVqc*Dxnr*D#`6<5e zvgM;2Zw?&Y!?$MT0mFM7v%@cJZ19S55O3{J)}K5<)7PjcNi&qOzxUj=NV~mdKI;Vst00&5H(EtDd literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^5;3=*yF6VSLpZJ{CnO|@urM>S2?*@n%EfVwt;urJLcwFp z<{9fZS$nc6=g>#frl~Y;Vbvf0PBXgE7*>X5lt|fThlD(cc zQQb%F_Fp1 z$+_9Nxdpl9W#vtcO??ykW=)$lYwoONiHXN`fAQeEarde}m1q254P3T*;c-gFJvpl>!^1Y9o2I^%j3GxeOaCmkj z4angv@Q5sCVBi)4Va7{$>;3=*n>}3|LpZJ{CnO|@urM>S2?*@o%EfU_t;upz=F?+o z6OHwoEQ``Ky}Xtg%QsmX9dpz2&05I5aE@B4a;n8~&Vv(k$}W`!@y+FUSQ4SFsX5)r zQcgG8?4ZRWIlo)8@0?;*lo8KY72RASaXfYV=0d4CmlJbx*dG4T@YmMY*3M-q7KmeD Y$d6I4_j_^E8|WMcPgg&ebxsLQ07E`tasU7T diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 40130d584..b42f0e970 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -23,7 +23,7 @@ install_DATA = \ subt.png subt_gray.png timer.png video.png \ volume.png volumebody.png volumeslider2.png volumeslider2alpha.png \ volumeslider2blue.png volumeslider2green.png volumeslider2red.png \ - vtxt.png vtxt_gray.png \ + vtxt.png vtxt_gray.png upnp.png \ mp3.jpg mp3-0.jpg mp3-1.jpg mp3-2.jpg mp3-3.jpg mp3-4.jpg mp3-5.jpg mp3-6.jpg mp3-7.jpg \ radiomode.jpg scan.jpg shutdown.jpg start.jpg \ x_green.png x_white.png x_yellow.png \ diff --git a/data/icons/blau.png b/data/icons/blau.png index f606f554cd63cc3fa64d65b8bbbe4040296dfe3f..23a2c17fc6692235d8ea7f8cdf4c80af5952cb7f 100644 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=2BbG5JOL?5t}9dAEp* zZC6y-qpfk+$mp1h+m(=@J1I#|TAEsV`g-Qgo9E;1Bld8)Hc$^^NswPKgTu2MX+Tb? zr;B4qMV#%q`@Ag*JO>`;J>XE&J8-yHA_((tgHS%}Yp$=d1S;fA$G6OZ#o@!Z&_yd~+g=xsp@CUpgtU93$N zijD$S95!k{uBz9+sNI$K;YNAxgWhY!>=lx)Pp!W1xccHW@%^n~lC$T_Ca*KhmndA8 zad!vTqY}rE{|3{RZ#l*_&q*%zK+{B_R#9a^6OLJiLWk=%={(5mIb~$~Grxv0xg_M) Umy%;kfUaZkboFyt=akR{0OZ4Hpa1{> literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^5EG)Yz1hmhaku zX-;K6$Yjv|d+wyFg%v;94BD^0pBS_-rjnuM@h3meKo{9lJ0E@b2oyV&xV==cWJ;)h zLqU%|7Z=xIi}}1q?YQil3TFJ1J|%I=KB%F{j*IJ*wWHaBSQn>}tVGN$GelF{r5}E+{PImqP diff --git a/data/icons/gelb.png b/data/icons/gelb.png index f7761fb771c183bea744ef3aac3c092ed58a6bd6..bdb580c2b77586e44ea91bf9ec4655f64144a343 100644 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=2BbF**4;C1oX>I#qT~ zP&qhL=gdN#Ype9$>@xXt%A}>KWx|9BbLP!ivS^8qyU)`-rk+4Oj3q&S!3+-1ZlnP@ zWu7jMAr*19=c0LA4S3idSUE7AG;C=3yvcHb#R7{2AUwdNHKBpYf$`xccfIE&v4{R& z()YbBvS@xvbF!pmFq6NV%ZjiaCubP>r|;-GHOod;V%u6y+gW}EZGPt`NVeq|#_aga q+Ag`!K{=d%=}x0>{VH|$e=z4Zxh{8mn|}c40tQc4KbLh*2~7aTbzOJ> literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^5Li{H`3Tg@UJ~RN{2vS$ zq`aBkfI^%F9+AZi4BSE>%y{W;-5;P}v8Rh;2*>qg4{z@T2Ig&BOxm`X=)J$|upyOk z#^FyUCMI9zZe*TuSoYWd|JQdMmp&kK?ni&q|HpFv4Mi-{Po3`{v=CB%AQRVdhE;=o z4g0Ca8Eg*?9Nz>s6x_4rt!00HV=wcjM44o31?f|X@vLmD34DjR8I;Wf8WOAQn}F6c Nc)I$ztaD0e0s!m0XuSXc diff --git a/data/icons/gruen.png b/data/icons/gruen.png index 81ba7a582b37e6eca96a36eca8932d93cb70fb2e..29747163dfd29ac5af11a69e3c54447b82adc260 100644 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=1`Fb#@ZO**;^H_3O7S~q41?pie3GxeOaCmkj4ah0= zba4!+h_gMnk+ao-r{Q6P@DbK0mu_&q%KozVm|#n^!w$xrM{MoVJDRpCTQn)(urFZp zwfVT-j)}8TWB=&|f9`MnpsaiIq4ycvnY^#2*iMdQJ^UqM&fY~_lU)zkIcyi1U$C6p rpev$b`2&X|!2uS}*K9re`xxt%crAN|CF?za4q)(f^>bP0l+XkKEjC-0 literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^5pkA($Aiv=MFu<_s zjLvzWC})93WHAE+w-5+3UbEal|aXop4WpS0IM98^0Ck=|zzFHgH;CpsO zviU&!^8~-v!lAE^>?X9iZ)2(JSe_&$x)*r9_+)UmDXg7nWtDnm{ Hr-UW|a#v>V diff --git a/data/icons/help_small.png b/data/icons/help_small.png index 6e1533150ec60c45ff40e5b96e6844e9aa3caf3c..59be1d994cfdc5e56dcd842c69967fe4415830a2 100644 GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=5kBkugy*i3y1*X(>5r zIl0-ng++xWWhFILHBF68J$*fMrp=i*f8L#2cYNG^e9UWh0QE4I1o;IsI6S+N2INfi zba4!+h_gMnk+;b~q~YQA#)E==j5-Qau1}aFZE?s}`;E=2*DF`NcdO`CwrCQT5H?UV z(?51d;=l{;*7~ng?REAQ^H`v48=QU z{ri7^Z}oR3gZAal@c|#czhh3|TkXDh!Gb^U7&wkE{kUo2iF}RcU8kqIMQXI)zIN34 z!jtc89LIljE&kB^Kj2()w7aFcM*GXTAD@=X{o(=&I4Ab2X{f)SyYS9bJ`MG^cXyiz p^K-PXU%Ytfk;9J}XEc9cV#qO#P%o64^%v+g22WQ%mvv4FO#m@9fK&hg diff --git a/data/icons/power.png b/data/icons/power.png index 594a49a8765ca6c33f87aad3a07ff522c89e82c9..9520a99d531cb31dbaf04704e6e8fb64da753c64 100644 GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=5kBk#TWxS=m{|CB-$B zHI0pp{r&xO=FC~Pc-iKSoA+$nvuF37^JmZBxpl|O%`3qq;SEp^V@Z%-FoVOh8)-n! zJWm(Lkcv3pa~ruF17(hXyf1xXNzZqihELly(=C_g?c6@)Yv1xIcWf9=9dVLO2`>9C z=(DHcV8V{(V2BZPN3+ewAK{%P40X5~tq jIT{*pEosWn+!}^WH@#H$c_{`0UCQ9;>gTe~DWM4f!N7Y1 literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^5t;P?cqp@XjnrD{%M1@|MDIzh5oLQ= z5L3ISdb`&fHk~<3+spGWb+s4Fh{=z5|Bbh?XjPJ`)Ox+PqEpk`+T0|y9V}I|^LIu& oTb%LQZ7v=C-i)DGAdZ1yt#!nj^98ZhK!-7Sy85}Sb4q9e0Er-b4FCWD diff --git a/data/icons/rot.png b/data/icons/rot.png index c98751c40cc59faff6f6cfeff179944b5ab8448c..a835f45861181ca132c6a43a3be986fd6f048712 100644 GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFP2=EDU1=2BbF*#W|1tkSbSXfr^ z@~jgR+o7m%P~Y&3lgpK$kSAF=Eln*weLeH$>{hslB<%7^sJ_B*-tA!Qt7BG$5zS z)5S5QBF^^QS>D46Jgg74JG#GUWGqT(h`YnPK>A3Iz$V5mvrAg_CJJtH{I`Q?tilheCDjraJaOA9xBzH_mdKI;Vst0I()u&j0`b literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^5IouUY?%5o`RBsImI^YK)viGL4Lvi!GJ-^ zo7oL0#981GSV>#Rfm6TZ?I(#`` zk#Jc-rnbX&zQUZ<3l}aFPmsB{yZpV;0Sg`;aft+(wLte=zkXexsaPP6f#Gta-&E#H S(@TJ^VDNPHb6Mw<&;$VG@n!S? diff --git a/data/icons/upnp.png b/data/icons/upnp.png new file mode 100644 index 0000000000000000000000000000000000000000..94ee9d5bd05bc95d882258bcc6e29eb80dc2a217 GIT binary patch literal 1400 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAF%}28J29*~C-V}>VM%xNb!1@J z*w6hZkrl{SNcITwWnidMV_;}#VPNCQT+r|Bd`RUH||84-^~)qaiR7LZCcbEftuj7)pZtf`KW2Bm;)v z@9e6;IOi*ARs=V?AS2 zgLj+f1Jx|`ba4#P2yUIk$ah$Qhq;^c=l_1|T-Fs@$-diLA*nF-kZgg6 zO8}?f0)F{Z3>L2PA|}x;Vktt&-P;Xk=`KpaintBoxRel(ChanInfoX, BBarY, BoxEndX - ChanInfoX, InfoHeightY_Info, COL_INFOBAR_BUTTONS_BACKGROUND, ROUND_RADIUS, CORNER_BOTTOM); //round showSNR(); - frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_BLUE, ChanInfoX + 16*3 + asize * 3 + 6, + frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_BLUE, ChanInfoX + 16*3 + asize * 3 + 2*6, BBarY, InfoHeightY_Info); - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX + 16*4 + asize * 3 + 2*8, BBarFontY, ButtonWidth - (2 + NEUTRINO_ICON_BUTTON_BLUE_WIDTH + 2 + 2), g_Locale->getText(LOCALE_INFOVIEWER_STREAMINFO), COL_INFOBAR_BUTTONS, 0, true); // UTF-8 + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX + 16*4 + asize * 3 + 2*8, BBarFontY, ButtonWidth - (2 + NEUTRINO_ICON_BUTTON_BLUE_WIDTH + 4 + 2), g_Locale->getText(LOCALE_INFOVIEWER_STREAMINFO), COL_INFOBAR_BUTTONS, 0, true); // UTF-8 showButton_Audio (); showButton_SubServices (); @@ -1047,9 +1047,9 @@ void CInfoViewer::showButton_SubServices () { if (!(g_RemoteControl->subChannels.empty ())) { frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_YELLOW, - ChanInfoX + 6 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 2 + asize + 2 + NEUTRINO_ICON_BUTTON_GREEN_WIDTH + 2 + asize + 2, BBarY, InfoHeightY_Info); + ChanInfoX + 6 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4 + asize + 2 + NEUTRINO_ICON_BUTTON_GREEN_WIDTH + 4 + asize + 2, BBarY, InfoHeightY_Info); g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString( - ChanInfoX + 6 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 2 + asize + 2 + NEUTRINO_ICON_BUTTON_GREEN_WIDTH + 2 + asize + 2 + NEUTRINO_ICON_BUTTON_YELLOW_WIDTH + 2, + ChanInfoX + 6 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4 + asize + 2 + NEUTRINO_ICON_BUTTON_GREEN_WIDTH + 4 + asize + 2 + NEUTRINO_ICON_BUTTON_YELLOW_WIDTH + 4, BBarFontY, asize, g_Locale->getText((g_RemoteControl->are_subchannels) ? LOCALE_INFOVIEWER_SUBSERVICE : LOCALE_INFOVIEWER_SELECTTIME), COL_INFOBAR_BUTTONS, 0, true); // UTF-8 } } @@ -1375,7 +1375,7 @@ void CInfoViewer::show_Data (bool calledFromEvent) #endif if (info_CurrentNext.flags & CSectionsdClient::epgflags::has_anything) { frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_RED, ChanInfoX + 6, BBarY, InfoHeightY_Info); - g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX + (6 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 2), BBarFontY, asize, g_Locale->getText(LOCALE_INFOVIEWER_EVENTLIST), COL_INFOBAR_BUTTONS, 0, true); // UTF-8 + g_Font[SNeutrinoSettings::FONT_TYPE_INFOBAR_SMALL]->RenderString(ChanInfoX + (6 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4), BBarFontY, asize, g_Locale->getText(LOCALE_INFOVIEWER_EVENTLIST), COL_INFOBAR_BUTTONS, 0, true); // UTF-8 } } @@ -1509,12 +1509,12 @@ void CInfoViewer::showButton_Audio () // green, in case of several APIDs uint32_t count = g_RemoteControl->current_PIDs.APIDs.size (); frameBuffer->paintIcon(NEUTRINO_ICON_BUTTON_GREEN, - ChanInfoX + 6 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 2 + asize + 2, + ChanInfoX + 6 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4 + asize + 2, BBarY, InfoHeightY_Info); if (count > 0) { int selected = g_RemoteControl->current_PIDs.PIDs.selected_apid; - int sx = ChanInfoX + 6 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 2 + asize + 2 + NEUTRINO_ICON_BUTTON_GREEN_WIDTH + 2; + int sx = ChanInfoX + 6 + NEUTRINO_ICON_BUTTON_RED_WIDTH + 4 + asize + 2 + NEUTRINO_ICON_BUTTON_GREEN_WIDTH + 4; frameBuffer->paintBoxRel(sx, BBarY, asize, InfoHeightY_Info, COL_INFOBAR_BUTTONS_BACKGROUND); diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp index 9b9039e5e..ca8750095 100644 --- a/src/gui/moviebrowser.cpp +++ b/src/gui/moviebrowser.cpp @@ -1523,13 +1523,13 @@ void CMovieBrowser::refreshFoot(void) // draw yellow (sort) if (m_settings.gui != MB_GUI_LAST_PLAY && m_settings.gui != MB_GUI_LAST_RECORD) { - m_pcWindow->paintIcon(NEUTRINO_ICON_BUTTON_RED, m_cBoxFrame.iX+xpos1, m_cBoxFrame.iY+m_cBoxFrameFootRel.iY + (ADD_FOOT_HEIGHT>>1)); + m_pcWindow->paintIcon(NEUTRINO_ICON_BUTTON_RED, m_cBoxFrame.iX+xpos1, m_cBoxFrame.iY+m_cBoxFrameFootRel.iY + 4 + (ADD_FOOT_HEIGHT>>1)); m_pcFontFoot->RenderString(m_cBoxFrame.iX+xpos1 + 20, m_cBoxFrame.iY+m_cBoxFrameFootRel.iY + m_cBoxFrameFootRel.iHeight + 4 , width-30, sort_text.c_str(), (CFBWindow::color_t)color, 0, true); // UTF-8 } if (m_settings.gui != MB_GUI_LAST_PLAY && m_settings.gui != MB_GUI_LAST_RECORD) { - m_pcWindow->paintIcon(NEUTRINO_ICON_BUTTON_GREEN, m_cBoxFrame.iX+xpos1+width, m_cBoxFrame.iY+m_cBoxFrameFootRel.iY + (ADD_FOOT_HEIGHT>>1)); + m_pcWindow->paintIcon(NEUTRINO_ICON_BUTTON_GREEN, m_cBoxFrame.iX+xpos1+width, m_cBoxFrame.iY+m_cBoxFrameFootRel.iY + 4 + (ADD_FOOT_HEIGHT>>1)); m_pcFontFoot->RenderString(m_cBoxFrame.iX+ xpos1+width + 20, m_cBoxFrame.iY+m_cBoxFrameFootRel.iY + m_cBoxFrameFootRel.iHeight + 4 , width -30, filter_text.c_str(), (CFBWindow::color_t)color, 0, true); // UTF-8 } //std::string ok_text; diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index a9fe8fb49..50f19620e 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -126,10 +126,10 @@ /* icon widths */ -#define NEUTRINO_ICON_BUTTON_BLUE_WIDTH 24 -#define NEUTRINO_ICON_BUTTON_GREEN_WIDTH 24 -#define NEUTRINO_ICON_BUTTON_RED_WIDTH 24 -#define NEUTRINO_ICON_BUTTON_YELLOW_WIDTH 24 +#define NEUTRINO_ICON_BUTTON_BLUE_WIDTH 16 +#define NEUTRINO_ICON_BUTTON_GREEN_WIDTH 16 +#define NEUTRINO_ICON_BUTTON_RED_WIDTH 16 +#define NEUTRINO_ICON_BUTTON_YELLOW_WIDTH 16 /* misc */