usermenu: allow testmenu in usermenu

Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fcf19b967
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- usermenu: allow testmenu in usermenu

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

data/locale/deutsch.locale

@@ -2559,6 +2559,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.

data/locale/english.locale

@@ -2559,6 +2559,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.

src/gui/Makefile.am

@@ -118,10 +118,10 @@ libneutrino_gui_a_SOURCES = \
 	webtv_setup.cpp \
 	zapit_setup.cpp
 
-if ENABLE_TESTING
+#NI if ENABLE_TESTING
 libneutrino_gui_a_SOURCES += \
 	test_menu.cpp
-endif
+#NI endif
 
 libneutrino_gui2_a_SOURCES = \
 	cam_menu.cpp \

src/gui/user_menue.cpp

@@ -72,6 +72,7 @@
 #include <gui/network_setup.h>
 #include <gui/update_menue.h>
 #include <gui/hdd_menu.h>
+#include <gui/test_menu.h> //NI
 #include <gui/webtv_setup.h>
 
 #include <driver/radiotext.h>
@@ -474,6 +475,10 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg)
 			menu_item = new CMenuForwarder(LOCALE_SERVICEMENU_RESTART_TUNER, true, NULL, neutrino, "restarttuner", key, icon);
 			menu_item->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RESTART_TUNER);
 			break;
+		case SNeutrinoSettings::ITEM_TESTMENU:
+			keyhelper.get(&key,&icon);
+			menu_item = new CMenuDForwarder(LOCALE_TESTMENU, true, NULL, new CTestMenu(), NULL, key, icon);
+			break;
 		case -1: // plugin
 		    {
 			int number_of_plugins = g_PluginList->getNumberOfPlugins();

src/gui/user_menue_setup.cpp

@@ -117,6 +117,7 @@ static keyvals usermenu_items[] =
 	{ SNeutrinoSettings::ITEM_ECMINFO,		LOCALE_ECMINFO_SHOW,			usermenu_show },
 	{ SNeutrinoSettings::ITEM_INFOICONS,		LOCALE_INFOICONS_SWITCH_ON,		usermenu_show },
 	{ SNeutrinoSettings::ITEM_TUNER_RESTART,	LOCALE_SERVICEMENU_RESTART_TUNER,	usermenu_show },
+	{ SNeutrinoSettings::ITEM_TESTMENU,		LOCALE_TESTMENU,			usermenu_show },
 	{ SNeutrinoSettings::ITEM_MAX,			NONEXISTANT_LOCALE,			usermenu_show }
 };
 

src/system/locals.h

@@ -2586,6 +2586,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,

src/system/locals_intern.h

@@ -2586,6 +2586,7 @@ const char * locale_real_names[] =
 	"subtitles.stop",
 	"terrestrialsetup.area",
 	"terrestrialsetup.provider",
+	"testmenu",
 	"timer.eventrecord.msg",
 	"timer.eventrecord.title",
 	"timer.eventtimed.msg",

src/system/settings.h

@@ -885,6 +885,7 @@ struct SNeutrinoSettings
 
 		ITEM_LIVESTREAM_RESOLUTION = 35,
 		ITEM_ADZAP = 36,
+		ITEM_TESTMENU = 37,		//NI
 
 		ITEM_MAX   // MUST be always the last in the list
 	} USER_ITEM;