From 95e56620aab3295f6f0748663cb48b72b7ff0ffc Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 12 Dec 2019 23:00:25 +0100 Subject: [PATCH] revert 8d1d6cf and d00a45e partly Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/96c66c90477baa45c1f76b0607c87d883a02e54f Author: vanhofen Date: 2019-12-12 (Thu, 12 Dec 2019) Origin message was: ------------------ - revert 8d1d6cf and d00a45e partly ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- 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 2c301aeff..9e76f4969 100644 --- a/src/gui/network_setup.cpp +++ b/src/gui/network_setup.cpp @@ -289,11 +289,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 1d9b3e1b1..31f6958f2 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -252,11 +252,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]); @@ -472,11 +468,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]);