diff --git a/data/locale/deutsch.locale b/data/locale/deutsch.locale index c1bc46517..c37e57c8e 100644 --- a/data/locale/deutsch.locale +++ b/data/locale/deutsch.locale @@ -2673,6 +2673,7 @@ subtitles.head Untertitel subtitles.stop Untertitel aus terrestrialsetup.area Region terrestrialsetup.provider DVB-T Versorgungsbereich +testmenu Testmenü timer.eventrecord.msg Die Sendung wurde zur Aufnahme vorgemerkt. timer.eventrecord.title Aufnahme vormerken timer.eventtimed.msg Die Sendung wurde vorgemerkt. diff --git a/data/locale/english.locale b/data/locale/english.locale index e9eabbbc9..9463e56f1 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -2673,6 +2673,7 @@ subtitles.head Subtitles subtitles.stop Stop subtitles terrestrialsetup.area Area terrestrialsetup.provider Terrestrial Provider +testmenu Testmenu timer.eventrecord.msg The event is scheduled for recording.\nTo edit the schedule open the timer list. timer.eventrecord.title Schedule Record timer.eventtimed.msg The event is scheduled.\nThe box will power on and \nswitch to this channel at the given time. diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index 9e1cb7861..b3381b45c 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -79,7 +79,7 @@ #endif #include #include -//#include +#include #include #include @@ -555,13 +555,13 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) menu_item->setHint(NEUTRINO_ICON_HINT_ADZAP, adzap_active ? LOCALE_MENU_HINT_ADZAP_ACTIVE : LOCALE_MENU_HINT_ADZAP); break; } -// case SNeutrinoSettings::ITEM_TESTMENU: -// { -// keyhelper.get(&key, &icon); -// menu_item = new CMenuDForwarder(LOCALE_TESTMENU, true, NULL, new CTestMenu(), NULL, key, icon); -// // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); -// break; -// } + case SNeutrinoSettings::ITEM_TESTMENU: + { + keyhelper.get(&key, &icon); + menu_item = new CMenuDForwarder(LOCALE_TESTMENU, true, NULL, new CTestMenu(), NULL, key, icon); + // FIXME menu_item->setHint("", NONEXISTANT_LOCALE); + break; + } case -1: // plugin { int number_of_plugins = g_Plugins->getNumberOfPlugins(); diff --git a/src/gui/user_menue_setup.cpp b/src/gui/user_menue_setup.cpp index 137caa4c7..15fc53e00 100644 --- a/src/gui/user_menue_setup.cpp +++ b/src/gui/user_menue_setup.cpp @@ -101,9 +101,7 @@ static keyvals usermenu_items[] = { SNeutrinoSettings::ITEM_SWUPDATE, LOCALE_SERVICEMENU_UPDATE, usermenu_show }, { SNeutrinoSettings::ITEM_LIVESTREAM_RESOLUTION, LOCALE_LIVESTREAM_RESOLUTION, usermenu_show }, { SNeutrinoSettings::ITEM_ADZAP, LOCALE_USERMENU_ITEM_ADZAP, usermenu_show }, -#if 0 { SNeutrinoSettings::ITEM_TESTMENU, LOCALE_TESTMENU, usermenu_show }, -#endif { SNeutrinoSettings::ITEM_FILEPLAY_AUDIO, LOCALE_MOVIEPLAYER_FILEPLAYBACK_AUDIO, usermenu_show }, { SNeutrinoSettings::ITEM_TIMESHIFT, LOCALE_RECORDINGMENU_TIMESHIFT, usermenu_show }, { SNeutrinoSettings::ITEM_MAX, NONEXISTANT_LOCALE, usermenu_show } diff --git a/src/system/locals.h b/src/system/locals.h index df47e92e9..467c759b2 100644 --- a/src/system/locals.h +++ b/src/system/locals.h @@ -2700,6 +2700,7 @@ typedef enum LOCALE_SUBTITLES_STOP, LOCALE_TERRESTRIALSETUP_AREA, LOCALE_TERRESTRIALSETUP_PROVIDER, + LOCALE_TESTMENU, LOCALE_TIMER_EVENTRECORD_MSG, LOCALE_TIMER_EVENTRECORD_TITLE, LOCALE_TIMER_EVENTTIMED_MSG, diff --git a/src/system/locals_intern.h b/src/system/locals_intern.h index 09775bdfc..07ec7e094 100644 --- a/src/system/locals_intern.h +++ b/src/system/locals_intern.h @@ -2700,6 +2700,7 @@ const char * locale_real_names[] = "subtitles.stop", "terrestrialsetup.area", "terrestrialsetup.provider", + "testmenu", "timer.eventrecord.msg", "timer.eventrecord.title", "timer.eventtimed.msg",