diff --git a/data/icons/hints/Makefile.am b/data/icons/hints/Makefile.am index 8c03e38cb..1474d284b 100644 --- a/data/icons/hints/Makefile.am +++ b/data/icons/hints/Makefile.am @@ -67,6 +67,11 @@ install_DATA = \ hint_webtv.png \ hint_xmltv.png +if ENABLE_GRAPHLCD +install_DATA += \ + hint_graphlcd.png +endif + if ENABLE_PIP install_DATA += \ hint_avinputmode_pip.png diff --git a/data/icons/hints/hint_graphlcd.png b/data/icons/hints/hint_graphlcd.png new file mode 100644 index 000000000..34c01e117 Binary files /dev/null and b/data/icons/hints/hint_graphlcd.png differ diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index a08c38c3c..0a9ead2cf 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -1375,6 +1375,7 @@ menu.hint_fonts Konfigurieren Sie die Schriftart und die Schriftgrößen für di menu.hint_foot_back Ändern Sie die Fußleisten-Hintergrundfarbe menu.hint_foot_textcolor Ändern Sie die Fußleisten-Textfarbe menu.hint_games Zeige Liste der installierten Spiele +menu.hint_glcd_support GraphLCD aktivieren/deaktivieren menu.hint_hdd Formatierung und Prüfung der Datenträger menu.hint_hdd_allow_set_recdir Erlaubt das sofortige Einstellen des neuen Datenträgers als Aufnahmemedium menu.hint_hdd_apply Die veränderten Einstellungen zum Sleep- und Akustik-Modus werden übernommen diff --git a/data/locale/english.locale b/data/locale/english.locale index 21e2015a5..eb9b45089 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1377,6 +1377,7 @@ menu.hint_fonts Configure GUI fonts and font sizes menu.hint_foot_back Change GUI footer background color menu.hint_foot_textcolor Change GUI window footer text color menu.hint_games Show list of installed games +menu.hint_glcd_support Activate/deactivate GraphLCD menu.hint_hdd Format and check data storage menu.hint_hdd_allow_set_recdir Allow to set new connected devices as a record medium menu.hint_hdd_apply Apply sleep/noise parameters diff --git a/src/gui/vfd_setup.cpp b/src/gui/vfd_setup.cpp index 3c0adfb3c..6be4e5c73 100644 --- a/src/gui/vfd_setup.cpp +++ b/src/gui/vfd_setup.cpp @@ -223,19 +223,24 @@ int CVfdSetup::showSetup() vfds->addItem(led_num); } + CMenuItem *glcd_setup = NULL; +#ifdef ENABLE_GRAPHLCD + int glcdKey = CRCInput::RC_nokey; + if (vfds->getItemsCount() == initial_count) // first item + glcdKey = CRCInput::RC_red; + + GLCD_Menu glcdMenu; + glcd_setup = new CMenuForwarder(LOCALE_GLCD_HEAD, true, NULL, &glcdMenu, NULL, glcdKey); + glcd_setup->setHint(NEUTRINO_ICON_HINT_GRAPHLCD, LOCALE_MENU_HINT_GLCD_SUPPORT); + vfds->addItem(glcd_setup); +#endif + #ifdef ENABLE_LCD4LINUX mf = new CMenuForwarder(LOCALE_LCD4L_SUPPORT, !find_executable("lcd4linux").empty(), NULL, CLCD4lSetup::getInstance(), NULL, CRCInput::RC_blue); mf->setHint(NEUTRINO_ICON_HINT_LCD4LINUX, LOCALE_MENU_HINT_LCD4L_SUPPORT); vfds->addItem(mf); #endif - CMenuItem *glcd_setup = NULL; -#ifdef ENABLE_GRAPHLCD - GLCD_Menu glcdMenu; - glcd_setup = new CMenuForwarder(LOCALE_GLCD_HEAD, true, NULL, &glcdMenu, NULL); - vfds->addItem(glcd_setup); -#endif - int res; if (glcd_setup && (vfds->getItemsCount() == initial_count + 1)) { diff --git a/src/gui/widget/icons.h b/src/gui/widget/icons.h index a02d3a1e6..aa066f6d0 100644 --- a/src/gui/widget/icons.h +++ b/src/gui/widget/icons.h @@ -177,6 +177,7 @@ #define NEUTRINO_ICON_HINT_PROTECTION "hint_protection" #define NEUTRINO_ICON_HINT_NETWORK "hint_network" #define NEUTRINO_ICON_HINT_LCD4LINUX "hint_lcd4linux" +#define NEUTRINO_ICON_HINT_GRAPHLCD "hint_graphlcd" #define NEUTRINO_ICON_HINT_RECORDING "hint_recording" #define NEUTRINO_ICON_HINT_LANGUAGE "hint_language" #define NEUTRINO_ICON_HINT_OSD "hint_osd" diff --git a/src/system/locals.h b/src/system/locals.h index 2403a1ccd..24eee7501 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -1403,6 +1403,7 @@ typedef enum LOCALE_MENU_HINT_FOOT_BACK, LOCALE_MENU_HINT_FOOT_TEXTCOLOR, LOCALE_MENU_HINT_GAMES, + LOCALE_MENU_HINT_GLCD_SUPPORT, LOCALE_MENU_HINT_HDD, LOCALE_MENU_HINT_HDD_ALLOW_SET_RECDIR, LOCALE_MENU_HINT_HDD_APPLY, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index bfed23f74..2a601c10b 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -1403,6 +1403,7 @@ const char * locale_real_names[] = "menu.hint_foot_back", "menu.hint_foot_textcolor", "menu.hint_games", + "menu.hint_glcd_support", "menu.hint_hdd", "menu.hint_hdd_allow_set_recdir", "menu.hint_hdd_apply",