From ee0f90d0832748987e65d83a41cf3d5d10c7e7b4 Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 11 Apr 2018 16:42:22 +0200 Subject: [PATCH] Icons: change check markers, rename to dialog on/off, add update marker --- data/icons/status/markers/Makefile.am | 7 ++++--- data/icons/status/markers/checkmark.png | Bin 265 -> 0 bytes .../icons/status/markers/marker_dialog_off.png | Bin 0 -> 1121 bytes data/icons/status/markers/marker_dialog_ok.png | Bin 0 -> 794 bytes .../status/markers/marker_update_available.png | Bin 0 -> 1326 bytes data/icons/status/markers/warning.png | Bin 286 -> 0 bytes src/gui/adzap.cpp | 4 ++-- src/gui/opkg_manager.cpp | 6 +++--- src/gui/update.cpp | 2 +- src/gui/widget/icons.h | 17 +++++++++++------ 10 files changed, 21 insertions(+), 15 deletions(-) delete mode 100644 data/icons/status/markers/checkmark.png create mode 100644 data/icons/status/markers/marker_dialog_off.png create mode 100644 data/icons/status/markers/marker_dialog_ok.png create mode 100644 data/icons/status/markers/marker_update_available.png delete mode 100644 data/icons/status/markers/warning.png diff --git a/data/icons/status/markers/Makefile.am b/data/icons/status/markers/Makefile.am index 05fc5ab04..b4c5ac801 100644 --- a/data/icons/status/markers/Makefile.am +++ b/data/icons/status/markers/Makefile.am @@ -1,8 +1,9 @@ installdir = $(ICONSDIR) install_DATA = \ - checkmark.png \ important.png \ + marker_dialog_off.png \ + marker_dialog_ok.png \ marker_epg.png \ marker_hidden.png \ marker_lock.png \ @@ -16,7 +17,7 @@ install_DATA = \ marker_timeshift.png \ marker_timeshift_gray.png \ marker_tv.png \ + marker_update_available.png \ marker_zap.png \ mounted.png \ - not_mounted.png \ - warning.png + not_mounted.png diff --git a/data/icons/status/markers/checkmark.png b/data/icons/status/markers/checkmark.png deleted file mode 100644 index 59495a6654e6b12659f425c1be7625946efba6c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmV+k0rvihP)hN@D z=CwEf_r2l4K*$j>q7=k@z#!I$GopvW1s(KNTSVdu$B3gNcp)0Tf}sNoG4q8J#La=P zh^nt(ZcHCo!3rXBdQAg9APO#AOfPnbR@y5d_J*KsO&>X-6=Gt*3k$9z9!A)$JECR@ z%7`iAnIjnIZM%+G{(w)2_`e_%wbEsNR@V>CBoU&IxF9wJf1FHI%6s}7&3MAdhD6d& P00000NkvXXu0mjfo<3&% diff --git a/data/icons/status/markers/marker_dialog_off.png b/data/icons/status/markers/marker_dialog_off.png new file mode 100644 index 0000000000000000000000000000000000000000..b0de61d22a15c6ab23c1689e3748c16e6284631c GIT binary patch literal 1121 zcmV-n1fKheP)rfx~6@e$VHgbMCnelTzYUn1+b`!q~vijOEpeh`p4SG7fzf82B}v zUaVfdDzBNQqkgyUN3}m0#>16wzLvjbGK*2I)_OYY?*4Ib>U_Vbt|5Kqj1?G0G@DQ> zXzz{jF}r&AF1kMapkJD1p;fCr7n-|vUEA@+=V@jb@K-B{r(TD3_N*P4W(W_Vx}JaY z!Yp>OPjCFAiB-ncx~r=8Q&StbK0vGD3Zot!M#*nl%O?l8`CAXCu( z$qAd6%J51haMJm;8e-cAA?Sehix&&;N||e9Oo-8Y$B#Q}H*bM4tpSyu2T`p;mjbrR zoPb=@^7iDUjVBcZD=W|l$Tl|->rBFkx1)0DlB-x@#>(3dB_SwS);%zl zear;5Y=ux&5U~E}5dgp>C-Nx%;uzg*a{BeoZ9mC)Rb*fTY~Zv%3Q%~ z&?qBW_u&&%9U$mGbaX&}XAc%8CR|;J5E_D8?FWMERPvrrKcSM#kdGe&1k|YHpxOJN z0Zl+ZZ~*tl$6cTE>(1Cv>OCL_PuB;qEHZY+mRy{=I0^GWoS*2+0}&@ z!Hnn6mF8W}&SK}WW0t1t1r_^3@KNHjYXgH%*RQBydY42XJR0^{B zKVMsefBib%8X2(!!4;#m6%8mOX#b%@w(h!M%gcxXh|^wsG6|1>x364rly>OwVLNgE zJ~ruKk1^E9IgK6m@5f)4FFS$n=iaBbG%}XJg^osMJcM1h()v_Radr>DXRNTM-mT%l}yy%m@pr(Odoki`?mX^>)fqxQ!Zag>Ia^s;E z$PW$=+XiLp(*X}=X54_Dw92Y3<^jJ3`7eNM+_fw9uIj9A9o)edL0{k8W(;R5`GXKZ5|7G2~eO;5`z#n zhA}&hF(!K*FjyTjcqKP^Dn4#0LV7YoY${88IzX!pM6eJ>Z7WH<4@z+=O27|GzzQne#f(Ggd>8d;k;U9l}+v_xQ=JYb?kVb2_5xI|;LMP;Z-WvfnQuv2E2IcAzY zXS7piwNq%VO=-AOYP2nCyGv`eNo}!WZnR==ojY%}VsNrqaJXY}vQ}}zFLb_Fceh`6 z##4B>ad^-$dZ<2nyK;KIWq!s^fWdTu#9D*ARfE8RguPaU!h(jvXo$dHio<1!!*Ytp zgNwvFw_B_V@bx`~3a>{{H@b;^0{T006d0L_t&-(_>(uAK*~Y;ldPU*KBIlkA})^@h>W`bz`P>Aw$O0g2c@U>EEnT;@JU@$5giqa`I Y07Eb%%}K?%KmY&$07*qoM6N<$g8F(wB>(^b literal 0 HcmV?d00001 diff --git a/data/icons/status/markers/marker_update_available.png b/data/icons/status/markers/marker_update_available.png new file mode 100644 index 0000000000000000000000000000000000000000..b6c055f61a645180264f5da57b2cd03a597e5121 GIT binary patch literal 1326 zcmV+}1=0G6P)0b000McNliru z;sOi^C^|9>+ED-i1gl9zK~y-)y_HLBR8<(qf9KqL=iRx}N*~Pa%aTCbhy{5F7{nT* z8$rd558N1|E?AhDxN~icCPot%#suO*jWK~#jfpG8h!RjLC7}AiCw z=eQ7?RwHqv-}0O zMwTPq`?4@`?q7jBoP)`G&50-1Ti*M3WwY77mKGX%dr7plA!9MZYL(@wDXvdUFjSnb z&4%$$OtthHVB41U!4r;i_koiq^J~C;`3Lj6V^c@+$@s(jckB?^{{GvBt9+lIhKBTa z^EXC87>Bw#HhnWU$2$`fVg=mQ`E-1rIQ8|8#@vH@_U*%r$JT~s80a7XDgSm}o1DbI zStd7dH%E>i=iQ4Jh54t$1LE|7jAab&92h{=s`xb!LQuSLfnQ1`F4t=KO3{``u&JSe z?Y+I2*(?B7E{B!N;V#}>dC&xSuB$7h36DOyzEgyiB>tn71vfqcfGlt=BPw0PXuk%gY3}6q^8^QoR`|Df=D@ z!Prt6jldP@kA5heE&Q3cgN~B`j%;ge>=@j-6(gBM)$91>GV`THCaM)&wMwxcMa{le zECxOr2$hcnEmiR2Upg#wl1XR0Qeo`G_h=-(h*47pLWf8J^R%Dua0Y}p=s2Qa-4iaT zltf2pA(1kU)&?3Pgb=2gS#aHA{#x-^xN4BLYSf!jSe=cH_oM|P)aY<=@zGYZMKWa|gkbV=3D=vYTDwA}eEtUT{I%jSZ>8s*&D*bN>jemfo$bep z4z6xxSN*h>~z_KLqc#?(ERf3=lf_08ud~1u-^M)a`Hz&Jao>GlZDILjF zvYqC2dsYgtP^w@Uv2Rzv0GW)56avE#tj{N?`@1Mke+e>9A<7LF$qi~1fi@68I(;V_ zdLAQ{G60yLU&8ZdTn%rpfQ2xyZEH>W`}&$_cb;W*>}QrL<9OaIhLIwZ-au2+Hv0P= zwEm-K!%%Z>?|*y`v6#H=+8n*G#OX6%U@VU< zt`E-d{&f1Pw`S4bf8Q6=h2rs%ASk~ClpADtBs5zd&pS_ujT>9&>`sx%nE1Y8Zq{RL ztitu{qg2Yj>ZV}y!?x(+E60jO_g{TY8`}>I#HD;s#@jYq$u3)qv;+m=^(d%LEXGCs kTq-CYI#E13%l~P=1L1xSrb(d{XaE2J07*qoM6N<$f=mE<82|tP literal 0 HcmV?d00001 diff --git a/data/icons/status/markers/warning.png b/data/icons/status/markers/warning.png deleted file mode 100644 index 374193eecf9c3fad5c829454bdc4396cc4f5984e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmV+(0pb3MP)O4V6yrOCNcRgMx&2muo-Lyo8}FRh*3}wj$uc3z0R(n0|S?H zX3m|Td*M%uJWx;t`asv91F((YQL3iY$AVa(z!SklUy|p!gu4mFc7EXtSHy14-+0V% z`+%E%^z4*{n3+iuj_DI6Oj-c(}vyXc0AuWQywO|!sOJ&1%MW(iAuk2ZvT=bc0 kzyMp74QvyA*~m}!1cGwM30G^4r2qf`07*qoM6N<$f~^30g8%>k diff --git a/src/gui/adzap.cpp b/src/gui/adzap.cpp index bc251f253..a651c6eed 100644 --- a/src/gui/adzap.cpp +++ b/src/gui/adzap.cpp @@ -300,7 +300,7 @@ int CAdZapMenu::exec(CMenuTarget *parent, const std::string & actionKey) { bool selected = (g_settings.adzap_zapBackPeriod == shortcut); forwarders[shortcut - 1]->setMarked(selected); - forwarders[shortcut - 1]->iconName_Info_right = selected ? NEUTRINO_ICON_CHECKMARK : NULL; + forwarders[shortcut - 1]->iconName_Info_right = selected ? NEUTRINO_ICON_MARKER_DIALOG_OK : NULL; } nc->setMarked(false); g_settings.adzap_zapBackPeriod *= 60; @@ -340,7 +340,7 @@ void CAdZapMenu::ShowMenu() bool selected = g_settings.adzap_zapBackPeriod == 60 * shortcut; forwarders[shortcut - 1] = new CMenuForwarder(minute, true, NULL, this, actionKey, CRCInput::convertDigitToKey(shortcut)); forwarders[shortcut - 1]->setMarked(selected); - forwarders[shortcut - 1]->iconName_Info_right = selected ? NEUTRINO_ICON_CHECKMARK : NULL; + forwarders[shortcut - 1]->iconName_Info_right = selected ? NEUTRINO_ICON_MARKER_DIALOG_OK : NULL; forwarders[shortcut - 1]->setHint(NEUTRINO_ICON_HINT_ADZAP, ""); menu->addItem(forwarders[shortcut - 1], selected); minute = LOCALE_ADZAP_MINUTES; diff --git a/src/gui/opkg_manager.cpp b/src/gui/opkg_manager.cpp index 901bdb7a7..88659bf7a 100644 --- a/src/gui/opkg_manager.cpp +++ b/src/gui/opkg_manager.cpp @@ -5,7 +5,7 @@ OPKG-Manager Class for Neutrino-GUI Implementation: - Copyright (C) 2012-2015 T. Graf 'dbt' + Copyright (C) 2012-2018 T. Graf 'dbt' www.dbox2-tuning.net Adaptions: @@ -433,10 +433,10 @@ void COPKGManager::updateMenu() it->second.forwarder->iconName_Info_right = ""; it->second.forwarder->setActive(true); if (it->second.upgradable) { - it->second.forwarder->iconName_Info_right = NEUTRINO_ICON_WARNING; + it->second.forwarder->iconName_Info_right = NEUTRINO_ICON_MARKER_UPDATE_AVAILABLE; upgradesAvailable = true; } else if (it->second.installed) { - it->second.forwarder->iconName_Info_right = NEUTRINO_ICON_CHECKMARK; + it->second.forwarder->iconName_Info_right = NEUTRINO_ICON_MARKER_DIALOG_OK; it->second.forwarder->setActive(expert_mode); } } diff --git a/src/gui/update.cpp b/src/gui/update.cpp index b13999fe0..af451d9f0 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -673,7 +673,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey) bool active = !strcmp(c, to_string(i).c_str()); std::string m_title = "Partition " + to_string(i); mf = new CMenuForwarder(m_title, true, NULL, selector, to_string(i).c_str(), CRCInput::convertDigitToKey(i)); - mf->iconName_Info_right = active ? NEUTRINO_ICON_CHECKMARK : NULL; + mf->iconName_Info_right = active ? NEUTRINO_ICON_MARKER_DIALOG_OK : NULL; m.addItem(mf, active); } diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index b1dd22212..dfbe37e11 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -74,6 +74,11 @@ #define NEUTRINO_ICON_BUTTON_MUTE_ZAP_ACTIVE "mute_zap_green" #define NEUTRINO_ICON_BUTTON_MUTE_ZAP_INACTIVE "mute_zap_gray" +#define NEUTRINO_ICON_BUTTON_OPTION_ON_ACTIVE "btn_option_on_active" +#define NEUTRINO_ICON_BUTTON_OPTION_ON_INACTIVE "btn_option_on_inactive" +#define NEUTRINO_ICON_BUTTON_OPTION_OFF_ACTIVE "btn_option_off_active" +#define NEUTRINO_ICON_BUTTON_OPTION_OFF_INACTIVE "btn_option_off_inactive" + /* headers */ #define NEUTRINO_ICON_BLUE "icon_blue" #define NEUTRINO_ICON_GREEN "icon_green" @@ -283,15 +288,15 @@ #define NEUTRINO_ICON_STAR_ON "star-on" #define NEUTRINO_ICON_STAR_OFF "star-off" -#define NEUTRINO_ICON_STARS_BG "stars_bg" //NI -#define NEUTRINO_ICON_STARS "stars" //NI +#define NEUTRINO_ICON_STARS_BG "stars_bg" +#define NEUTRINO_ICON_STARS "stars" #define NEUTRINO_ICON_IMDB "imdb" #define NEUTRINO_ICON_TMDB "tmdb" -/* opkg manager */ -#define NEUTRINO_ICON_CHECKMARK "checkmark" -#define NEUTRINO_ICON_WARNING "warning" - +/* status */ +#define NEUTRINO_ICON_MARKER_DIALOG_OK "marker_dialog_ok" +#define NEUTRINO_ICON_MARKER_DIALOG_OFF "marker_dialog_off" +#define NEUTRINO_ICON_MARKER_UPDATE_AVAILABLE "marker_update_available.png" #endif /* __gui_widget_icons_h__ */