mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-28 16:01:20 +02:00
- revert 2e6e2ef and 08b5b19 partly
Signed-off-by: Thilo Graf <dbt@novatux.de> 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 <dbt@novatux.de>
This commit is contained in:
@@ -288,11 +288,7 @@ int CNetworkSetup::showNetworkSetup()
|
|||||||
mf->setHint("", LOCALE_MENU_HINT_NET_TEST);
|
mf->setHint("", LOCALE_MENU_HINT_NET_TEST);
|
||||||
networkSettings->addItem(mf); //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);
|
mf = new CMenuForwarder(LOCALE_NETWORKMENU_SHOW, true, NULL, this, "networkshow", CRCInput::RC_info);
|
||||||
#endif
|
|
||||||
mf->setHint("", LOCALE_MENU_HINT_NET_SHOW);
|
mf->setHint("", LOCALE_MENU_HINT_NET_SHOW);
|
||||||
networkSettings->addItem(mf); //show settings
|
networkSettings->addItem(mf); //show settings
|
||||||
|
|
||||||
|
@@ -244,11 +244,7 @@ void CNeutrinoApp::InitMenuMain()
|
|||||||
//4th section***************************************************************************************************
|
//4th section***************************************************************************************************
|
||||||
|
|
||||||
//infomenu
|
//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);
|
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);
|
mf->setHint(NEUTRINO_ICON_HINT_INFO, LOCALE_MENU_HINT_INFO);
|
||||||
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_INFOMENU]);
|
personalize.addItem(MENU_MAIN, mf, &g_settings.personalize[SNeutrinoSettings::P_MAIN_INFOMENU]);
|
||||||
|
|
||||||
@@ -453,11 +449,7 @@ void CNeutrinoApp::InitMenuService()
|
|||||||
//2nd section***************************************************************************************************
|
//2nd section***************************************************************************************************
|
||||||
|
|
||||||
//infomenu
|
//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);
|
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);
|
mf->setHint(NEUTRINO_ICON_HINT_INFO, LOCALE_MENU_HINT_INFO);
|
||||||
personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SERVICE_INFOMENU]);
|
personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SERVICE_INFOMENU]);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user