From cfd4f49ec14f7c72f0df79d172956a4ecbea68e8 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 15 Dec 2017 17:52:30 +0100 Subject: [PATCH 01/11] CTestMenu: add example for variable caption inside message buttons Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8b1b72267a88c6e5ba8b4725164a3c05ba7838a6 Author: Thilo Graf Date: 2017-12-15 (Fri, 15 Dec 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/test_menu.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/gui/test_menu.cpp b/src/gui/test_menu.cpp index 4d1e6fb5b..6229825f6 100644 --- a/src/gui/test_menu.cpp +++ b/src/gui/test_menu.cpp @@ -975,6 +975,22 @@ int CTestMenu::exec(CMenuTarget* parent, const std::string &actionKey) DisplayInfoMessage("Info Test!"); return menu_return::RETURN_REPAINT; } + else if (actionKey == "msgbox_alt_btn"){ + CMsgBox msgBox("Variable buttontext...", "Msgbox Test"); + msgBox.setShowedButtons(CMsgBox::mbNo | CMsgBox::mbYes); + msgBox.setButtonText(CMsgBox::mbNo, "Left Button"); + msgBox.setButtonText(CMsgBox::mbYes, "Right Button"); + msgBox.paint(); + res = msgBox.exec(); + msgBox.hide(); + + std::string msg_txt = "Return value of MsgBox test is "; + msg_txt += to_string(msgBox.getResult()); + + ShowHint("MsgBox test returns", msg_txt.c_str(), 700, 10, NULL, NULL, CComponentsHeader::CC_BTN_EXIT); + + return res; + } else if (actionKey == "footer_key"){ CHintBox hintBox(LOCALE_MESSAGEBOX_INFO, "Footer-Key pressed. Press EXIT to return", 350, NULL, NULL, CComponentsHeader::CC_BTN_EXIT); hintBox.setTimeOut(15); @@ -1229,6 +1245,7 @@ void CTestMenu::showMsgTests(CMenuWidget *widget) { widget->addIntroItems(); widget->addItem(new CMenuForwarder("HintBox test!", true, NULL, this, "hintbox_test")); + widget->addItem(new CMenuForwarder("Other buttontext", true, NULL, this, "msgbox_alt_btn")); widget->addItem(new CMenuSeparator(CMenuSeparator::STRING | CMenuSeparator::LINE, "MsgBox")); widget->addItem(new CMenuForwarder("cancel on timeout", true, NULL, this, "msgbox_test_cancel_timeout")); widget->addItem(new CMenuForwarder("yes no", true, NULL, this, "msgbox_test_yes_no")); From e18a7854b8e35f15bd874e6e95effa82c01b6453 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 15 Dec 2017 18:01:03 +0100 Subject: [PATCH 02/11] CComponentsFooter: fix force re init of button container clear() removes only items and their instances inside button container, but all other properties (e.g. width) are not touched. Re init should avoids this. Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/39fb9f47f4c55e4165df685944048feb22eed2d1 Author: Thilo Graf Date: 2017-12-15 (Fri, 15 Dec 2017) ------------------ This commit was generated by Migit --- src/gui/components/cc_frm_footer.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gui/components/cc_frm_footer.cpp b/src/gui/components/cc_frm_footer.cpp index 00cdf49df..88e8589a2 100644 --- a/src/gui/components/cc_frm_footer.cpp +++ b/src/gui/components/cc_frm_footer.cpp @@ -107,8 +107,10 @@ void CComponentsFooter::initVarFooter( const int& x_pos, const int& y_pos, const void CComponentsFooter::setButtonLabels(const struct button_label_cc * const content, const size_t& label_count, const int& chain_width, const int& label_width) { /* clean up before init */ - if (btn_container) - btn_container->clear(); + if (btn_container){ + removeCCItem(btn_container); + btn_container = NULL; + } if (label_count == 0) return; From 06b63f5e018dd16e47569304dff1199b81ce5933 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Mon, 11 Dec 2017 21:00:17 +0100 Subject: [PATCH 03/11] update cryptsystems Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/ac696e9ba32c16cf3dc8c33dc0f18046617ef9f3 Author: TangoCash Date: 2017-12-11 (Mon, 11 Dec 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoviewer_bb.cpp | 15 ++++++++++----- src/gui/streaminfo1.cpp | 7 +++++-- src/gui/streaminfo2.cpp | 7 +++++-- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index cc52f1f95..6e615f191 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -717,10 +717,12 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o int py = g_InfoViewer->BoxEndY + OFFSET_INNER_SMALL; int px = 0; static std::map > icon_map; - const int icon_space = OFFSET_INNER_SMALL, icon_number = 10; - static int icon_offset[icon_number] = {0,0,0,0,0,0,0,0,0,0}; - static int icon_sizeW [icon_number] = {0,0,0,0,0,0,0,0,0,0}; + const int icon_space = OFFSET_INNER_SMALL, icon_number = 11; + + static int icon_offset[icon_number] = {0,0,0,0,0,0,0,0,0,0,0}; + static int icon_sizeW [icon_number] = {0,0,0,0,0,0,0,0,0,0,0}; + static bool init_flag = false; if (!init_flag) { @@ -737,7 +739,8 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o icon_map[0x1800] = std::make_pair(index++,"nagra"); icon_map[0x0B00] = std::make_pair(index++,"conax"); icon_map[0x0D00] = std::make_pair(index++,"cw"); - icon_map[0x0900] = std::make_pair(index ,"nds"); + icon_map[0x0900] = std::make_pair(index++,"nds"); + icon_map[0x1000] = std::make_pair(index ,"tan"); for (it=icon_map.begin(); it!=icon_map.end(); ++it) { snprintf(buf, sizeof(buf), "%s_%s", (*it).second.second, icon); @@ -785,7 +788,9 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) return; } - int caids[] = { 0x900, 0xD00, 0xB00, 0x1800, 0x0500, 0x0100, 0x600, 0x2600, 0x4a00, 0x0E00 }; + + int caids[] = { 0x1000, 0x900, 0xD00, 0xB00, 0x1800, 0x0500, 0x0100, 0x600, 0x2600, 0x4a00, 0x0E00}; +// const char *green = "green"; // unused const char *white = "white"; const char *yellow = "yellow"; int icon_space_offset = 0; diff --git a/src/gui/streaminfo1.cpp b/src/gui/streaminfo1.cpp index 494cbe8b9..fcb6b5445 100644 --- a/src/gui/streaminfo1.cpp +++ b/src/gui/streaminfo1.cpp @@ -876,7 +876,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) } } -#define NUM_CAIDS 11 +#define NUM_CAIDS 12 void CStreamInfo2::paintCASystem(int xpos, int ypos) { unsigned short i; @@ -884,7 +884,7 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) if (box_h2 > ypos+(iheight*2)) frameBuffer->paintBox(0, ypos+(iheight*2), box_width, box_h2, COL_MENUCONTENT_PLUS_0); - std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"}; + std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","Biss:","DreCrypt:","PowerVU:","Tandberg:"}; bool caids[NUM_CAIDS]; int array[NUM_CAIDS]; char tmp[100]; @@ -936,6 +936,9 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) case 0x0E: idx = 10; break; + case 0x10: + idx = 11; + break; default: break; } diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index 0e666d11a..4eaa78b09 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -1190,7 +1190,7 @@ void CStreamInfo2::paint_techinfo(int xpos, int ypos) paintCASystem(xpos, ypos); } -#define NUM_CAIDS 11 +#define NUM_CAIDS 12 void CStreamInfo2::paintCASystem(int xpos, int ypos) { int ypos1 = ypos; @@ -1198,7 +1198,7 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) if (box_h2 > 0) frameBuffer->paintBoxRel (0, ypos, box_width, box_h2, COL_MENUCONTENT_PLUS_0); - std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","EBU:","XCrypt:","PowerVU:"}; + std::string casys[NUM_CAIDS]={"Irdeto:","Betacrypt:","Seca:","Viaccess:","Nagra:","Conax: ","Cryptoworks:","Videoguard:","Biss:","DreCrypt:","PowerVU:","Tandberg:"}; bool caids[NUM_CAIDS]; int array[NUM_CAIDS]; char tmp[100]; @@ -1268,6 +1268,9 @@ void CStreamInfo2::paintCASystem(int xpos, int ypos) case 0x0E: idx = 10; break; + case 0x10: + idx = 11; + break; default: break; } From fecfef61c303d59467a2e61dbc9d6c8d9a374679 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Tue, 12 Dec 2017 21:37:55 +0100 Subject: [PATCH 04/11] data: update crypt icons thx OneOfNine Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/3a2f289ad92321aa4fcd13cc9c5b98a854d599f9 Author: Thilo Graf Date: 2017-12-12 (Tue, 12 Dec 2017) ------------------ This commit was generated by Migit --- data/icons/status/ca/Makefile.am | 3 +++ data/icons/status/ca/biss_green.png | Bin 506 -> 1120 bytes data/icons/status/ca/biss_white.png | Bin 650 -> 1008 bytes data/icons/status/ca/biss_yellow.png | Bin 592 -> 1128 bytes data/icons/status/ca/conax_green.png | Bin 508 -> 993 bytes data/icons/status/ca/conax_white.png | Bin 652 -> 912 bytes data/icons/status/ca/conax_yellow.png | Bin 590 -> 1005 bytes data/icons/status/ca/cw_green.png | Bin 816 -> 851 bytes data/icons/status/ca/cw_white.png | Bin 1057 -> 797 bytes data/icons/status/ca/cw_yellow.png | Bin 1004 -> 857 bytes data/icons/status/ca/d_green.png | Bin 526 -> 953 bytes data/icons/status/ca/d_white.png | Bin 675 -> 878 bytes data/icons/status/ca/d_yellow.png | Bin 604 -> 962 bytes data/icons/status/ca/ird_green.png | Bin 468 -> 868 bytes data/icons/status/ca/ird_white.png | Bin 592 -> 808 bytes data/icons/status/ca/ird_yellow.png | Bin 548 -> 874 bytes data/icons/status/ca/nagra_green.png | Bin 537 -> 974 bytes data/icons/status/ca/nagra_white.png | Bin 668 -> 896 bytes data/icons/status/ca/nagra_yellow.png | Bin 609 -> 978 bytes data/icons/status/ca/nds_green.png | Bin 954 -> 996 bytes data/icons/status/ca/nds_white.png | Bin 1176 -> 925 bytes data/icons/status/ca/nds_yellow.png | Bin 1126 -> 1010 bytes data/icons/status/ca/powervu_green.png | Bin 493 -> 928 bytes data/icons/status/ca/powervu_white.png | Bin 640 -> 853 bytes data/icons/status/ca/powervu_yellow.png | Bin 576 -> 932 bytes data/icons/status/ca/seca_green.png | Bin 509 -> 914 bytes data/icons/status/ca/seca_white.png | Bin 667 -> 852 bytes data/icons/status/ca/seca_yellow.png | Bin 605 -> 919 bytes data/icons/status/ca/tan_green.png | Bin 0 -> 887 bytes data/icons/status/ca/tan_white.png | Bin 0 -> 833 bytes data/icons/status/ca/tan_yellow.png | Bin 0 -> 889 bytes data/icons/status/ca/via_green.png | Bin 525 -> 848 bytes data/icons/status/ca/via_white.png | Bin 653 -> 795 bytes data/icons/status/ca/via_yellow.png | Bin 593 -> 855 bytes data/icons/status/ca/x_green.png | Bin 526 -> 617 bytes data/icons/status/ca/x_white.png | Bin 658 -> 558 bytes data/icons/status/ca/x_yellow.png | Bin 602 -> 619 bytes 37 files changed, 3 insertions(+) create mode 100644 data/icons/status/ca/tan_green.png create mode 100644 data/icons/status/ca/tan_white.png create mode 100644 data/icons/status/ca/tan_yellow.png diff --git a/data/icons/status/ca/Makefile.am b/data/icons/status/ca/Makefile.am index 2da5da09e..8378a40b7 100644 --- a/data/icons/status/ca/Makefile.am +++ b/data/icons/status/ca/Makefile.am @@ -28,6 +28,9 @@ install_DATA = \ seca_green.png \ seca_white.png \ seca_yellow.png \ + tan_green.png \ + tan_white.png \ + tan_yellow.png \ via_green.png \ via_white.png \ via_yellow.png \ diff --git a/data/icons/status/ca/biss_green.png b/data/icons/status/ca/biss_green.png index de13f2a1eed5c3897ed96d5dc97a2200b8e51258..828d0db23aa150006b1d30eb1beebd9430d42b12 100644 GIT binary patch delta 1085 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 diff --git a/data/icons/status/ca/conax_yellow.png b/data/icons/status/ca/conax_yellow.png index 19bddec5f234e85f4777200668f9a6cf7967a6ba..a039b78e41faf5035301e0e33210ea33493d5e9a 100644 GIT binary patch delta 969 zcmV;)12+851nmbQiBL{Q4GJ0x0000DNk~Le0000e0000I2nGNE04X1wrja2ue*=O^ zL_t(YOU;#ANK`=>$A?HPxAL}?8mp_W8k*&5n{0U{7NIgVAuKORwP0(ynHFtP4lZ8N zBf3&~30YATH&D=B=^+Sw@=2fc$)|b|AB2$XZJL>FzMb{*z6(Fj%>VoU=X~d!opTWT z?d~o{{r&5CvA5^Ofxw?Xi*NS!f0nfWo12aL{rf8kM0R#&GtkzS^Ue151PM%>82$YD z3IF=_ne1n5td0~Eq!FDiiqIQPGBe{zb#)&3@dNYv3QI%n@s7De{XCo0$pf& zeH>^51JztxSZF4}!N<9lntFk(ulIo8OCLrX8+J?~g4Wi%uuww6Su!;AkT{)>NnhW6 zKEHM?p8GmF?txD*GE&29_4S3IiFMuXMrcN@K1J5nTFI3w8t~1{S->lS(dw!VudUf= zz>8X~;sLgp$72DVv9j`tfAsg4^Ko0-ZCG5KI3?vguhrG%KuyleI`fKgWu?K-Ct$sy zl@%+d(34wfLuLr&=O=RQDBiy}f!AWW0b`~=eVPq(IkUX{oM^S-P-8?#pW(XflfY6c>6XVye?M-NlJ?3kdCQHD!T!e7uNjMq@N+0y%59Uk6>K3W9NMZJM7? zzG_IFD zi-+k?p6Iw%Q7sxc5&37@eu_567@Pqs rK6-@O+fP(8_j1(VV*2{00000NkvXXu0mjfc#_kb delta 550 zcmV+>0@?lT2hIc`iBL{Q4GJ0x0000DNk~Le0000I0000J2nGNE0G*Ou@{u7le*xo3 zL_t(IPo>n$D+Ev!2Jr6>u<|HdI~zNHgSE1o%|uhAn7npY7PC+qq7)G!<83s9@fh!S zo)J+*qtp~-Vf*R2Zs!=oW)`Pzx9;zp`*pjhukj}8{61zeMMZ+ROx(2$e{ymHUR)?h zBb}WBm6uy29{-t%My{?DLL zxgd9U3UWv!0xm3o+1VD#%ChgrAcuz*X>PW-LmnO!G&?KE(h}IxB2(q$fL6shgoD&4Yd^?pMNp}Wo_}NLjV8(07*qoM6N<$f*s`b%K!iX diff --git a/data/icons/status/ca/cw_green.png b/data/icons/status/ca/cw_green.png index e1d73cfaf1ae79eefda35f91f73bdfa9583a5fcf..df4ab4f4198252fd9b33b62aac4ee8209768ea73 100644 GIT binary patch delta 813 zcmV+|1JeAk2Ga&1iBL{Q4GJ0x0000DNk~Le0000Y0000I2nGNE06skoZ;>H2f9Od> zK~zXf#gbo0(@_-1FFL2&n#O)xDmeYca2u|TxhXVZXo^fjs`;nPLDWEqz!nkdNaTW) zAvp;p1&Npl)f6I_`Vt?-Ccse z>|wTU=hx1y?W1k_Kgs^gPVFA;f68o#%weW(>&F(9lFavvpQOK~r`8YFp_HT#(v+-x zS)r?6SD_I4mO|)a2%I4&C>IBkU4pjrZ7{Jh!Sen-Kg)T#JQ^R@k){15q4QptSJxvr z16kN#psD>7s2QFe23@6&4NwfM@%DPfe)`=s(=e**5?cwT&wrX18v6J-e;k~F%zmDw z3c#7%n-oJ}?7iI!@pPQwJ)1im>-v-ZqWReJ7}EwH3pBj!uVWUj$0V_r|FLaLV=N%w(=J3+-<>`*ROje@qXf zo1<)v1g-_d8gO57ldQqAjjl84G`<2T z2|o|h@QX00G07&;K!02hH7zw@ZZ-=|U0d6kzd^(|<70Z@Vg8*UQoE$_X;5Y$!E}%Y z*Mp$Ozv>4mENL2Xe=Mghnp$~W7P+#DGH89;Dstt<+`~ugF}ud6L79QL)?C!R=7wUp zp17d#PNSgtaq}NFsPTMLvPqMZXXJl+IXDBcFWG71vQk_^a0X&qwE3+mE0hxHk#s@% r`v|GJUo~o&Gtg3CoHJe}gpl8Rz0@(-F=$f&0000gZ{|Wpwk$WYYD8Uqs2Ek23%UqXLtU7T znV5~an2&{6jHOtPl~|3nSceVRe}paAh8@_2J=li>ID{iOisLwmQ#cdyN&HJ-1_QG& z2lKE1i?9UCumY>F2E_vJ#BS`xejLPMRO1*gbu4 zP`R}{7Dxs_<*ssLdXK>27Vh{2e3Pk+_JYcr>~8gfmD`@v_*i!@t)X)FjrW?&P29#^ z-1iCi?(PNqh{lU`_cYjZf9i?e@mgzbJM^3y)85hlY!ccLHm>GV z;3s&77d`>MrzgT*>H~k6Xc;oFJ*{nJ&q^Dp$;P-bX$u!Pyuurwe?amG?E-tb8-`#Y znm}u8hlv`}2O0)7nG*HmL-8Ch@fvUO&L`m4Sxu%TQDFZOqpG;Wq_EziZLD=xleLIr zqO%~*I^^&kAAJJF&TgHKD!FE+aw{>8P=A=@d&jo1wi(@>FSjP7#@0K!kFyRR@Cjdh z0>#d5on-FpF3kEmUlM!TcXwL33xPl5E57>#O8jE|S8g9Tv8U6T%$M5-4nOeACy@Nb zQed04FLyjbQv;WpHRTT9P=lZNjXyDgOt!pM7xf`iSzh}WMdkMhxUADR00000NkvXX Hu0mjfkJ4-q diff --git a/data/icons/status/ca/cw_white.png b/data/icons/status/ca/cw_white.png index 6fac2677c8c3d8b18df9a57fe94dc36e77d5d3f7..3dd7e51edf747661d604a927bdfa9032d296a580 100644 GIT binary patch delta 759 zcmVH1e*&^e zL_t(YOU0EjNUBj3$L~;PDVRfHIQR;o#G(c%5EMZK3loi^w-m1-YDf))s6o4n=%|B> zE-j5k5Rq#wPC;9vIEtf1<9YX7-aXv!!}rFg@Z;Y5Kj(k%x%d0NE5qOC=cj8h7@U87 zeewT^SoiY#`}>D1qSx!W`u#qPe-cr{8tZgAm)&j`Mhs^kA0J!*W}cp&Ae~Ob`uaME zg9EqQ4O?4V&}cMdJQ|J4SSS=S_>_*kzrT~N=EAt1{|C|ajs0eINPEMd!f2&DwH>hJ? zCX=DbOQn+3a05z1Fb8$?nl&A)fjvJz^H!?`idZaWFzGR*SS-r6UawOg9y@Bf7YPP~ zQa?I6A`N|NE(O-W?(XjR{rx>C=I7_hr0c_&o}QL@%gf7hJUcrp$2OadTGTf-HVk7k zSOdGgz2yQ>jE|2?)6C2ae`$Xs91hFesi`TbR;#j)?Ck7NA9ajlKM)8Eokze~v)SYV zP&gb8X+pEE4?{ol&CN~O;zsbDP>XMGZ&S|x{{GN;1e^&IS1%*t^ZCeleSJ;3qEe|) zALA-_a&l6(UawciR#sLFI&yJwL0%J_mCI!=07WX5BIClsf?Q0+f3n#u%+1Zw7;!qC zl#k$-g?b{9Fz8mR)!;M1S)owi0?=`}Tr`2*ZU>LYBQG?i>A9<`tE3}`hlf%>K0Y?+ zi;If}p9#+L`8*eZ&e_=+`2BvvM2e-QB|~mJ9;evY*cjw;If_k8Oi&CjGTmo_GjU<@ z)6-KJ2JR}EOcMBVO`3C1Q*pdc^w{q1?mxW>tbrXI9B@3&QGzwFy}i9PtbCM+dnY9x pA7kP<{}lHC9|htc{TE}5{RV28eg1|{Q5*mO002ovPDHLkV1kTFVsQWf delta 1021 zcmVkU;;tRx=}$efubS^3g(=%j@dEioO8}O=N$1D-QRGx=W+Vc z^YxuK%G=#V@pbo9cbz(QszzrpRQ_sfslwl|_9p!=9T$m-iAYXPMrvv*($mwCnVE^~ z>}=%b<|02oABBa5C@wBWX=y3Sf6L2JSy>6aUXSYPYSh-&qQ1T!jg5_HYHC7DOAFfC z+R)L_fv&DD^z`(gudfdS0|OWu8p6oP2*$?7FflP9KnMUSDJe)xOG8FR2C}lUkdu>x zyu3UV6cnJSs0bw`B`7N^Lq$c!w}G3Ro6*|ZiuU$)bar;4ySp2`y}jt~fA7cO;2?&F zhcP-jit+JrOioT>dU{#|pa%Xa>#C|M)YR0VuC5LZ4Gl0D3}yrWl=alq6lP{-FgG`+ z0We2*LP7#uTwGvjX$hT9C%&GZo=8ec5f969BYR(v#v|CtMh`q0`uaRzBTU(JwqCBLV^^S;$5LuIMH#axo-&AR2v1H^nW_SP}+a zTU*1%#)bw!6DeR|4!X3m-M4ZgMxy@+S}XPcuui7IXQ`SSXh|IdTVP7J3Bkr z+uPFssOn}-2`};UNJk$WF zJslDfV!T8K)WD`af9>bzC;X%yXl%8BfB>;(*U0nbA0Mil5o|Tt4$k z;NajthKZ~d^fu(PEsBd6C>zmCvb$S!-V%_ zr!ae}n{;yuQagN;)XS`IZ*Osbe~-t+37t-{0~1 r`H8QuuYUnF8}z@q_#4*Vr2qX7o#z&R>cYsi00000NkvXXu0mjfbPMdB diff --git a/data/icons/status/ca/cw_yellow.png b/data/icons/status/ca/cw_yellow.png index 2879b11ec1ee7332ee03726b1d30ce8098b04c06..24fca4bcbb6b036a3b8f415266b5637270a93269 100644 GIT binary patch delta 820 zcmV-41IzsE2iXQ8iBL{Q4GJ0x0000DNk~Le0000Y0000I2nGNE06skoZ;>H1e**4F zL_t(YOU0B+NLxV^hKE*TO-w6^+6aw}h*8vr)KoBq5N#136s>*uXrNR<5TRN`ticin z#0Nza#9)OW5)phv5JBxqP_lBRD_v!!8*w3s7}-xCvbTpxON*V@?PfwB95EX8q^ao{Sz7wc;&pXa7OSc%mHD_1L?San=d~a%%?F?d z6p2jXNW@D`aYjbok+ifF)_@X_Q&aOqocH&?F%4E}-uikU(~pn83k`hyf1Wr~7@eGq zU<%=c!(T-cu=e-YkYKQr(a;dP9P-@mdQsf(|G>1du{S~kAP02tCTa;_ba?2-M@MeL zX>7Cz)9`Se&^bQeTehyQ#*4dL6-<+Qf$C~A(|dcXga$rdivvBNgM&UyAsn+gTbQJ} z5_-Lw<&~E|V&~l4`|PaMf2N5Qbf>dGc2)qRaJUOo=qrh#Qr%@HgF!2_zfoTw8{~`( z6$ypf*dFNUC>MLsAr5wzr${&Q3Go*lZ7labclW=$ugKmDod^=V~;me{8i_vRKS+&z0$b z-~U2*r9cm8W1|*R2&cQdL>SA;bo9INQpCL8=OjO0E6zYpPV5PCT3ZX4-q~3!(>0nD znJ)p1mX{rPWyL|Hm`oZ`ATv`%N=hD(!a}Xkq`6LK{0RackA>+I6Y)6#Dk}6cpA_f; z1%o!cxM(9%=H{$)f3WnjLY&Gh)&P yK};T#lls^6^&vDmdarGKJRK(o^(TZ7`UPuQfO+P?j6nbZ3IG5}MNUMnLSTZ<1AEv2 delta 968 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 A@c;k- delta 552 zcmV+@0@wYh2G9f{iBL{Q4GJ0x0000DNk~Le0000I0000J2nGNE0G*Ou@{u7le*xu5 zL_t(IPo>mJiYh@624L@@A}-vxaHmHQL_`HaaJC(BR-ET~#t}tPP!t70Q1D89hTg`b z@==j=S>2mn{E(|JBQhgX5Q%(zCgWcCOHxtKr+``LbUH8^jbJjFz-%^y)oKNY!vSu$ z8+<+=1cN~chrBAHAEky@<=tyYUd ze2CZUMI;uB{fKnCT?(;?-EK!jp-_NOCmu zUav>U@Ao6JSS%3P@AnkqL#ov(8B`WxW{M9v9*-1CBoc@ei$z4_ayddOm5Mx_)oO*v z;c$TS`Ai`$(r7e5DwQI_enuvfy&>1@l|n31sZPqkD2@Z|GAkwj07H+ zmutG~>y2-Lz&ib(TwSeM1A)y)e>aC()?HluX3@m?`EnUKJ@s18&gNNk;icsG_$NI% z`NcTp<%MB1H$T5MudaT=T&@qy@1MpV0CS<;-d+ovo&Bolg#u?He!r9Y{VwUIL8MPN zjO^^xTXRljrJfxg{=hEGMd|^N?d*KVt`a9DM@M!l!8l&;XV%eCi8p|~f6w;?bMDRN z0=esUzh!!T270*W-K?w>*{Riua@Xl>ljnFB=Jxi6urEN#{=SVK9N3u1$jECPhP{|^ z-_%r!ZfNKg`u_ep^qHB-vV)a70A?fgIdCSjyW34An8@&OJr2TN%(%B$O3<~oK108> z^d5aiMw0AcX55F;(2%F-0XkiRoWUyk&CPb4 zGZ?gr>;_8K*IVeuMhg?^=`rCT?8S_GlS#|$_6nAe5F=l!RCn3Te@vaCtJMbIO;|-g zK5oYQw6zr~G62p*R#qCQ1QY4%dWwUv7c=f_YO>^OtJR1uJw1*sEYxBbuDR#VZhs-Y zn0vC1iMhijCSGDDK*{2wnfiQY=_esbNlCKwSM>LL1N({!4d&ceRcX;RHfEtW7#^V4 zXkyVvqO-FQyCQHVf8zC;=={8iaU$J7tyYEQW^)?4xj7>%E)IUt0gFW^dzj-+q_i}N zb$93Ed?;`x;_(zwk4MiqeSJA$*lf9Bx!s4((q z&XInxqX#$>nVi&=xm;@LpK$cxaHPGFK5{}vM`PQ^#^Pvn8xa4I5JLU{=Ex6(8+ylZ P00000NkvXXu0mjfF}j_| delta 508 zcmVn$N;^K4KzoFhxng(Jp)Z>#pERD_k+P8I5Pvz z&VqAu;Nl{ze6cosetgh+^(4MX?D{^(EKxV{f z$L$tmV!|G|zE+@x1wq!=b!2<{>%oXXQ&U!?R08kr6vz(Q-32`!fwb|ke?ux21u~FW zOpwDv(CZZ_5CG55t;oZJ0-2G612CBc$HoK-g#@|173Aqjf$Wf@Bhcp)NE;D5q*ha) ztt~+k2|;>#1nTPp$H&2PS&(WKY%~F^Bx|G1 z+5Eh|Z)W7>MS;x7*%^3wQVAA|`k!d++}{gQuM5&@DUgO}=OCABM{aHed3>}--rf{Q yMJ_J>Mw(4QUSGlY_aA7~HTa`87E_w>1apN^&d7 z+0^GLKK*4Hh^Fo)I2Jl4z_mI@dRL-LqaRi`HLF#%_HPO)x_x50yr z2Rr;YADh^m;EBxy5XCjcpu7S}?`*Hkk=A^pS!#qk=$83?2lm0}#^??YfA%ujOwzX< zJbQZ$&c{YRjc^4Z3QrYk3LQR&%#qf3y-{k&!0Lde25G;C~~J!?H&0SHIXAsS(9f6*=*S6r#ktjQmJ8He+(n;-HoX)fM13V zFTYeS{kSH*b+#3vD^bvA>&2dWAeLf_^pQq;LhV<Eug+-( zM0_!y^qZV}|5_2OM_+z@>KP%YM@|bZJRTMpEC!*|nHrS&So1!-&iyooZP1b4jf88kUD-~Y^AP9{rmhfiU2q8 zlZrV_!TFf&ku6|NSRq}>dzjazJO{=MqlReaSSC+5jAO>jj4}2HBMZIUzO1i)00000 LNkvXXu0mjfhib~e delta 497 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 Q00000NkvXX1g=70f`6{Tg#Z8m delta 570 zcmV-A0>%B(2jK)EiBL{Q4GJ0x0000DNk~Le0000I0000J2nGNE0G*Ou@{u7le*yMM zL_t(IPo>mLE3Q!#2k`&M+z4|M2KWMe2okxyrFZI_4jK3miU<)Qa?3UM`~8}0L=@4h zl%fnw|5}#S+HW}~2CLSy+t2S=Ywg{G%8E$r-`^;I6V+9b7$m8!1?%g<#zwHY8Ek6< zJ37FwF0i*3?C%GMhQQHLaAE?Sf1U>C=D@{8aCH@**e6t1=SXYo&&br2BP%Q5`g#C; zhxGI~GBWaiWNRyc3~6r%qfsy|4NOl5v$DW}0Y@@2z|2f--H_eg05U`>$;|};kFqjF zW@mj(=4r^mK>!&d?d0XfLkS6BUmv)z;A=7pLynIFsIyZMc_BYvHzy`)e@HG>%1jJu zYEtCr2s}FrAVUTR!GZ$aoRkFC)cDI%wdE}>j$B*>kRijvU}2#{(oSlsK4)h;Br`SS z>MDQ?86O9WiX2*A*1;NJA=Mdja}z*@OiqHu#kx5;8C+WfH#fnYoOnoPYRKJP0F8|) zGBX2~mO3QJ&W;|0oSs45f8C1Q-hvMg0c6PhJQ#`S=9Cmg_V>ZVL$IX8A%P8fd<-B% zmX`D;H#F$&HRSYEQM+p=CyqQl1&|>&lkM$z(`2jmAKiBL{Q4GJ0x0000DNk~Le0000f0000I2nGNE0LI<-n2{khe|bqn zK~zXf&6M3sQ*ju_fAnH!N9LTHx@8{c+?Fl0mMs(9(lUl5xwW#%lDJGD>D8DANvoRQ&2!?3k$E4X|v zP%Bi?(=pHi7w0Y(WpO_?wlc;zFMq;491w?cxO0{q@EL_#5sv@@6#1T957cg}r9O#q zt^v*xiwT}sN`Ry}-Aql=*}OK>Ftt{tnzmmfAA1rb-#6DMmP7Asb&~&|-Pd-5VpnKJ z&s2{&qwmLJFJoK>e&Qo^qQc?P+Gr&o91aSPv)!F; z=z7vc{fINObN7zALsaD9>?kRq3M(X?PDQlcv?kNXb z&<0k2;mg>!*(pot`?0os8*iIw1BpA~rY57`a&rr;S-(d3e==toc}JwMyb)DXK|7(D zX814rL2(xztpw-R#A+b)IAqET^!?c8>CL=(x)~%*cbY)EtO<-B@m%)^-;iw}=NIQN&uYjy65l=FsyPJrWA)?pTzjC0OBCFXRo}1P?#wx%RB_yM#PwH#G3Az$vfQ@t hQbWD1o?wiz6~9qNv&>uX)lmQd002ovPDHLkV1oVY-c|qr delta 916 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 Hu0mjf5FrS4 diff --git a/data/icons/status/ca/nds_yellow.png b/data/icons/status/ca/nds_yellow.png index 989a3000c0f6a17d4f06f383b74fb5f3dd269d74..51a102d8a461a552755c81e141402e827e0bc974 100644 GIT binary patch delta 973 zcmV;;12X*P2=WIZiBL{Q4GJ0x0000DNk~Le0000f0000I2nGNE0LI<-n2{khe}_p# zK~zXf&6M3sQ*ju_fAr$Z!nbYeOr6uFm65i}OmL>XFeGU%OGkpaFc=p0df}krM^lv0 zd7+?YA_~3G0t?!_$t$nAvb(N!RX5Rv5TV^Y{hr_aJv+zw2Tb^I&iOpw=h-vQ*D=zqNlr^&-vv1*7MrA;mRGO*(A<0s>~;%eXB%Ws zXJ-S1!w-|PxF3tf#(69j5(DE547fl%1%%JnM755NI_XMEj7e@c($n|Bf15Y`ltpmf zZds(h-mc5W8RzW#_aGO5;?A8GT_b+b@^Zhdc{~p3ii>k8uN*Qy-U%;X_JG%$SUf8$ zgZd+p0rF?gl*{WcUmn5K)D3VtE2UF&HE_1R9^l`;1wi5VH_{+n5RWY_RkC*FN{zfe zcrb_Z$|2EcKl$g+FOygOe-jfO(_f+0E)i8dK&cLLE_d-Pj^6D zTeUndD$1t3a>&PzKJp0W(3?yKd5v|IMX-ML>TwtvYK676ySiQtoUN_h<^mCl`niI6XbbsS&TAJW1SsqcKw+EtUh6ceyI4{`z%0dBkqdlRhnNFRZM1$%jH0p|-Y= z`V`u^8aRtYJUklpi02_rclQx$Qm&#RM>njn&_K0Im#pL$7F^`R;WoJ(`kERu`JFs{ zdKU8XGHAx^>_uH2fA?d{%PuYuzrZ+MU5BVaxnNNLnkgvAq}uuO#pGvao20{Id3hFj zzrR{~oZZ-1B)&{D^&<|4nX)@;0?yvPb@F%boS?XNE%Bex`noz3`TYD0^5@Pa-!?67 zcPVAHvu(BmP+grPp7q3+sjbbUtOECAi;JiD($XnVcsxbaf28$8Lq}o%{yoy0&1vMF z&cyOstX2c`_F8o_9zU)Wzv#rRRp4Bgs{rQb9lAV%`?0yX!+dV;2q;EJ4~bz`iPj^} zp4p@i1j@(-gB6rVuwUD=8)}YXY|OrEF3w@jCMQez)Ra}c^-~kvk4;SEp9qD_;P vjE$Mv#UsJkBk*vBcVr}!ryho0#u)n#N0WMAcccJ000000NkvXXu0mjf^62c4 delta 1090 zcmV-I1ikz62j&PNiBL{Q4GJ0x0000DNk~Le0000c0000J2nGNE0Q`!7u#q7(fBQ*9 zK~zXf&6P=P&QTP_&xVyW5<^KhLK=}`BeAI|7Tt&xA*MxzN+q;tOO%L2%%X;(Vu-1w zr8U${O{L}(+rAe>Q*{H-eisfw{ThmM!4ct>E_U;Eo;O&Yj@y-Qb=* zU|t@$Zy&gSKUi1@9y|yZ6@iBifrk%+M~{NXj)BLIgC|ddr%!`t&Vc96f#=VI7cPL8 zE`gUXgIBJg8Lk!#Q&p_qn z;Pva^&6@#O2$Ylr_UviVzrVo=NNalavRJXgfacE!Hy?ylQ15TZ4f21W)b~ZR* z0NAb_2!LI?f`bNuD_4RyZh*ILfp_i%V4F94g@zBemt0JoXbMSHms_;R6q+&P=e1$z zaP8?7QXRK#Yrp9;HrB80f7j1|Dk{Kx_X02hZQEv+B_{e86z$tvUW&Qg;>BiJTAI&E zMOi3lr%0DBU~#coHgKTj1SAEekSxr~0*4GSp!@g1%E|yNtf7%3Z36)*^gL`BnpM@a zV(C(_qy(Hb%jeY9XU}@eTwVtYK$h!!hYsM9CE)GbULgnc=n?q%e{lfjihA!}aMUQ< zpi?KSH$As$V|CyTTfQ7TaRN+F_c?X8EW3Eo6mj{nW38x@lYP!be7x1Q1A6)teEvKD z6Oik&(WC7pffW>hF){YNdw0K~AXU_vnLej+Bg@LlOd)6I;K5eZ>bgmj{Q5AaPY0hp z17ExVU%d*zG#mw?f3_bp#uj((3?4aRo!4?B*(S^8&h@$V>wVj6RJgoU4K33wTeuJ$ zF~YBjiZaDszXspF4ZsAXX{|z)^ja)1%^_LVx3Awsp&F89^XB=SZV3%X6?H;_&&ve? zO_^f9JIka{N{U}6Ro}e>tEvJp0jbNR(D?DTFgn`ikp7|Sf52^^(CCn5p_*!tapS;l z-F$A^G%MgP!1wP1FafE{WWj_9wpd`U%XFU&9qJF% zEg{Raxyywi04XFODfHxt-ZdG##=)(uFt}Xx*kSvozx(8K5I$S`qOxK657I(1= zSe7a026K3Qe}zDv_&ty-YF9(m)vW`4{tPxW1YnT>xeNAhf!@4{9O%mzu(2@!YYj-P z9|@3#qXW`#j1=hO$6tY(n!vALe}JW@PX4Bc|0y!k7$$%F4r_4ek+CQZ#sB~S07*qo IM6N<$f>vb_4*&oF diff --git a/data/icons/status/ca/powervu_green.png b/data/icons/status/ca/powervu_green.png index 7ee4fc6b163d0aad79b5979bc6f63d3a2a2b9487..0164269d9012787ccd2c2cf7dd0023c905cf6a78 100644 GIT binary patch delta 891 zcmV->1BCqT1E2>XiBL{Q4GJ0x0000DNk~Le0000d0000I2nGNE0N51AE0G~Ie*-m1 zL_t(YOU;s7NYhaq#}DS#oR@i-&6UoHx21X67V5|)Iz&X1yp+iTO%g;fl`gu#JZ3jW z&4;cK6%(OYLIqx4>dBXS(x-azsb0c|AS8SH_5YoAe*CA)*EaaDb3W($`<>tZ|1tb5 zZY^dl|6U$l+Fs)So5f#?6D!**e^xPAXe*Sp@N)rTjnI!!B@2EJPRwo2L97wn4087P z>tp`p+Y^v@&U>K9RTP2ivdP*u9N=Jg^Y} zNkMf1C~rF|w&OPNfA&MmXGhI}R*jw#%HvMrLdi*`K$F({uJ>IGIe+bUSX1>gD z1(4)b<%xnMV-oZS`=R4j2c#ZKrABR2Z7{w%PWwW4A=OT;Pk}C37vZs9W^paEi1c`; z+K1uHx8~!%bstD9M=hejaL_=mbGDNj*-zOca`F4)VQh6wxbBDDlxw-(A{>72bQ0;Y zm)Z-Ix!B035v~A|Y)7^ze@HQ>kZZotOpT5W9TTo$yn$TfWTS8;ttDc=PrDBW-wz6h zXFGEe>G4jr55w8O>Ht>&iP>%z1==JnILIGIVL0=C@Nxx^m?}(Ew3DjQD$1#|_@wIZf7DaXb;U&)Tu1YW z^w>x3!*JHV)Xv+N+d*P1H;MvHq6TbUo1nC>6q;T%QAXk%bJ7KR)8D6tgSNeGqfE_Y z4P~&G^sTR3$(x)e@`N%MYkJef6+n`HBwZ9F97rJdFFf-eh||Q;C5XA!9FeJgP)ld2 zMXAsjY81ZwVmbNTe-pV8HDNe&zjSl=D>q0CB?eKT%hZwEi?oU~x&*OZun*& zK?8Y1dAsrgWiD3yw3yqTD*vr8)@xR Riy#01002ovPDHLkV1mV&u2%p6 delta 453 zcmV;$0XqJm2kiqPiBL{Q4GJ0x0000DNk~Le0000I0000J2nGNE0G*Ou@{u7le*uC? zL_t(IPo>mZD}+%P!13qGN3eVaODkU}-e%mm_|@Apo&TJ3rgtO~3&oon>yrNwX%59jAEZT+(uQ_)q8oh}zz{|- zhDpp|9!proru@WyL#+&aqzivVf9BvL8`!p?RFOgW$OO_vWY30tq!${gK`!!;j{+wK zJ(h{cp$*xH?xYx!Miop%PHf0VhEW1tlnFhKepcvaN{{Cva&ANY418o1rO*XgSi}k< zZl-#mkuzM`kd5fYmcfTKqOl@3%fLEZL~d-zN5(OYa`S}BJycN vHgbf&B60Z02fkb=8Ve`%8{t2q4dKK$PJ&df*zqhi00000NkvXXu0mjf&J4%K diff --git a/data/icons/status/ca/powervu_white.png b/data/icons/status/ca/powervu_white.png index 8030685f09c3563f381c89c191aa5482d90e4fb1..4efe83cfc3cd35183f7a6143ec9bedeba4e01c09 100644 GIT binary patch delta 815 zcmV+~1JL|{1=R*2iBL{Q4GJ0x0000DNk~Le0000d0000I2nGNE0N51AE0G~Jf9gp@ zK~zXf&6PbYY(W&qr(okNf`V{QdGnv_Ihnn0z4q-UzwFHa{?EtUJ9DqW@ALCB{PFRz{`K`m{~O!O z#`pJk#5MNz_7;ABf9HI|_SIote_mcTUSD514n>%s`%*W$Q2KV!Ub@^yf|Oe&S4bUMvKYip|usIIP7Egp|+qM4Z)r!6fl zskXAR;11yTF@tmj+(v>(3d$sKPL+dEiElBproXPCnhF%Y;4Sp zB@qq=e8=I7_tgK;h$h>kqIo`Hs+LTPEKdo>098OYcZ zM9a&|EKE*Lx)X{|maqQ=3d0W&o693eZUM2md;oo!+1Xjbw=Lg5UuJ4*ssk&^H|*a1 tWgopUcHhK?hK49#7#<$}ZHzI00JvL4u+mdXFaQ7m07*qo1w^hwV1f`~hUfqQ delta 600 zcmV-e0;m1e27m=2iBL{Q4GJ0x0000DNk~Le0000I0000J2nGNE0G*Ou@{u7me-%kY zK~y+TrPRr4GC>dra1Wkct{U+qDy}*B0v_}vCvaNMLcCrtMxxQ^RixEw5$J?Colb=4bUF|S1RxX&;pXNBL?RK2(P)HRE_a4> zyIle?5xNtpR0=E>>teK8E!1i?j0^??0x=Q4-w!gG3>9%W95hZa7zD9ce~ht8rGk;+ za7ZAx+l`S>C+Rq6YkH-W$A(2P~5{U#Tl}h~f@6qe^XUKFqB@h!yrBa|$seS-_J|7GQ143S3 zUokSD&k4jtve_)C)oN7Cf8+6>*=$0m(}8}!e-T+M76gjN;~1g$q0wk?7vGWh_jinZ ze0;!awIUD`p|AG#_7+1l^8EaK71?Yy1Uez*av7@CD*CP-9v*UtHjb7=MUhPV6q>DgAy?c6}vz>=`y1Z?JA3Nvw{-5VO@4I&lKYM#W z;tvm(8V(K?`Tu5r|3}Ng!B4$+e=ukK?(SCzH2(Z?=CGX|N6YWuGZ1(oQ`=X+&RJ*?30g;iRJ|6337S}S1NRMZ#y%)~b z)@*!z-KI45ke8P%3KA2wn}l)Lv}G$x3Gh=^dQsmX<^svNPFji#m^iQK|MB{_@bvT)JS;bLz# zU!;Dmt+y$MYv~c`@l3V%!r8B1m0STN+1YVabd-jMe9Eb__@w&#fA3JPsi}Z6xc27} z>9LR6d*N(x@gZMYdI*xNES)IOXo8@!(jcg=z6R6NC6tjgHk#;wxH!*K!$H4)FQZIb z+YQQKFX_L0v645L;>b&IF81wP30D9~W@fY~h>Z;+_b+B=Ef5rRiVi^v3ln@Yqoaj% zEj2X?oX%q5-@VHse}Dh}C7&8EoXyP@@%i~8kYr?NML|qVD7ll!&OS$nAaC9nj%8#| zM58$adcB7Bcys;zxyNd7F6MBU_{@w6Bo4aa zjkA%Fi+pr6S$Q`C3!IA$569%#?Kt>XXy delta 536 zcmV+z0_Xjt2fzd&iBL{Q4GJ0x0000DNk~Le0000I0000J2nGNE0G*Ou@{u7le*x7= zL_t(IPo>n$N`gTY2k`&OM<{!RN?f)yx{*)NvWQ%TMMaMxBqV`dC{T(bt>}K!E|wM9 zg(5L1422*lXwmi`6dmu&xfQuLm6t9bT_)OCrgnfFzUw8(>?TPPW^@<74pj6g)pKk32sMXlcnH+uQnxttx&a zcXtMPdIDcw1SAnPNVnTSZVI`){2R&V1!N(6d*H!=zGH!azAh4Zcqm0)Uj-x)HItK* z(n=(f%^KwGO+X4!&%x1AF>-xvkW8jL^6?=ciJYBPMshiWyuX8=pFhx`xBE*i{u4ue a-Cy6=ZTyBNn!nTl0000=+ diff --git a/data/icons/status/ca/seca_green.png b/data/icons/status/ca/seca_green.png index 14a41cdf507f2c39ab2768afd1c99e1a42b21a13..a1706c66be8af81c710d1e4303c3defd14dc8279 100644 GIT binary patch delta 877 zcmV-z1Cspx1Cj?JiBL{Q4GJ0x0000DNk~Le0000d0000I2nGNE0N51AE0G~Ie*-5; zL_t(YOU;yDNK;W5zz_c2A2&j|B%5pWlRA@&6|BJuv?OK4*2WDAmw&`AiR zwNGm}_&EqtW67)t9(!E(g{J%JwXG+b|>`9z34!ouMKIBq#;E}NAhAu-;Ppee19Bd zDjD@iZR`D3?$lhZp>gI)z{r2-$NnQfFh=%AXaPY}s)4bCF`gp~MThu(_N8pXh_Zo+k%az!igc&r6-$it|%of3bfABhRh}d!ior z6Rvd^Nwnr~trHPe{Np0J%z`bf=$#V_so@IxMAQub1$DCZJIKT_hhlgmJD@I`y!11%Ok_8)UR?5Z(rF;QdW2c0TDQqYyA3#w`5mBbdn0cPZj1f^p zuTqM#u;qWar%pF)EPnO$bnpMY=MJxwl;uY%D+)jUqog`NBD#=9`H*I`pcU=tL^pad zfFX=x0@IkoB39)q_8n?s!y;|?e=9Nti>zSXhklCmz#=2~B_dlsWRVV7q#kLAh9Djp zXn>2zt`CJHHHd-+G?W;uRSH~04t&T*`jHGhDFK6+g^pE;Ot^>~`%o7f7SR(mprKgQ zVgaFXz9L6B^C2J68=D6k#iT=DlTbu1e8?ih7>CAk5ss-MxQJZ&kdI7ae+D{EAF7ZA z3&r3RK}2qRC>+tz^u1ZbCU%ewi|KelMDBcOj17y-Ll2Ha4(gy!ORq%tQ(=)?Jou20 zEJGvq>s}I;;3D$qLl)74Y#jY?^~EfPUX^}#mk34V$%n#`ZS3O^dSlPwBlid*^6Wzz z;qO2;;3Frn$Tfb5$g2zr diff --git a/data/icons/status/ca/seca_white.png b/data/icons/status/ca/seca_white.png index ab0871821fa70d5c22e47bf3598d2075c9637120..5d09f490f9787c22dcf3504e1bcaf88428e11d93 100644 GIT binary patch delta 814 zcmV+}1JV4O1=I#1iBL{Q4GJ0x0000DNk~Le0000d0000I2nGNE0N51AE0G~Jf9Xj? zK~zXf&6Z6_Dp3@G@1iucER|9WO=v6hvj~cC)5ctcMy1dXZ(}7CJxwBl;4Z=f4GO`H z5V&X~B~lApv`N>lT}I1jS<&*mdoJ%@uH(E%yA(cV=G^bxIdkUDj0ArlA0N*5_xInQ zpP%%nVYM87eSLX(VXv>R&bPNWf9Nz=UE}2W`T6kWAIJk#f)lrE=B67a9wY9eKlamvEPHi0PBDc4Vu=r5ll`_f6Bbw-QBivYyzT< zGblMdJ*5l~#9}emP{u3xeg8v zT5|qE$?@?qWq@E~V?$0hFfafkBO{!yt}Yo%Bof@kec@{H`~7mx(a}*E@9F80bBY*t zRJaP1?C!T9?6x^yiTi>`-EPfts4Z*Px(8T33{F8BZnSAi1t^wI6@ zZP0=*+=Yb&$)ltEGt&bP3I(V0~jsWW-tP>QaP6O*A%gf8-*p*IWad9!k sZaX1?Kp;9lKTkUa_HXAGA%y$^S!!4ZwLQwW00000NkvXX1g=70f-s(fZ~y=R delta 627 zcmV-(0*w9C2Ac&TiBL{Q4GJ0x0000DNk~Le0000I0000J2nGNE0G*Ou@{u7me=tcz zK~y+TrPRr4GC>dkU?B$)1y6c02MH*66%UdJh+xpDxPYR@s6h{t~f}`-6oNjYb1{y&jB4BUmgJ zu-Rmh!0B{;L59O2g%~6h3PCg)g}b}EZ!r`X7Z(S}cs!=iJ`#_|@jOsFs5-Q) za=Dy991aIwUtb9_nM^2je~g@;pX2Q2EEX}s+`b>Dr>FSS?<4Q;?-XK?LZN`$saC6a zZU%z^R4Nsi&1QVrXf*nQtX3-u9V3lK13H}!^m;u!*uh|MfXwG}NrJ4`YYP2@yu7>+ zLKpx5 N002ovPDHLkV1k0W8n6HW diff --git a/data/icons/status/ca/seca_yellow.png b/data/icons/status/ca/seca_yellow.png index 5b9817b9cdf0bcab3c4cbb250534d5e7556b17f6..a9d1d53c2511180026f7822efecb220748e9f032 100644 GIT binary patch delta 882 zcmV-&1C9LM1eXUPiBL{Q4GJ0x0000DNk~Le0000d0000I2nGNE0N51AE0G~Ie*-K@ zL_t(YOU;x^NE<;IfQQz%My*DT#%C+OKuxtG0Ut$_h)C5URw(u%wMY@$s>KH-9Z)eA zjRzl%29XG&n1UWOUi2V2NKWSF$&+5hgCJtO{hb+|$!3#MZ%yE1cK`qT|NXPGyNLd- zuC`P+H?}V>*Eas&TwiYuxLiBwe|Lket1d5pgTHZcv93X9XO@BU^JVZqEEt`f{KBWF zCXjP*FbXX#TF`2jtkzZ!ht~4CdxFv4 z-fK(%IacdS(CHrg9CBr)kvS?=I6IGt2_f87&|wzr$G&DKP2 z`QMqJuZEl)_nX<(rD5@egfMnaS9uMmvNBoJ84TrK`OVE240)W+g*G;Hm;jvN;S$Ko ziiYv=QW2wccIJtT^!668SbY5L=Yg(LR|<7`omw4EK2y&{Zf2&8U2A^6!lUL6j8<36 z@!DEBaP)e2v$(hrf5^*=Vgv?05HXXfl)3bnyKRBv-gfrT6p5X=+Lo-s0j@sIOP~^a=_h$)D8-mqX`5 zW^*<+n{z;p!SDq7`cegYeY%%3IGE<)NTKy|e{L?@!n$D}+%P2JmNNB?~sztdxz7QB(c_%^Eu;?9j}ls7cKqpeUt?D7VPWko#@i zuenA<5sgxcvao%4=lDABH-nAETc@x0{J!&?@0<^T`l^J#v4;PtreIY9GH7c9J37G5 zPOz&B?CAmf`oMt!aA*h|9RXTgO9aCsSATSF2{LhbDq>F)j;nVGRj zJPvMbDCj3-aL^)=$nVJZwt^g_x7Q-At)RyPW@dr_n41fFyovIXO{Kf4@a!f1&^aWoLse zE#T5pdK^KHkHPbE1!+V!wzASjajK*Q$zzg=TwW^3K_(`^$w`A%RHS24wY6^K`dUF6 znVtsc=1iR7VK5K?%gQX2l?9%iS>*OsL8*vDlXJ7a4sLCMySt#zXEBNAAouqQip4Cl zxM-Sla=`L(FckV~{Q6q5e-e3KTx^lMJMi&QK^j?IHHhB#f5f>M#49q`})JUTKPdvW1L9v&?6@}eL?IP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0}M$-K~zXf&6G_{ z6G0TmCxMjGS|GHfEgwr;YFSA^prA3(G!+^`VvtG@4GBnNIp6_9G-*?XNr=G%)PovG zI2FIJl6Wa4nsD-@7rA-jq!+`%#1Qc|?wc~x&bo57O@4VZ@Be>q-|p-d!7p=|v1NZ} zZ*L!M1KE zUG5^D3!W26yh~88R?Xa-IY9&ZZuW5v}@EBh-rxt}CJb$vBaPWnV< zUd~W25PKgJwC<5^t})!_-GXOoZHjB`dRlcb7h3$Xh!qGhy*W)HsR+d`+j&El0}`JS z)C&Y}1-S>%oAhL1Z-MK8^PE%gRMk~+53C{A5$+Ibj=?DYIgaCdaiT`*l6XTc9WXo1 zRIjY9uGHqF8~bv3KN;RZH)j>ZDqUu7phP zOp>O)+=X?gbR@DH;Xc*};^^~H>W97es+X8-Cc5?vdW7D`U^KovjunU+>sc!;1hjOc zEq6?{-L-Vzd#{)KgAaq;$NE5oy*wh*Jq!sq0&CZRi~9?}D7+oU;cS?wv9wwE#nf6L z8Q_{0Qb^)n)(0Z&2VV^Gr>EuTD088Kw*y##sHyhm|5ntR^NRQdswp*=l2AG%^nu9g zjRPbdY<(V zT~+Q#0c*g@HI6bD@}+#(x8WmdOlNX0D^Qr1=ks@M58DN;HQCBFv)@c}tPjLOuOphj z5#|+8=0eTu%~)QSi5kbegGhHIN@3o;?B;n`7is|08sm+0&-y_8m)EuE`b&ekP{ZQ} zEIm<7MFz};Y97_JTap%1Y?znL!^)8(q<^5lR=!k@iv`1y;RZqo{Q>{6f=d=#_PqcA N002ovPDHLkV1mZZpVt5Y literal 0 HcmV?d00001 diff --git a/data/icons/status/ca/tan_white.png b/data/icons/status/ca/tan_white.png new file mode 100644 index 0000000000000000000000000000000000000000..d761032309b3ea2496c4c7e73667ad9b398a8af9 GIT binary patch literal 833 zcmV-H1HSx;P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0@g`HK~zXf&6ZC{ zYC#mnXCs8RP$CmWe25ZJ^oO9xg-9q=SUjUZg5tGETLe98Q;T3g!9}!)7J`D*!ezB9 z7jAUl+NHFNmK81M%{Mf|oq6}QeF{Hj=6v5d_uMYy4^12FtD<+!sh1YzUBV@UU=>s_CUcLDjQ4Rxszn}4){+4RBD!kzK_EytYS67uLnVp^0JQo)i zN|V>K%i~beZntTt(_x@esj$n-OF=XmRRv`XJUl!IFWBAPRUR-nILKP9meRq@%#7yo z`FzTQIbzGp%UTXVU*z%ekv5x6W->WBsS4WZAQ%h^ePm=rc}t~|=8<(g9*^?m^Le4k zyi_WsU-Ud-KYH>=m{ z%8Ut&q<3m+N@*4-IX*t79A+Yq31E%mqB4#zfmPev+f&;3__&D4 zIvA~9d?8G)0VVv*q5J#$%w%I@gRQNt39NDa9LYH5Rt-oklgWs+tb_4i-fTAemxjK` z_VzZ#Mfwf&MK(7#r*T*P20urC@+~KX?|+v6zR`Yx|6BP*2qAv}b^Ai9oqnXs00000 LNkvXXu0mjfGG2$` literal 0 HcmV?d00001 diff --git a/data/icons/status/ca/tan_yellow.png b/data/icons/status/ca/tan_yellow.png new file mode 100644 index 0000000000000000000000000000000000000000..99765a45ec2a933691e94ad07fd61296c2d46321 GIT binary patch literal 889 zcmV-<1BU#GP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0}e?8-47HU)TZ8GL9$JcmK}`ol^pM7bN`;)_ zXN(0e8d1o}lU~ftQ%-sj4}ysCHr+SLOfuW8*Cz1e&Ak8ry?wirT?D_Yt1a!#P4HVZ zx{d!g*VkJk(dbTLe6WD_^71!HH7+g!)#&WZH*$WyNKy|UMkgn~@agFS0lK>CNpo}A zt?cfOQm<0Y#>RI+0|o}#xDMWAjnz7x-9jFKxlknX6GtK*0u&THBGO6U%IfMD>IL@p zMg+}fYv3BAsi{QpEG+bMja^Tv4(39~#}inB0Dk{x;`7-l27`__WI5pQaFlw1!NC^p z0aU7V5)S|1I?&iyBzW@kv$+S>kh5BAgqk=Q9UVDwIP8=PMC$AHyrGf~6cwqdo|pHK zd*|oh3Le%+qsio+;o(SRaUH^HaK3t20P2=pZ`X1I3y+813&numq7)QMb{l2WkT;b7==Rbv4qr6q^c^H76MATRvSB} zhK4-49~*ng{nOJe+{gMrguTsXpnDh+ZUolt?Zw=m1V-E2RvZjkrN=B%S*hU{lWQK2 znQKZ|EPC!`eIUYqWu=2ZJtaQ_=0cmB?O1}yF&Yz}6}i^aBff!hGBfXzK)@pOfynCZ z_Sn;7w6^AREeVX))=b#%H%Xrnk&24M8z|Rua?)wOv{WVJ`}zubjniqQIo1av^DQmC zAlccmBL&RnT&^)-F68so;l;%|BB#7O_Gbl>^DbB7uB}#`pm{vcxn?q{X^!=QnCx{p z5;wxU$-rF5>wSj3UIUTiaut%HAw4BI?{=5)Jgk#7fN4(W6S`-8ApXlcF;V=N26Lg= z*~fTpPES$|mX>R{b2|}Y?B}#qKB}TeCx@ldI=wbknHVrf5)BEJ==PAgAd#9`{$hBNT>5d4W}6N0Y>e|AAjUze}~ z0TvGyiAJlTMPs{>YK(Gyxu6G<0pg4L_(f8SMCb75u+XcltK=D=!`mVF8DJFp62hT_ z5MkJ^+ju$fK0vkc*f`hv0)0FSFx}K;5_CY_tEjD@-|)b*`?FbDin0ru-k-(_gyDJY z;fM4G`>ED-r;BU;l%Hn-f2P-W)(bkodWFS>#Qng{vv5adHVsDpkAAE`7`{CpDK0Oj zMX5ugnzlwO%xc&rxjfc0UNX{iVKJCxx15ztgVE^TC{`e9tV33Q(O_hd|L&gY7IFad zs@tmtJy);RSxaYFY-D#t$fv=`oAhFD%1hL^R$crst?~3J0rv~He~<&1r?=?^-Ez&s zy<9khP9aZGc0ogLhOh$3q@=P$IH2lcRaOT0pP$*!M7kmg`7{{0Ub(RAwTomTU6q6b zoy4~A@1F`eb&qul&J~c}=e>dlyC6r@fgLdi$wUsx z{7@*{x9ozibLqIRe+GJnegmJ|B5gvi?q(hLEK?T2gI!Sbb~A3-ZXvla-8WGhLJe7- zb;-(oHBIYH#JphUb7l{G<~6Q13Lfl&j2lL5dZGmK0N4c?9vSTVh@RvFx`#TC@+uM1 pENezeS4#0&Qnpfd7a@fH0wbCuDeSM4r~m)}07*qoM6N<$0fMfJgIWLp delta 485 zcmVj4NY!B&$MI)!a&vJIot;9^#aTDkpzV~jc|)88H@6@t5`;uiFtWm1cq=vS z;x)<(hLNBYClG`L2Uq?6^nKvr&&kE%1Mhj^{ht5xp8v6?mR!EQ?cv33G3pyO>eal4bD2683 z@W^|7fMPzLlwcEk@W>(l#85W!5noUb58Xw9i2aQrk1WC?YtXpL9{Gg=5j%~c7}>y0kvu%|4`(UV+|qci#cedV bHlAMstpZiHNHyW=00000NkvXXu0mjfX^7j2 diff --git a/data/icons/status/ca/via_white.png b/data/icons/status/ca/via_white.png index c002ef2a8b77784bf396a65a268bc20ba6ed9bff..aacaad0690177132b37aef1f585b8eb26a357a9b 100644 GIT binary patch delta 756 zcmV4i^xfu z&8E@{g#xP8xxc?hK8U5}_xo9=(?PlcO5We!DTe{MT#oTw6lAkmk(2E1?ker^@sWi> zArtyYWP-Q6+C<>jRsB$Y~u+|JI9%2g^ARSU@c($W&j1JXA= zJuS|htc5v@wE*-&>h(J1e=te4T4l4dv%=_fIz`T6v7lH-PBKoDzUAd*F)lO)@!Hzj zNbL|x%H=ZUFdeVgt0p=-J5#^o@i?jjq~>rqP=1^bRuN)otXM3f`XQ9?gGk{p>cAT& z2a|gbTwPtEIzVcRi;F1l^ZArEj>E%4R6m50d_GS(%*fo_92#I@e_>&y2Kb+D^c#U~ z)a!>(!VegQLuSO|@t^_1;V{zI*Vozn{Jhdo|F0000dqjD~Lw_e54Y7_)Vl^z7GK=7K;UJHXAq`4sbf1 z;C8#=^70bAUN2lI^{2<38_ zA>D45LswT<1PKO%5DtgQ_}CmM!WImrWWV6|D=sV=??TsPhJMs7=vfJ%Ag#Q$Z z)a&&hk>zs9knMI0`~ChO6p#8oG5JlTW4_P7C&&N1*aRUU00000NkvXXu0mjfZXper diff --git a/data/icons/status/ca/via_yellow.png b/data/icons/status/ca/via_yellow.png index 4bc94fba09597a855c320f821de6df7dad37c6a4..715fbe087dfe9a0311fb7b1422ca04f0f83740ee 100644 GIT binary patch delta 818 zcmV-21I_%=1lI;3iBL{Q4GJ0x0000DNk~Le0000a0000I2nGNE05c#AO=Cy(pm(IdPqGeak1C| z6?4$lpim)#B;p5B5X3|Ta}W;_FXrYcC%uRVLBx2Q?we%ColSbyz>nnpKW5)%Sp=V} zt1a!#jjul(_TszX`g&_99Nx}}e=f7Gy}bNO?gJMW>m}&y%sq5|?jiRBH%2EXfAHz) zJOKounN(F7CsEp@+*V+1VN9dN9jgP0d>p3e9r964(WWLQ^;t5~ZL> zoX)RAdWw|6!A7ddbaZ@R-rn9X($ZpLvyzpSKCai(^NI5p7k_X*&lE<-f5)R(f&jtb zZ<3mtM2kkFo@z20O$w)by*A=@cd-i<6zJ%DcsR`Uva-@x2C!O7IbQ`vM@Iq<1_f!E z2u)4Jth~ExqngL_jcGPp4a)+uUQv437AnfZ)z+Rxr)y>t(zRJf(SK95~U6hE`y{r&H` z93Xo};|orY*E5+i=?sf)Z?|#zC>VLYR_yaxrAKj#!(nEJ>GhGje*~77EnE(ez2agG zr#Cd@GA|x>yNSyKunXGQsK*jSO}VBo7@Lr7c@PcQ6h>O>94(e wCMVOIrALX-_;^y=#KaSPw>jKD79e_2k`&O%Ff0@tgWQjShKTLb_dxyU+7yXJ3FO_QbZKF<(m8be$6!^ zis&e%C=1*F*BDPTj`P`AOwIe${N9;)pBGgXkyz!Qa{ea%R!3rxq@e+9Y64qYz}8l< zy&dfA1iQPz-d?c39~>G2M@PYle+h7U8l0O07Z<_RReWF{P-CMZZEZgzQ&Wbltbpt5 z4oZad^cXTS@_%G&%RvF@=l}}~!OToBFYh~&lLKaDfsu$IySokwh;&j~3IZC<&4$$1 z+j&imAqNKz3W$s&-GzeUVnt?WHJ7ubBpoXt$Hxxp>Qbby4;&l>v$M4*e=SXsg#|D* zRnPMC4LLdj&(0j=5!p#JYF)|lW%Te|SN9dUxNuNFhKIrNad2QjN035UY)Ogc$;rAK zk6c|j$Rm@J;LHq|o2$j?>0m~N=JG`aIXyMx=Egzsi0q`cR*QYeeTzr#?i@5WX2|?J zxV)@b7*8T41>D~U&(96Hf4v1C9vl>ptgV5Yn_xkKK}AK0k;g{|1!QT-kewYJH(XZv zIWI52BTr8bibuA$b&SJ9-HCMKk^6f?o}V2gh`e!Q<12D1r@1nC4JiBL{Q4GJ0x0000DNk~Le0000K0000I2nGNE09(-h5RoA@fBs2C zK~y+Tti92ee`;%o7l(>fe^x!O_8v_+n7AfApO+mqrp1 zzRxe^Te3`a!SeAk3e-$*=;RCfxJU}C;g(zz1pSka0=1JZW?h9dTQhBQ4hVA}=TM+_ zLSrFU;b3O4ZO#FqP%mJiQJ`k2dnqpR_&t1|d6;R*GSLOoAEr?tr^%O-)aB{23j9$& zO_V42>wWx2)n8W)m3K^ZL1Hg~$-N}mlt&81AH*%A&qjGJ4L=#?-B4-BwUcBQ z#Gc16{z8O0Kz2d+X*d-sho}>RTfy7na{%-_?wRe~=*9ox+wjc;7XbVPak}<5()&M% P00000NkvXXu0mjfJ}(vx delta 485 zcmV0I@CR6^ z96N|a9%{xuenGE+&Fd8i5xMapi|DfT?O)Idi|Co?LEBx^7l(-4`jAD| zu!(K>$T3b~+qp)F$ej;qJA}Uj*?^B6z#`{(AtL{L$Vc|@RwNCJ+~a=;C6e)s4&EbC bAJ04jSE5n`7q diff --git a/data/icons/status/ca/x_white.png b/data/icons/status/ca/x_white.png index feddccee36002ed6262522dcbc35b480965ebbc1..6f08d13b4344d5030c2d9e1664235cddf7f019f1 100644 GIT binary patch delta 518 zcmV+h0{Q)t1+D}kiBL{Q4GJ0x0000DNk~Le0000K0000I2nGNE09(-h5RoA?e*wcu zL_t(IPp#9xtNCFR2kT(vC}r^v_)+>MB*HZ@@hzpBQfD)p6r~In#fX)~ zWH!nuBQl=*oKN@j^n5UVztpSG=Q-y*Z#+JLU)SsP<8rzDz1?p3FU0=u`~Ci@g`G~P zkMsFV?;x^*a5x;kkH;gu3BrEAe@B6IgTa8p;jpGuD#<$IwcZ<#$A;c7gxzk30_nEf zE%|&t5~rczH{d#7^;#$tlJgG`*6THHHXBm)`+d3D>-ExNvCyu(Hk-{folXt&I?jUS za*3bjdR?wm3YidCh0ALHNh>*^u(Bv;@p%xZ4HX;~E2q=oa>%K;b5tFD1?hCFcih`mj z2!eutDZe4@d7OF7%!^r?6o-56F!Rlsm{_e=xVpN6>+5T{ zy}bp8!vQXr3p^eV_zr2@5D zP5M)$UaxbAB3KDlbar+IB9VwZ5lSYLAdyH&n_Mo3d_K>RR;$G!ir{hre}Mq01P5Vg zwOY{Y_3S+y4u3$p-7bgRZZ|`)BUW*7aX|)(#bOee8;wRNm&*+4bUH8?3^;U(;8H@N z5CbsI&(GoY_4N}n8jUzakytE7ko)_45;B>LL6?`8P^;BGA(P33L#Ie4lL3>-#1I;I zT8Q-feTK|tGY*|1cz@`!e>55mxeAy|rBW!BN*|ELV!@%iyE}$FK0dOI#(_^yPXwk_ z;VDvNKA*#Cwc^nKh{a-IgKlnapxJCfyWIwzPRH7DVv1}w8xBzIY;v9Kv`!X3JSFmkinMb{zT+LFx5+44F=+Um}OY zfkXIDp-7|A_z_vJ*9_V3_i#KO|3UGn@Q%rEA{7(f{{mUS_$qgbQ>_31002ovPDHLk FV1hpc3oQTu diff --git a/data/icons/status/ca/x_yellow.png b/data/icons/status/ca/x_yellow.png index 1657f6f3f81b31f0ebdf81c905c5e33b079a8aa2..bcf4df321409c457ae02def1c0fe2add1e328c24 100644 GIT binary patch delta 580 zcmV-K0=xa%1nUGLiBL{Q4GJ0x0000DNk~Le0000K0000I2nGNE09(-h5RoA?e*yqW zL_t(IPp#5FNE=Zc2k;-#kk$;QMDb5hLR*s%1S26x3Ra;*yIBXJ(8a-Y5Tiu}Jp}nd z5JlpND6|qp5=4UvF6O%EL_Un6B-}7FQNptYw?)`qh_vP+!z^}Wz zy}E}7<5xbP#pk%c-@MaCMcMxV}zPd8807E`HiNx2Ea~22(2S1RZQUZZ$ zB`_RrC^=_=kj?g>Vf3(1R1FRWWst*Rlh5Ph;i6fAXTk377i7q4W#tpuY!zmJ+wCA- z|0vf^r=8Z;x|Defgw4$kf6Qb$*st=Wwe_uhBTZ{DYu(+AvewyItIP{L3sR{Nrqdx3 zqEV0B7z#OMeRZ{ss;ZtoUDLd>C-5vtCViMp`bn6Y^3d2=lWB3WS=PDP+4r&+kH1rT z|M?J>mKt$+xrxewXTickO;FdX*}=bDBH{YRjsswN`t|pjnK$?{8kKzj0RI4*IAnY_ SL6X@30000n!E5%V12k`I8+OV<5f`#e7U}I@v@d{hRBRlnqwIZa5ybzhm5P6yBj1f`f z^^{VSh3!|zbvx%h!^YzDJHOlSe(pK9(+_o3fmpDnlK+W@`alelw6uV2ZD2AH3iPje}W4O;L;MfvI4HH;S>9WT3Z$A?*1E@pI2mc72Mb` z&`-$Vpdyo#za!h*2J%R6FBk}b+1X%D4p>{ONK+G-n+xXUfz8c|?ClxIBT|Xv$;lw# zp5x=Lt&|kEmYL})^2p(#fjlDZ3=g|XWRpZm30PXH@A9ohPEHKe->=B%f2eDxu+VKx zN^&82Sy?=Cd<>qS8z>Q(nE?j|6p%@hC`yIKy zHc%q6xCmBMDB>d&a>&`4BDc2&NZZm<@ZbPEI&x#+*JT7e^7v>Vk4V{adV4$A*{O)! ziCnawH96QLPfrH&$oe|CwFU0%#3L6M;MJA3^YEa^^Rs~jk>A1QW;}9ws>sdF&&cbm zfh@AW|2GngDf03HzP)`xbyel>lKdy?tIOX%0OteuGT486aR2}S2>?k&PDHLkV1ma@ B5!C Date: Mon, 11 Dec 2017 21:59:44 +0100 Subject: [PATCH 05/11] infoviewer_bb: always show hdd fill level for a more uniform view; ... mark undetected hdd fill level with a small line over the progressbar. this avoids a "whole" in footer when gradient is active Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/129f9db0ab49262994374ef63df257894a5c15ee Author: vanhofen Date: 2017-12-11 (Mon, 11 Dec 2017) Origin message was: ------------------ - infoviewer_bb: always show hdd fill level for a more uniform view; ... mark undetected hdd fill level with a small line over the progressbar. this avoids a "whole" in footer when gradient is active Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/gui/infoviewer_bb.cpp | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 6e615f191..18cded5f1 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -672,24 +672,28 @@ void CInfoViewerBB::showIcon_Tuner() void CInfoViewerBB::showSysfsHdd() { - if (g_settings.infobar_show_sysfs_hdd) { - //sysFS info + if (g_settings.infobar_show_sysfs_hdd) + { + // sysfs info int percent = 0; uint64_t t, u; if (get_fs_usage("/", t, u)) percent = (int)((u * 100ULL) / t); showBarSys(percent); + // hdd info showBarHdd(cHddStat::getInstance()->getPercent()); } } void CInfoViewerBB::showBarSys(int percent) { - if (is_visible){ + if (is_visible) + { + int sysscale_height = InfoHeightY_Info/4; sysscale->reset(); sysscale->doPaintBg(false); - sysscale->setDimensionsAll(bbIconMinX, BBarY + InfoHeightY_Info/2 - OFFSET_INNER_MIN - InfoHeightY_Info/4, hddwidth, InfoHeightY_Info/4); + sysscale->setDimensionsAll(bbIconMinX, BBarY + InfoHeightY_Info/2 - OFFSET_INNER_MIN - sysscale_height, hddwidth, sysscale_height); sysscale->setValues(percent, 100); sysscale->paint(); } @@ -697,15 +701,19 @@ void CInfoViewerBB::showBarSys(int percent) void CInfoViewerBB::showBarHdd(int percent) { - if (is_visible) { + if (is_visible) + { + int hddscale_height = InfoHeightY_Info/4; hddscale->reset(); hddscale->doPaintBg(false); - if (percent >= 0){ - hddscale->setDimensionsAll(bbIconMinX, BBarY + InfoHeightY_Info/2 + OFFSET_INNER_MIN, hddwidth, InfoHeightY_Info/4); - hddscale->setValues(percent, 100); - hddscale->paint(); - }else { - frameBuffer->paintBoxRel(bbIconMinX, BBarY + InfoHeightY_Info/2 + OFFSET_INNER_MIN, hddwidth, InfoHeightY_Info/4, COL_INFOBAR_BUTTONS_BACKGROUND); + hddscale->setDimensionsAll(bbIconMinX, BBarY + InfoHeightY_Info/2 + OFFSET_INNER_MIN, hddwidth, hddscale_height); + hddscale->setValues(percent, 100); + hddscale->paint(); + + if (percent < 0) + { + // mark undetected hdd fill level strike through + frameBuffer->paintHLineRel(bbIconMinX, hddwidth, BBarY + InfoHeightY_Info/2 + OFFSET_INNER_MIN + hddscale_height/2, COL_INFOBAR_BUTTONS_BACKGROUND); } } } From c8f1a9e4ed62cb1b4bfb2bb864e216ccabfcc05e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 11 Dec 2017 22:26:22 +0100 Subject: [PATCH 06/11] infoviewer_bb: add gradient to ca-bar; ... use always CComponentsShapeSquare to paint ca-bar Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5e2fe0a1953863b94d45e2fe9b3c3a590829683a Author: vanhofen Date: 2017-12-11 (Mon, 11 Dec 2017) Origin message was: ------------------ - infoviewer_bb: add gradient to ca-bar; ... use always CComponentsShapeSquare to paint ca-bar Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/gui/infoviewer_bb.cpp | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 18cded5f1..1a663bdf6 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -847,23 +847,29 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) void CInfoViewerBB::paint_ca_bar() { initBBOffset(); - int ca_x = g_InfoViewer->ChanInfoX + OFFSET_INNER_MID; + int ca_x = g_InfoViewer->ChanInfoX; int ca_y = g_InfoViewer->BoxEndY; - int ca_w = g_InfoViewer->BoxEndX - g_InfoViewer->ChanInfoX - 2*OFFSET_INNER_MID; + int ca_w = g_InfoViewer->BoxEndX - g_InfoViewer->ChanInfoX; + + if (g_settings.infobar_casystem_frame) + { + ca_x += OFFSET_INNER_MID; + ca_w -= 2*OFFSET_INNER_MID; + } + + if (ca_bar == NULL) + ca_bar = new CComponentsShapeSquare(ca_x, ca_y, ca_w, ca_h, NULL, CC_SHADOW_ON, COL_INFOBAR_CASYSTEM_PLUS_2, COL_INFOBAR_CASYSTEM_PLUS_0); + //ca_bar->setColorBody(COL_INFOBAR_CASYSTEM_PLUS_0); + ca_bar->enableColBodyGradient(g_settings.theme.infobar_gradient_bottom, COL_INFOBAR_BUTTONS_BACKGROUND, g_settings.theme.infobar_gradient_bottom_direction); + ca_bar->enableShadow(CC_SHADOW_ON, OFFSET_SHADOW/2, true); if (g_settings.infobar_casystem_frame) { - if (ca_bar == NULL) - ca_bar = new CComponentsShapeSquare(ca_x, ca_y, ca_w, ca_h, NULL, CC_SHADOW_ON, COL_INFOBAR_CASYSTEM_PLUS_2, COL_INFOBAR_CASYSTEM_PLUS_0); - ca_bar->enableShadow(CC_SHADOW_ON, OFFSET_SHADOW/2, true); ca_bar->setFrameThickness(FRAME_WIDTH_MIN); ca_bar->setCorner(RADIUS_SMALL, CORNER_ALL); - ca_bar->paint(CC_SAVE_SCREEN_NO); - } - else - { - paintBoxRel(g_InfoViewer->ChanInfoX, g_InfoViewer->BoxEndY, g_InfoViewer->BoxEndX - g_InfoViewer->ChanInfoX, bottom_bar_offset, COL_INFOBAR_CASYSTEM_PLUS_0); } + + ca_bar->paint(CC_SAVE_SCREEN_NO); #if 1 if (g_settings.infobar_casystem_dotmatrix) { From 314525e2e79e75891adc3bb66f8f8ccc430f8605 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Mon, 11 Dec 2017 23:38:08 +0100 Subject: [PATCH 07/11] zapit/channel: fix issue tag from 77cb666bfd590da49f88aaa425ef819290f5dd2f Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/45d61f49e384d56fad613d20f364a0a215cea5cd Author: vanhofen Date: 2017-12-11 (Mon, 11 Dec 2017) Origin message was: ------------------ - zapit/channel: fix issue tag from 77cb666bfd590da49f88aaa425ef819290f5dd2f Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/zapit/src/channel.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/zapit/src/channel.cpp b/src/zapit/src/channel.cpp index 7779d6728..b36242c74 100644 --- a/src/zapit/src/channel.cpp +++ b/src/zapit/src/channel.cpp @@ -211,14 +211,9 @@ bool CZapitChannel::isUHD() case ST_DIGITAL_TELEVISION_SERVICE: case 0x19: { - std::string uhd = "UHD"; - if(strstr(name.c_str(),uhd.c_str())) + if (strstr(name.c_str(), "UHD")) return true; - uhd = "4K"; - if(strstr(name.c_str(),uhd.c_str())) - return true; - uhd = "4k"; - if(strstr(name.c_str(),uhd.c_str())) //FIXME: this statement may fall through + if (strstr(name.c_str(), "4k")) return true; } default: From 929ea9c307608f32015637c8f23461c3b38eca00 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 12 Dec 2017 12:01:36 +0100 Subject: [PATCH 08/11] locale: small changes in infobar ca system locales Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/cb7cf4a2251904eb85768b63ada3ae7504ff4972 Author: vanhofen Date: 2017-12-12 (Tue, 12 Dec 2017) Origin message was: ------------------ - locale: small changes in infobar ca system locales Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- data/locale/deutsch.locale | 6 +++--- data/locale/english.locale | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index fce9fbe63..6e4d34163 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1093,7 +1093,7 @@ menu.hint_inet_radio Internetradio menu.hint_info Systeminformationen anzeigen. menu.hint_infobar_back Ändern Sie die Hintergrundfarbe für die Infobar menu.hint_infobar_buttons_usertitle Erzwingt die benutzerdefinierten Titel der Farbtasten -menu.hint_infobar_casys ein: zeigt alle Aktiven farbig, Mini: einzelnes Symbol ob gesperrt, Diskret: alle Aktiven CA-Systeme +menu.hint_infobar_casys ein: zeigt alle CA-Systeme; diskret: zeigt nur aktive CA-Systeme; mini: einzelnes Symbol in der Fußleiste menu.hint_infobar_casys_color Ändern Sie die Hintergrundfarbe für die CA-Systemanzeige der Infobar menu.hint_infobar_casys_dotmatrix ein: CA-Systemanzeige mit Punktematrix im Hintergrund menu.hint_infobar_casys_frame ein: CA-Systemanzeige mit Rahmen @@ -1542,8 +1542,8 @@ miscsettings.infobar_buttons_usertitle Benutzertitel für Farbtasten miscsettings.infobar_casystem_display CA-Systemanzeige miscsettings.infobar_casystem_dotmatrix CA-Anzeige mit Punktematrix miscsettings.infobar_casystem_frame CA-Anzeige mit Rahmen -miscsettings.infobar_casystem_mini Mini -miscsettings.infobar_casystem_mode Diskret +miscsettings.infobar_casystem_mini mini +miscsettings.infobar_casystem_mode diskret miscsettings.infobar_disp Logo-Anzeige miscsettings.infobar_disp_0 Kanalname [Kanalnummer] miscsettings.infobar_disp_1 Kanalnummer, Kanalname [Logo] diff --git a/data/locale/english.locale b/data/locale/english.locale index 938c2d9da..5e3b5c825 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1093,7 +1093,7 @@ menu.hint_inet_radio Internet radio menu.hint_info Show system informations. menu.hint_infobar_back Change infobar background color menu.hint_infobar_buttons_usertitle Forces userdefined titles for the color keys -menu.hint_infobar_casys On: display all with colored active, mini: single\nlocked icon, descreet: all active ca-systems +menu.hint_infobar_casys on: display all CA systems, descreet: display active CA systems; mini: single symbol in footer menu.hint_infobar_casys_color Change CA-System background color menu.hint_infobar_casys_dotmatrix on: CA-System with dot matrix in background menu.hint_infobar_casys_frame on: CA-System with frame From f7092d099678c69f719031cbd5f7c2b1e8043af0 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 12 Sep 2017 22:30:35 +0200 Subject: [PATCH 09/11] menu: fix right offset for very long right texts Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c367c803359c494564664ce866f368942aa37e34 Author: vanhofen Date: 2017-09-12 (Tue, 12 Sep 2017) Origin message was: ------------------ - menu: fix right offset for very long right texts Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/gui/widget/menue.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index be9fff00f..a269722e0 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -256,7 +256,7 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char * right_text } if (*right_text) { stringstartposOption -= (icon_w == 0 ? 0 : icon_w + OFFSET_INNER_MID); - g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(stringstartposOption, y+item_height - desc_height, dx- (stringstartposOption- x), right_text, item_color); + g_Font[SNeutrinoSettings::FONT_TYPE_MENU]->RenderString(stringstartposOption, y+item_height - desc_height, dx - stringstartposOption + x - OFFSET_INNER_MID, right_text, item_color); } } if (desc_text && *desc_text) From 151d513cb7fa9be2de0b04e7d195130aeea707f1 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Tue, 12 Dec 2017 20:33:03 +0100 Subject: [PATCH 10/11] fix icon alignment Conflicts: src/gui/infoviewer_bb.cpp Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/2f5f5f70c3a6920f0e13d62b3d88830c377010a2 Author: TangoCash Date: 2017-12-12 (Tue, 12 Dec 2017) ------------------ This commit was generated by Migit --- src/gui/infoviewer_bb.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 1a663bdf6..3c6cd5e65 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -739,16 +739,16 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o std::map >::const_iterator it; icon_map[0x0E00] = std::make_pair(index++,"powervu"); - icon_map[0x4A00] = std::make_pair(index++,"d"); + icon_map[0x1000] = std::make_pair(index++,"tan"); icon_map[0x2600] = std::make_pair(index++,"biss"); + icon_map[0x4A00] = std::make_pair(index++,"d"); icon_map[0x0600] = std::make_pair(index++,"ird"); icon_map[0x0100] = std::make_pair(index++,"seca"); icon_map[0x0500] = std::make_pair(index++,"via"); icon_map[0x1800] = std::make_pair(index++,"nagra"); icon_map[0x0B00] = std::make_pair(index++,"conax"); icon_map[0x0D00] = std::make_pair(index++,"cw"); - icon_map[0x0900] = std::make_pair(index++,"nds"); - icon_map[0x1000] = std::make_pair(index ,"tan"); + icon_map[0x0900] = std::make_pair(index ,"nds"); for (it=icon_map.begin(); it!=icon_map.end(); ++it) { snprintf(buf, sizeof(buf), "%s_%s", (*it).second.second, icon); @@ -796,8 +796,7 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) return; } - - int caids[] = { 0x1000, 0x900, 0xD00, 0xB00, 0x1800, 0x0500, 0x0100, 0x600, 0x2600, 0x4a00, 0x0E00}; + int caids[] = { 0x900, 0xD00, 0xB00, 0x1800, 0x0500, 0x0100, 0x600, 0x4a00, 0x2600, 0x1000, 0x0E00 }; // const char *green = "green"; // unused const char *white = "white"; const char *yellow = "yellow"; From fcce16e9ca21eb4ea3f0664053ac03e6d6f1288e Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 13 Dec 2017 09:39:12 +0100 Subject: [PATCH 11/11] infoviewer_bb: small renamings to get more logic in function names showOne_CAIcon() => showIcon_CA() paint_ca_icons() => paint_ca_icon() showIcon_CA_Status() => paint_ca_icons() Conflicts: src/gui/infoviewer.cpp src/gui/infoviewer_bb.cpp Signed-off-by: Thilo Graf Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/ce0aa768b9ee311591e1a76a10471b942ba930b3 Author: vanhofen Date: 2017-12-13 (Wed, 13 Dec 2017) Origin message was: ------------------ - infoviewer_bb: small renamings to get more logic in function names showOne_CAIcon() => showIcon_CA() paint_ca_icons() => paint_ca_icon() showIcon_CA_Status() => paint_ca_icons() Conflicts: src/gui/infoviewer.cpp src/gui/infoviewer_bb.cpp Signed-off-by: Thilo Graf ------------------ This commit was generated by Migit --- src/gui/infoviewer.cpp | 8 ++++---- src/gui/infoviewer_bb.cpp | 30 ++++++++++++++++-------------- src/gui/infoviewer_bb.h | 6 +++--- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index ea565a6a3..c91f0e185 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -1110,7 +1110,7 @@ void CInfoViewer::loop(bool show_dot) showRadiotext(); infoViewerBB->showIcon_16_9(); - //infoViewerBB->showIcon_CA_Status(0); + //infoViewerBB->paint_ca_icons(0); infoViewerBB->showIcon_Resolution(); } else if ((msg == NeutrinoMessages::EVT_RECORDMODE) && (CMoviePlayerGui::getInstance().timeshift) && (CRecordManager::getInstance()->GetRecordCount() == 1)) { @@ -1412,9 +1412,9 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data) } else if (msg == NeutrinoMessages::EVT_ZAP_GOTPIDS) { if ((*(t_channel_id *) data) == current_channel_id) { if (is_visible && showButtonBar) { + //infoViewerBB->paint_ca_icons(0); infoViewerBB->showIcon_VTXT(); infoViewerBB->showIcon_SubT(); - //infoViewerBB->showIcon_CA_Status(0); infoViewerBB->showIcon_Resolution(); infoViewerBB->showIcon_Tuner(); } @@ -1429,7 +1429,7 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data) //chanready = 1; showSNR (); if (is_visible && showButtonBar) - infoViewerBB->showIcon_CA_Status(0); + infoViewerBB->paint_ca_icons(0); //Set_CA_Status (data); return messages_return::handled; } else if (msg == NeutrinoMessages::EVT_TIMER) { @@ -2077,7 +2077,7 @@ void CInfoViewer::killTitle() void CInfoViewer::Set_CA_Status (int /*Status*/) { if (is_visible && showButtonBar) - infoViewerBB->showIcon_CA_Status(1); + infoViewerBB->paint_ca_icons(1); } #endif /****************************************************************************** diff --git a/src/gui/infoviewer_bb.cpp b/src/gui/infoviewer_bb.cpp index 3c6cd5e65..4d1cba306 100644 --- a/src/gui/infoviewer_bb.cpp +++ b/src/gui/infoviewer_bb.cpp @@ -450,15 +450,16 @@ void CInfoViewerBB::paintshowButtonBar(bool noTimer/*=false*/) // Buttons showBBButtons(); +#if 0 + scrambledCheck(true); +#endif + paint_ca_icons(0); + // Icons, starting from right showIcon_SubT(); showIcon_VTXT(); showIcon_DD(); showIcon_16_9(); -#if 0 - scrambledCheck(true); -#endif - showIcon_CA_Status(0); showIcon_Resolution(); showIcon_Tuner(); showSysfsHdd(); @@ -626,7 +627,7 @@ void CInfoViewerBB::showIcon_Resolution() showBBIcons(CInfoViewerBB::ICON_RES, icon_name); } -void CInfoViewerBB::showOne_CAIcon() +void CInfoViewerBB::showIcon_CA() { std::string sIcon = ""; #if 0 @@ -718,7 +719,7 @@ void CInfoViewerBB::showBarHdd(int percent) } } -void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_offset) +void CInfoViewerBB::paint_ca_icon(int caid, const char *icon, int &icon_space_offset) { char buf[20]; int endx = g_InfoViewer->BoxEndX - OFFSET_INNER_MID - (g_settings.infobar_casystem_frame ? FRAME_WIDTH_MIN + OFFSET_INNER_SMALL : 0); @@ -784,14 +785,15 @@ void CInfoViewerBB::paint_ca_icons(int caid, const char *icon, int &icon_space_o } } -void CInfoViewerBB::showIcon_CA_Status(int notfirst) +void CInfoViewerBB::paint_ca_icons(int notfirst) { if (g_settings.infobar_casystem_display == 3) return; + if(NeutrinoModes::mode_ts == CNeutrinoApp::getInstance()->getMode() && !CMoviePlayerGui::getInstance().timeshift){ if (g_settings.infobar_casystem_display == 2) { fta = true; - showOne_CAIcon(); + showIcon_CA(); } return; } @@ -805,11 +807,11 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) if(!g_InfoViewer->chanready) { if (g_settings.infobar_casystem_display == 2) { fta = true; - showOne_CAIcon(); + showIcon_CA(); } else if(g_settings.infobar_casystem_display == 0) { for (int i = 0; i < (int)(sizeof(caids)/sizeof(int)); i++) { - paint_ca_icons(caids[i], white, icon_space_offset); + paint_ca_icon(caids[i], white, icon_space_offset); } } return; @@ -821,7 +823,7 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) if (g_settings.infobar_casystem_display == 2) { fta = channel->camap.empty(); - showOne_CAIcon(); + showIcon_CA(); return; } @@ -836,9 +838,9 @@ void CInfoViewerBB::showIcon_CA_Status(int notfirst) break; } if(g_settings.infobar_casystem_display == 0) - paint_ca_icons(caids[i], (found ? yellow : white), icon_space_offset); + paint_ca_icon(caids[i], (found ? yellow : white), icon_space_offset); else if(found) - paint_ca_icons(caids[i], yellow, icon_space_offset); + paint_ca_icon(caids[i], yellow, icon_space_offset); } } } @@ -964,7 +966,7 @@ void CInfoViewerBB::scrambledCheck(bool force) } if ((scrambledErr != scrambledErrSave) || (scrambledNoSig != scrambledNoSigSave) || force) { - showIcon_CA_Status(0); + paint_ca_icons(0); showIcon_Resolution(); scrambledErrSave = scrambledErr; scrambledNoSigSave = scrambledNoSig; diff --git a/src/gui/infoviewer_bb.h b/src/gui/infoviewer_bb.h index 4f1f2bad6..7d998e15e 100644 --- a/src/gui/infoviewer_bb.h +++ b/src/gui/infoviewer_bb.h @@ -112,9 +112,8 @@ class CInfoViewerBB void getBBIconInfo(void); bool checkBBIcon(const char * const icon, int *w, int *h); - void paint_ca_icons(int, const char*, int&); + void paint_ca_icon(int, const char*, int&); void paint_ca_bar(); - void showOne_CAIcon(); static void* scrambledThread(void *arg); void scrambledCheck(bool force=false); @@ -132,8 +131,8 @@ class CInfoViewerBB int bottom_bar_offset, InfoHeightY_Info; bool is_visible; + void paint_ca_icons(int); void showSysfsHdd(void); - void showIcon_CA_Status(int); void showIcon_16_9(); void showIcon_RadioText(bool rt_available); void showIcon_VTXT(); @@ -141,6 +140,7 @@ class CInfoViewerBB void showIcon_Resolution(); void showIcon_Tuner(void); void showIcon_DD(void); + void showIcon_CA(); void showBBButtons(bool paintFooter = false); void paintshowButtonBar(bool noTimer = false); void getBBButtonInfo(void);