From 1df41008a4aea16dc75ee82526512b25acb973be Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Mon, 29 Feb 2016 11:08:44 +0100 Subject: [PATCH] - adzap: add hint icon by fred_feuerstein --- data/icons/Makefile.am | 1 + data/icons/hint_adzap.png | Bin 0 -> 1940 bytes src/gui/adzap.cpp | 3 ++- src/gui/user_menue.cpp | 2 +- src/gui/widget/icons.h | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 data/icons/hint_adzap.png diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am index 8e519e47d..c662933d7 100644 --- a/data/icons/Makefile.am +++ b/data/icons/Makefile.am @@ -86,6 +86,7 @@ install_DATA += \ help_small.png \ hidden.png \ hint_a_pic.png \ + hint_adzap.png \ hint_aplay.png \ hint_audio.png \ hint_back.png \ diff --git a/data/icons/hint_adzap.png b/data/icons/hint_adzap.png new file mode 100644 index 0000000000000000000000000000000000000000..164cffcb76105d5f26c93e2be63063292d77463d GIT binary patch literal 1940 zcmV;F2W$9=P)w>jsxyw(S{p|OLA=GI@di<=9LBuvMgrNYkcS}r;WzV}O!B?`_WQlOeOXul zK12r$Ya2TdladM+tXQXm&EXhzTz5wo-T0_v1(+#K(bbq5GZ%!#Ndb$+VvIGxFm9LF zW5>J7O3GMlHv4Tghx?7u)tsJ?{9XiD(%enGC;^tCKzO_im|0jc##)U@R|5G9NJgCa zhq4pCsh*8}H;}Y!<+}@*TUi@*oW+pvSuA;-wzvG`zUfkhrJ+C%m);HI%v>d7Ir5s9 zTxms}z}g}7O||;E4+BYAc?~_hlR!dhHt6c$)a-HmPR@aX*h^17Eic&pPqg3fT?S#k1)d;Vl#7{wEon2y>$asq zp58#7y{g%BwTXZskx2`6>l`Nt!%}Px#`6%5&N{)C*J^d^epu{w>T^E5G0@v$u6v^>)-N*5(3w=I5>jGZRz5$gzRCZ>Iiw=`3>c$t8!y?c@}Z_lQ^Bmr$Lz)sHn);2nO zhtH(U1G9Y6PONZST>5L51-GsWlAmhmovFD-n}QgS^P-_xTSiZ$AENgejnDiqG z_peWHb6j}kwE6r8Rh%ShHj`e!wty1Yfh0h!O|z)%AAKig9Ecmakgf;h}7R;@L9SL5-otHemuv@bNB(IBEvS5oZ>n-viGEiC|X zcVS0^3@Iq4+H3v~6Vgk%9>l64D#Miz;GW`Y82?k%Yq>rd_u#Ig=TK4j1hQICn}+bu z{Mo1rnCw4g5tw}wqEdFJ4$`63YN5m8+l<_y^VRh^2tAeekZaSB?orE)6L1@^VM1diYUe3s=$_)h8+(N2L!;LQ0^7w-8MhQ^2zZQ7p z-*q7397I9=sIE~U?J6UuDu3Q6u=)m4T^e%6kt(V++$aGmc;pv__rRBDAqotE)XR*V zs{C1_z^Zbjx->-4#uB5p(E8wzK^xA38AT8UhQN{wj2uH?moajxYyUP1=aSaA`l zE)D7I6N@B3xCN(zusj`3#J~0D0rtA!QYA>LfQ5!ujTrss9@ol zhcIK$b;t@ut4mDT^%x**p|6&ZnWYyL2uII+ENHt11Qx*7hDE^+ zD$r7|TK#8u(3V=lH~lu@;=7a0=6v!l&Fe!Xw6ISghC~&K{Iee5pHN_IeRcZ(9Lr-37G_Mc(L4*}wWGWGk%YO<2 zwn33($xVzWp#RBaM?pUUG_PN)^bd}Jf(u?f`=a-6c72Vvg%G#vg zJzBH*hM;E69Shi`!TmDtafQUFRxZ!ui>+r+-}an(`8Ek24=1N^FzztW^o)Lp5Ah-1 aWBdo!M+@gDIaddIntroItems(); CMenuOptionChooser *oc = new CMenuOptionChooser(LOCALE_ADZAP_WRITEDATA, &g_settings.adzap_writeData, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); - oc->setHint("", LOCALE_MENU_HINT_ADZAP_WRITEDATA); + oc->setHint(NEUTRINO_ICON_HINT_ADZAP, LOCALE_MENU_HINT_ADZAP_WRITEDATA); menu->addItem(oc); menu->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_ADZAP_SWITCHBACK)); @@ -326,6 +326,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]->setHint(NEUTRINO_ICON_HINT_ADZAP, ""); menu->addItem(forwarders[shortcut - 1], selected); minute = LOCALE_ADZAP_MINUTES; } diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index 95ee64bc6..511b0cf7b 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -378,7 +378,7 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) case SNeutrinoSettings::ITEM_ADZAP: keyhelper.get(&key,&icon,CRCInput::RC_blue); menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_ADZAP, true, adzap_active ? g_Locale->getText(LOCALE_OPTIONS_OFF) : NULL, neutrino, "adzap", key, icon); - menu_item->setHint("", adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP); + menu_item->setHint(NEUTRINO_ICON_HINT_ADZAP, adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP); break; #if 0 case SNeutrinoSettings::ITEM_TUNER_RESTART: diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index 2b5264475..5f380c7c8 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -204,6 +204,7 @@ #define NEUTRINO_ICON_HINT_SHUTDOWN "hint_shutdown" #define NEUTRINO_ICON_HINT_INFO "hint_info" #define NEUTRINO_ICON_HINT_CI "hint_ci" +#define NEUTRINO_ICON_HINT_ADZAP "hint_adzap" /* media */ #define NEUTRINO_ICON_HINT_APLAY "hint_aplay" #define NEUTRINO_ICON_HINT_INET_RADIO "hint_inetradio"