- no need to assign mainmenu as an argument to realrun()

This commit is contained in:
svenhoefer
2016-06-23 15:42:14 +02:00
parent 62861c5f96
commit 0c0b1981f6
4 changed files with 18 additions and 19 deletions

View File

@@ -89,16 +89,6 @@ extern CCAMMenuHandler * g_CamHandler;
// extern char current_timezone[50];
// extern bool autoshift;
enum
{
MENU_MAIN,
MENU_SETTINGS,
MENU_SERVICE,
MENU_SHUTDOWN,
MENU_MAX //3
};
#define MENU_WIDTH 35
const mn_widget_struct_t menu_widgets[MENU_MAX] =
@@ -150,7 +140,7 @@ void CNeutrinoApp::InitMenuMain()
// Dynamic renumbering
personalize.setShortcut();
CMenuWidget &menu = personalize.getWidget(MENU_MAIN)/**main**/;
CMenuWidget &menu = personalize.getWidget(MENU_MAIN);
menu.addKey(CRCInput::RC_stop, this, "easyswitch");
//top
@@ -235,7 +225,7 @@ void CNeutrinoApp::InitMenuMain()
//2nd section***************************************************************************************************
// settings, also as pin protected option in personalize menu, as a result of parameter value CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION
mf = new CMenuForwarder(LOCALE_MAINMENU_SETTINGS, true, NULL, &personalize.getWidget(MENU_SETTINGS)/**settings**/);
mf = new CMenuForwarder(LOCALE_MAINMENU_SETTINGS, true, NULL, &personalize.getWidget(MENU_SETTINGS));
mf->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_SETTINGS);
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_SETTINGS], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ACCESS_OPTION);
@@ -325,7 +315,7 @@ void CNeutrinoApp::InitMenuSettings()
{
dprintf(DEBUG_DEBUG, "init settings menue...\n");
//CMenuWidget &menu = personalize.getWidget(MENU_SETTINGS)/**settings**/;
//CMenuWidget &menu = personalize.getWidget(MENU_SETTINGS);
// Dynamic renumbering
personalize.setShortcut();
@@ -469,7 +459,7 @@ void CNeutrinoApp::InitMenuService()
{
dprintf(DEBUG_DEBUG, "init service menu...\n");
//CMenuWidget &menu = personalize.getWidget(MENU_SERVICE)/**service**/;
//CMenuWidget &menu = personalize.getWidget(MENU_SERVICE);
// Dynamic renumbering
personalize.setShortcut();