From 8f0c99c27ff27c2e0f7b29621d56addf8d49a64c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 30 Dec 2020 23:08:55 +0100 Subject: [PATCH] infoviewer: rework tuner icons Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2aa3f86330a13d794195986b0cd3f454d3e069a8 Author: vanhofen Date: 2020-12-30 (Wed, 30 Dec 2020) Origin message was: ------------------ - infoviewer: rework tuner icons ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/icons/status/channel/Makefile.am | 35 ++++++++++++++++++++++--- data/icons/status/channel/tuner.png | Bin 0 -> 219 bytes data/icons/status/channel/tuner_01.png | Bin 0 -> 207 bytes data/icons/status/channel/tuner_02.png | Bin 0 -> 233 bytes data/icons/status/channel/tuner_03.png | Bin 0 -> 238 bytes data/icons/status/channel/tuner_04.png | Bin 0 -> 216 bytes data/icons/status/channel/tuner_05.png | Bin 0 -> 229 bytes data/icons/status/channel/tuner_06.png | Bin 0 -> 221 bytes data/icons/status/channel/tuner_07.png | Bin 0 -> 235 bytes data/icons/status/channel/tuner_08.png | Bin 0 -> 242 bytes data/icons/status/channel/tuner_09.png | Bin 0 -> 227 bytes data/icons/status/channel/tuner_1.png | Bin 145 -> 0 bytes data/icons/status/channel/tuner_10.png | Bin 0 -> 202 bytes data/icons/status/channel/tuner_11.png | Bin 0 -> 159 bytes data/icons/status/channel/tuner_12.png | Bin 0 -> 196 bytes data/icons/status/channel/tuner_13.png | Bin 0 -> 205 bytes data/icons/status/channel/tuner_14.png | Bin 0 -> 163 bytes data/icons/status/channel/tuner_15.png | Bin 0 -> 195 bytes data/icons/status/channel/tuner_16.png | Bin 0 -> 212 bytes data/icons/status/channel/tuner_17.png | Bin 0 -> 199 bytes data/icons/status/channel/tuner_18.png | Bin 0 -> 233 bytes data/icons/status/channel/tuner_19.png | Bin 0 -> 209 bytes data/icons/status/channel/tuner_2.png | Bin 146 -> 0 bytes data/icons/status/channel/tuner_20.png | Bin 0 -> 222 bytes data/icons/status/channel/tuner_21.png | Bin 0 -> 196 bytes data/icons/status/channel/tuner_22.png | Bin 0 -> 203 bytes data/icons/status/channel/tuner_23.png | Bin 0 -> 223 bytes data/icons/status/channel/tuner_24.png | Bin 0 -> 197 bytes data/icons/status/channel/tuner_3.png | Bin 146 -> 0 bytes data/icons/status/channel/tuner_4.png | Bin 182 -> 0 bytes src/gui/infoviewer_bb.cpp | 25 ++++++------------ src/gui/widget/icons.h | 5 +--- 32 files changed, 40 insertions(+), 25 deletions(-) create mode 100644 data/icons/status/channel/tuner.png create mode 100644 data/icons/status/channel/tuner_01.png create mode 100644 data/icons/status/channel/tuner_02.png create mode 100644 data/icons/status/channel/tuner_03.png create mode 100644 data/icons/status/channel/tuner_04.png create mode 100644 data/icons/status/channel/tuner_05.png create mode 100644 data/icons/status/channel/tuner_06.png create mode 100644 data/icons/status/channel/tuner_07.png create mode 100644 data/icons/status/channel/tuner_08.png create mode 100644 data/icons/status/channel/tuner_09.png delete mode 100644 data/icons/status/channel/tuner_1.png create mode 100644 data/icons/status/channel/tuner_10.png create mode 100644 data/icons/status/channel/tuner_11.png create mode 100644 data/icons/status/channel/tuner_12.png create mode 100644 data/icons/status/channel/tuner_13.png create mode 100644 data/icons/status/channel/tuner_14.png create mode 100644 data/icons/status/channel/tuner_15.png create mode 100644 data/icons/status/channel/tuner_16.png create mode 100644 data/icons/status/channel/tuner_17.png create mode 100644 data/icons/status/channel/tuner_18.png create mode 100644 data/icons/status/channel/tuner_19.png delete mode 100644 data/icons/status/channel/tuner_2.png create mode 100644 data/icons/status/channel/tuner_20.png create mode 100644 data/icons/status/channel/tuner_21.png create mode 100644 data/icons/status/channel/tuner_22.png create mode 100644 data/icons/status/channel/tuner_23.png create mode 100644 data/icons/status/channel/tuner_24.png delete mode 100644 data/icons/status/channel/tuner_3.png delete mode 100644 data/icons/status/channel/tuner_4.png diff --git a/data/icons/status/channel/Makefile.am b/data/icons/status/channel/Makefile.am index 94419ca0e..bbb3ee71f 100644 --- a/data/icons/status/channel/Makefile.am +++ b/data/icons/status/channel/Makefile.am @@ -31,9 +31,36 @@ install_DATA = \ res_uhd.png \ subt.png \ subt_gray.png \ - tuner_1.png \ - tuner_2.png \ - tuner_3.png \ - tuner_4.png \ vtxt.png \ vtxt_gray.png + +install_DATA += \ + tuner.png \ + tuner_01.png \ + tuner_02.png \ + tuner_03.png \ + tuner_04.png + +if ! BOXTYPE_CST +install_DATA += \ + tuner_05.png \ + tuner_06.png \ + tuner_07.png \ + tuner_08.png \ + tuner_09.png \ + tuner_10.png \ + tuner_11.png \ + tuner_12.png \ + tuner_13.png \ + tuner_14.png \ + tuner_15.png \ + tuner_16.png \ + tuner_17.png \ + tuner_18.png \ + tuner_19.png \ + tuner_20.png \ + tuner_21.png \ + tuner_22.png \ + tuner_23.png \ + tuner_24.png +endif diff --git a/data/icons/status/channel/tuner.png b/data/icons/status/channel/tuner.png new file mode 100644 index 0000000000000000000000000000000000000000..f6c69e0bad2b8dd5ffd247de2503867a4a93cc8b GIT binary patch literal 219 zcmV<103`p3P)EiB#x4hX=DazI4n@NI;fBDP|4#OB7Att((t!rS;~Vk=-Wg&scvtGSz9f9n{TKO5 VC_u?hIkNx&002ovPDHLkV1k=iTH*iz literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_01.png b/data/icons/status/channel/tuner_01.png new file mode 100644 index 0000000000000000000000000000000000000000..ac1dc140a3a64bb95f6d233624f63542461b398f GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^5dIMA2-++$L zW_f0IW)NU+wl6d*FfcH%U{YjeR%aG*__^d~Vny~3M&5F^w)aOeZ!m=Zn44%T$E(9r zU?9w~k#Ui$?6l{JMHd;~D5@yh?{U2fbRmPMtDnm{r-UW| D1kFaJ literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_02.png b/data/icons/status/channel/tuner_02.png new file mode 100644 index 0000000000000000000000000000000000000000..90eb80cf5eb2af1bdef858892eb9afdcb09e73ec GIT binary patch literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^5FDQTf`%mwvgU*DcAAjez hnqDfg44$rjF6*2UngAjJRE_`u literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_03.png b/data/icons/status/channel/tuner_03.png new file mode 100644 index 0000000000000000000000000000000000000000..279eebb79bc68d2095dc0c6b8028921a37cb2ec4 GIT binary patch literal 238 zcmV+Y3lAy41{A?dumJJqCB>uw@gnFg$1Ol?!x9`}Aqpacum*M!e5d&g z%bS5&(=PnZmPFyjHfDP}msjGbsKvC81Mw`$NaLpm8+sg$o;AR$*8I&dqX3{_juPbj zvjJ1UQNp`MbJ7k&U>L;#1D7;|A&WHVPLnhPV}?5g4gk^l(Ht5$y&J+2MRRDNqYLH_ o_{Z^isfeY*OKzKbpYTOjPesly26-1q>i_@%07*qoM6N<$f=ZBF<^TWy literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_04.png b/data/icons/status/channel/tuner_04.png new file mode 100644 index 0000000000000000000000000000000000000000..6392026d6f9711c2d682e7528989a47a3c6f845a GIT binary patch literal 216 zcmV;}04M*6P)98Gt<)fsf<@Op#Q8enjA1@!gzG z_idXvPdn>Tk;K+!b3OYDIs&Dbct4k@lwvRhKf_J>2@8i_UOD01%G44%@7EU3&iU_>u&)1d^P)1up3&{%IqXTpSMetG_K)iYBFd0C+2=?YN1GtAH_z3~@5*i>1Um?#e@c!`f zk!swAb7N5vq#3Hy>tUbhXz8RHKUehZSh0-dhMJipYYgya!U3K{pEnTYVA$vyOic3F zEICnnw8wMjpf}{3YW~vCEw<1d-WWUp5|bmy?}jM~g&T?V&Kevp-%#!jdP9&FEiFOn fX6P;pzUcl7O_V54`~CaV00000NkvXXu0mjfu~=S7 literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_06.png b/data/icons/status/channel/tuner_06.png new file mode 100644 index 0000000000000000000000000000000000000000..3a502878ca395f37109d24b5561c168704770252 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^5^(jY*N2In0jfg7U|||MZSJ=uAlZ@po>k>7^1&&PWp}hHgPa VcFP0T(}3<}@O1TaS?83{1OW9GPwoH! literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_07.png b/data/icons/status/channel/tuner_07.png new file mode 100644 index 0000000000000000000000000000000000000000..840f32dd01eac8f1fd77f5671343b91351672cc8 GIT binary patch literal 235 zcmeAS@N?(olHy`uVBq!ia0vp^5AQx{8adh;P(#6 zBY8Z2NKCWv`y@k!cS&uwk4tt(M^5QX(;v~ZBw`vr1va$Upq91tBnc- s1%dFAe>^_#aH z4g9^7m6L%e@cTP!BxAw1)11#3hyzj#rr#M$|F2;n9)vJ3F^~o*(vZoponb!^Zf8hG z=VRC4$H2h=0vrtf=zQ!NK+=vt$iTpf&ZpQ9*uf7529O_!*RX-%I|C+QVZaGy0wD=kloAyHSIf^$=}iZfad1!4C@)-0E5qh;bu5+q#!L(q~Z5>DF$MJ6vOZDEUb~H d%Sp(h(Ez-cE>=K6@k#&y002ovPDHLkV1j6HUGD$@ literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_1.png b/data/icons/status/channel/tuner_1.png deleted file mode 100644 index 14d8b838c2a19cda7d6d54cf530ee92d7aa28c25..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^57j!lL(f4o1=jDvkgE diff --git a/data/icons/status/channel/tuner_10.png b/data/icons/status/channel/tuner_10.png new file mode 100644 index 0000000000000000000000000000000000000000..56a628f58b9f2fb833861f3399ddb76e3d5b720d GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^55eUm}Ls=)KAt)SW4A7JZ^1#Xk92}W>AyPz|{7h=e6X6hQ?M#W(y;S z13n5e0{;L1=^b^@nUM73@7z|?OC^?^ktR|MkrP!EUv6Vt)78&qol`;+05ncS A#{d8T literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_11.png b/data/icons/status/channel/tuner_11.png new file mode 100644 index 0000000000000000000000000000000000000000..b9771b1c573f2a1e80fcf63946a5f4c2b76244c2 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^5G+WF6i=d#6mD+^F&4 zw{^Bk^1G+WF6i=d#6mD+^F&4 zw{^Bk^18|pPzm1p2*mGlJ z^FjITynQFO9msvUmGhD*JMj-6gm9I(_Q5oe;Y54vFFCd z=7aLHd1t6uAIg2Ia+UvoK+XZ~Z_QKZtDa?ZV^dSgarih{v9nI$THD`(Yvq@6ew^DN zx1YC9!{lUUXA$rI{oaNG+)E_t>eCZ@O=A6=#Cq8nwx}yLY_KxF0dyaOr>mdKI;Vst E0P%oJNB{r; literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_14.png b/data/icons/status/channel/tuner_14.png new file mode 100644 index 0000000000000000000000000000000000000000..60e22877a2c32aaf46a3bee9b6788ff31e2089a4 GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^5G+WF6i=d#6mD+^F&4 zw{^Bk^1G+WF6i=d#6mD+^F&4 zw{^Bk^18>HoCZoBXar?;? z4X@_iJHKImqP4SCrdff(kHtS2)eBl~AM%W}dBE~pGU0)BrddsTME`v@_mEkiDij0_ u{{GWD>Yy_r>Brx>t)`bsEIA`hq!{iB$<4hVv858|Dh5wiKbLh*2~7ZHAxXdh literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_16.png b/data/icons/status/channel/tuner_16.png new file mode 100644 index 0000000000000000000000000000000000000000..8d591496f44943e3798e99eee7e4368b70edb3d2 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^5G+WF6i=d#6mD+^F&4 zw{^Bk^1CPg3s-3B8?voP_ zIue>6+6MhyaOA*&g8mBL;)5YZ7o`NADVqpn+Bq?A1Tpe~jE~QhlcX3WWCAmT9yb>8 u?%(fiD8Ri$qOLwYvDYNl&q=J8jp5aQdBq69uZ%#KF?hQAxvXczP1# z-=rI;Tw~jz^vL8-!!d5=!{v`mavHS$oZBF`UjBihp)iLbgRRj0_wR#vjxcGq-M=3h hq3k<-@&wn#j9==t#Uc-Wxd3!KgQu&X%Q~loCIC;RRR{n8 literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_19.png b/data/icons/status/channel/tuner_19.png new file mode 100644 index 0000000000000000000000000000000000000000..d496e44f69d86ac6ac97a774c474a6f3ffc3cda8 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^5>$+ER6sF diff --git a/data/icons/status/channel/tuner_20.png b/data/icons/status/channel/tuner_20.png new file mode 100644 index 0000000000000000000000000000000000000000..d16627f723003ba8d8f970093ec96a8add49d2d6 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^5`VT|X)Gs@peB&SP^Gf({{5vA9jrk-`}c3&;5JK7U9sDZnc?jR Wt>@w!Q*Hwt%;4$j=d#Wzp$P!W&rZPr literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_21.png b/data/icons/status/channel/tuner_21.png new file mode 100644 index 0000000000000000000000000000000000000000..8820a34beab7dfe33de348c9b61c60e7d80820d5 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^5G+WF6i=d#6mD+^F&4 zw{^Bk^1U7n--6Hb&*Z7&k>OGJFn33QlSVvHO5thWmTvYh1H z4g9^7m6L%e@cTP!BxAw1)11#3hyzj#rr#M$|F2;n9)vJ3F^~pG*T90{?1$1n7&b7> zMCaqPfrG&xosZoHN4QO#SoxIuA(O$6fr9}AzN7Q8+klW>kIu(#0|&z0SooCs0X;4p z(fO3yfbL#&KJhkCuHpB0DF$MJ6vOZDEUb~H%Sp(h(E#*5CcM_dgL41?002ovPDHLk FV1gsZR;vI2 literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_23.png b/data/icons/status/channel/tuner_23.png new file mode 100644 index 0000000000000000000000000000000000000000..453cf021b094e74b506971c32fb36856cfe24a47 GIT binary patch literal 223 zcmV<503iQ~P)H z4g9^7m6L%e@cTP!BxAw1)11#3hyzj#rr#M$|F2;n9)vJ3F^~pG*T90{?1$1n7&b7> zMCaqPfrG&xosZoHN4QO#=zLQB@DIBUnGAjm9AM6O6o36=IE&o|g!1($7BDg}VYh(; z;SUsl?Po9~(GS>dK)4xUG7Nkt$p(aG+WF6i=d#6mD+^F&4 zw{^Bk^1&t@7*HI8y&hHelHih=5hI{O3K9y21_+%lNF6tYk}@!@O1TaS?83{1OQ1ZOs@a{ literal 0 HcmV?d00001 diff --git a/data/icons/status/channel/tuner_3.png b/data/icons/status/channel/tuner_3.png deleted file mode 100644 index 63e9f86fc11416d8106e932c70ed73309009f49a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 146 zcmeAS@N?(olHy`uVBq!ia0vp^5>v28?3}4Qkn8U0;uum9mn^{5%FN0pnru;!#Nk%p z^RZZG*4gf}-5ZM?CU8i0Cl#|C-=oXC@XVUMN|NUc&t(|96*Sa15Xk((v+KbfJQQSy85}Sb4q9e0Ej0&&Hw-a diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 67c6ee4bc..be1fa0e9b 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -210,7 +210,7 @@ void CInfoViewerBB::getBBIconInfo() break; case CInfoViewerBB::ICON_TUNER: if (CFEManager::getInstance()->getEnabledCount() > 1 && g_settings.infobar_show_tuner == 1 && !isTSMode && !IS_WEBCHAN(g_InfoViewer->get_current_channel_id())) - iconView = checkBBIcon(NEUTRINO_ICON_TUNER_1, &w, &h); + iconView = checkBBIcon(NEUTRINO_ICON_TUNER, &w, &h); break; default: break; @@ -695,22 +695,13 @@ void CInfoViewerBB::showIcon_Tuner() return; } - std::string icon_name; - switch (CFEManager::getInstance()->getLiveFE()->getNumber()) { - case 1: - icon_name = NEUTRINO_ICON_TUNER_2; - break; - case 2: - icon_name = NEUTRINO_ICON_TUNER_3; - break; - case 3: - icon_name = NEUTRINO_ICON_TUNER_4; - break; - case 0: - default: - icon_name = NEUTRINO_ICON_TUNER_1; - break; - } + char icon_name[12]; + snprintf(icon_name, sizeof(icon_name), "%s_%02d", NEUTRINO_ICON_TUNER, CFEManager::getInstance()->getLiveFE()->getNumber() + 1); + + int w = 0, h = 0; + if (!checkBBIcon(icon_name, &w, &h)) + snprintf(icon_name, sizeof(icon_name), "%s", NEUTRINO_ICON_TUNER); + showBBIcons(CInfoViewerBB::ICON_TUNER, icon_name); } diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 1b8425352..b2233ce7a 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -275,10 +275,7 @@ #define NEUTRINO_ICON_SCRAMBLED2_GREY "ca2_gray" #define NEUTRINO_ICON_SUBT "subt" #define NEUTRINO_ICON_SUBT_GREY "subt_gray" -#define NEUTRINO_ICON_TUNER_1 "tuner_1" -#define NEUTRINO_ICON_TUNER_2 "tuner_2" -#define NEUTRINO_ICON_TUNER_3 "tuner_3" -#define NEUTRINO_ICON_TUNER_4 "tuner_4" +#define NEUTRINO_ICON_TUNER "tuner" #define NEUTRINO_ICON_VTXT "vtxt" #define NEUTRINO_ICON_VTXT_GREY "vtxt_gray"