From 80bf4aac4efe34c5b8f5f8e353f7dfff735e10b6 Mon Sep 17 00:00:00 2001 From: GetAway Date: Sat, 5 Jan 2019 13:27:41 +0100 Subject: [PATCH] l4l: add hint icon --- data/icons/hints/Makefile.am | 1 + data/icons/hints/hint_lcd4linux.png | Bin 0 -> 1606 bytes src/gui/lcd4l_setup.cpp | 18 +++++++++--------- src/gui/miscsettings_menu.cpp | 1 + 4 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 data/icons/hints/hint_lcd4linux.png diff --git a/data/icons/hints/Makefile.am b/data/icons/hints/Makefile.am index 40b4f58ec..b29ee3f75 100644 --- a/data/icons/hints/Makefile.am +++ b/data/icons/hints/Makefile.am @@ -22,6 +22,7 @@ install_DATA = \ hint_info.png \ hint_keys.png \ hint_language.png \ + hint_lcd4linux.png \ hint_load.png \ hint_manage.png \ hint_mb.png \ diff --git a/data/icons/hints/hint_lcd4linux.png b/data/icons/hints/hint_lcd4linux.png new file mode 100644 index 0000000000000000000000000000000000000000..dd5219564a4a786bb1060c872413dd42c989ed97 GIT binary patch literal 1606 zcmV-M2D$l(P)WdKuQAT=OLVQwHYFflnGF)}(eF*-FkAS*C2Ffi09ob&(y00(qQO+^Re z0R;>XCw($X&Hw-a32;bRa{vGwAOHXyAOXz}o1Opw00d`2O+f$vv5yP;fg2hN55zP^v~trl+U9czYRuBuVdky1_7?AQ7PK`6?p z^_2iPJ3Et+!EU!hGMR!@DhVnAkrlZqjS6*vr!mI;j0xDQLLd+*DwE`_2;gE8gG?q3 zi;Ii!>mR>^;8bxN2DM48dRvsYuoel%Kq!DjR`6b6{6@P%UVtw@`xH8TUjW$bmzFaG zprF=QpZ^I@w^m^AK5l}RPzsvVgVB^rn-?Y*|I;`{r~MKopk~oTxGeS~pXKr#Fe#a# zs|Z#LzmNQM1b0V<4OLbV0GXWFDcPX^ULJ0Dt<<6YH$(DRA6OltVZTsGc;3OzO{l8P zWuq$t!0c!U!LZ-BM?E)XeZGHlWC)-bL?)*a0Oje92|`1QT^H%)6l#nFMZVb>s6|x) za0{@vCgf~8dwmm1P_-a{9uZ417^^zdt zNq`Dgg4ldA7;~S1WOwrSlS(B@Ljbh-=i~R`laKH6XrRI>f3(n-GOL({#?q#_Yz{m#g@{pva<0 zO8_L3$-QVa>g((41Bb&=sF5n1a~MPQ2B5t=wxNRcfqEqsl1It{zK zyIjtS0CskEzMGqy`x*iCd%a$FXJ@Ciqoad9d~iTicDGn890+l_KuqVS+EqjWWK4Zp zewu$RJF78=2r*&jx+65Tlf&h4@w!&W*yhp(P}b$J2p;{3vt)+x=)-KU!xj91e%@YC*Gdfy-lp+60Oh z0}xK96OQAFz2%kV<#vzf1uE#!=kvwNRVG3MUa zlz-8D+#8T>$StUS2X5e>n3(tm1qhLgkvox(Y5;6D8;={Z3b|dSSUHKsVEx(h>5Kin zr$0P-@_kH}k8lx9$Q*J_(>0RcXt6XgQfzc|)HgIVBw@UW1OQ!*AM@l+LwcLISxH+|LAgsg`o z=_2e11jZD@wQda#4t|ILe!CU`=--&Ag11p?PCDqCJD827_ZN1Sd%inqZ^_B0E@JzvawCEasU7T07*qoM6N<$ Ef=xQz`v3p{ literal 0 HcmV?d00001 diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp index 66d032497..63a0e0aea 100644 --- a/src/gui/lcd4l_setup.cpp +++ b/src/gui/lcd4l_setup.cpp @@ -155,45 +155,45 @@ int CLCD4lSetup::show() lcd4lSetup->addIntroItems(); mc = new CMenuOptionChooser(LOCALE_LCD4L_SUPPORT, &g_settings.lcd4l_support, LCD4L_SUPPORT_OPTIONS, LCD4L_SUPPORT_OPTION_COUNT, true, this, CRCInput::RC_red); - mc->setHint("", LOCALE_MENU_HINT_LCD4L_SUPPORT); + mc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SUPPORT); lcd4lSetup->addItem(mc); lcd4lSetup->addItem(GenericMenuSeparatorLine); mf = new CMenuForwarder(LOCALE_LCD4L_LOGODIR, true, g_settings.lcd4l_logodir, this, "lcd4l_logodir", CRCInput::convertDigitToKey(shortcut++)); - mf->setHint("", LOCALE_MENU_HINT_LCD4L_LOGODIR); + mf->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_LOGODIR); lcd4lSetup->addItem(mf); mc = new CMenuOptionChooser(LOCALE_LCD4L_DISPLAY_TYPE, &temp_lcd4l_dpf_type, LCD4L_DPF_TYPE_OPTIONS, LCD4L_DPF_TYPE_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++)); - mc->setHint("", LOCALE_MENU_HINT_LCD4L_DISPLAY_TYPE); + mc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_DISPLAY_TYPE); lcd4lSetup->addItem(mc); mc = new CMenuOptionChooser(LOCALE_LCD4L_SKIN, &temp_lcd4l_skin, LCD4L_SKIN_OPTIONS, LCD4L_SKIN_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++)); - mc->setHint("", LOCALE_MENU_HINT_LCD4L_SKIN); + mc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SKIN); lcd4lSetup->addItem(mc); mc = new CMenuOptionChooser(LOCALE_LCD4L_SKIN_RADIO, &g_settings.lcd4l_skin_radio, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++)); - mc->setHint("", LOCALE_MENU_HINT_LCD4L_SKIN_RADIO); + mc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SKIN_RADIO); lcd4lSetup->addItem(mc); nc = new CMenuOptionNumberChooser(LOCALE_LCD4L_BRIGHTNESS, (int *)&temp_lcd4l_brightness, true, 1, LCD4l->GetMaxBrightness(), this); - nc->setHint("", LOCALE_MENU_HINT_LCD4L_BRIGHTNESS); + nc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_BRIGHTNESS); lcd4lSetup->addItem(nc); nc = new CMenuOptionNumberChooser(LOCALE_LCD4L_BRIGHTNESS_STANDBY, (int *)&g_settings.lcd4l_brightness_standby, true, 1, LCD4l->GetMaxBrightness(), this); - nc->setHint("", LOCALE_MENU_HINT_LCD4L_BRIGHTNESS_STANDBY); + nc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_BRIGHTNESS_STANDBY); lcd4lSetup->addItem(nc); const char *flag_lcd4l_clock_a = FLAGDIR "/.lcd-clock_a"; int fake_lcd4l_clock_a = file_exists(flag_lcd4l_clock_a); CTouchFileNotifier * lcd_clock_a = new CTouchFileNotifier(flag_lcd4l_clock_a); mc = new CMenuOptionChooser(LOCALE_LCD4L_CLOCK_A, &fake_lcd4l_clock_a, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, ((file_exists(DATADIR "/lcd/icons/clock/analog")) || (file_exists("/var/tuxbox/lcd/icons/clock/analog"))), lcd_clock_a, CRCInput::convertDigitToKey(shortcut++)); - mc->setHint("", LOCALE_MENU_HINT_LCD4L_CLOCK_A); + mc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_CLOCK_A); lcd4lSetup->addItem(mc); lcd4lSetup->addItem(GenericMenuSeparator); mc = new CMenuOptionChooser(LOCALE_LCD4L_CONVERT, &g_settings.lcd4l_convert, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++)); - mc->setHint("", LOCALE_MENU_HINT_LCD4L_CONVERT); + mc->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_CONVERT); lcd4lSetup->addItem(mc); int res = lcd4lSetup->exec(NULL, ""); diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index 3fe3dc9fd..192202055 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -312,6 +312,7 @@ int CMiscMenue::showMiscSettingsMenu() // LCD4Linux Setup CLCD4lSetup lcd4lSetup; mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, !find_executable("lcd4linux").empty(), NULL, &lcd4lSetup, NULL, CRCInput::convertDigitToKey(shortcut++)); + mf->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SUPPORT); misc_menue.addItem(mf); #endif