From ff51f31f5139947fcacbc3da31c9e87e3d6d6950 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Thu, 12 Dec 2019 23:00:25 +0100 Subject: [PATCH] - revert 2e6e2ef and 08b5b19 partly Signed-off-by: Thilo Graf commits: - neutrino_menu: use RC_help to show info_menu; ARM/MIPS_HARDWARE only - add some mor help keys; fix 5e8a1d0233781d1b4a7494e5be8107ef4094ba85 Signed-off-by: Thilo Graf --- src/gui/network_setup.cpp | 4 ---- src/neutrino_menue.cpp | 8 -------- 2 files changed, 12 deletions(-) diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp index 24426a588..5cd8e4288 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -288,11 +288,7 @@ int CNetworkSetup::showNetworkSetup() mf->setHint("", LOCALE_MENU_HINT_NET_TEST); networkSettings->addItem(mf); //test -#if BOXMODEL_VUPLUS - mf = new CMenuForwarder(LOCALE_NETWORKMENU_SHOW, true, NULL, this, "networkshow", CRCInput::RC_help); -#else mf = new CMenuForwarder(LOCALE_NETWORKMENU_SHOW, true, NULL, this, "networkshow", CRCInput::RC_info); -#endif mf->setHint("", LOCALE_MENU_HINT_NET_SHOW); networkSettings->addItem(mf); //show settings diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index ca2504fbd..8b07e0857 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -244,11 +244,7 @@ void CNeutrinoApp::InitMenuMain() //4th section*************************************************************************************************** //infomenu -#if BOXMODEL_VUPLUS - mf = new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_help); -#else mf = new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_info); -#endif mf->setHint(NEUTRINO_ICON_HINT_INFO, LOCALE_MENU_HINT_INFO); personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_INFOMENU]); @@ -453,11 +449,7 @@ void CNeutrinoApp::InitMenuService() //2nd section*************************************************************************************************** //infomenu -#if BOXMODEL_VUPLUS - mf = new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_help); -#else mf = new CMenuForwarder(LOCALE_MESSAGEBOX_INFO, true, NULL, new CInfoMenu(), NULL, CRCInput::RC_info); -#endif mf->setHint(NEUTRINO_ICON_HINT_INFO, LOCALE_MENU_HINT_INFO); personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SERVICE_INFOMENU]);