code alignments to master branch

Origin commit data
------------------
Commit: dbb726e191
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)

Origin message was:
------------------
- code alignments to master branch
This commit is contained in:
vanhofen
2017-09-21 10:46:50 +02:00
committed by Michael Liebmann
parent e137542efe
commit 16f0d0ca8a
3 changed files with 13 additions and 26 deletions

View File

@@ -393,7 +393,7 @@ void CNeutrinoApp::InitMenuService()
mf->setHint(NEUTRINO_ICON_HINT_SERVICE_SCAN, LOCALE_MENU_HINT_SERVICE_SCAN);
personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SCANTS], false, CPersonalizeGui::PERSONALIZE_SHOW_AS_ITEM_OPTION, NULL, DCOND_MODE_TS);
//reload channels
//reload channels
mf = new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD , true, NULL, CScanSetup::getInstance(), "reloadchannels", CRCInput::RC_yellow);
mf->setHint(NEUTRINO_ICON_HINT_RELOAD_CHANNELS, LOCALE_MENU_HINT_RELOAD_CHANNELS);
personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RELOAD_CHANNELS]);
@@ -402,10 +402,10 @@ void CNeutrinoApp::InitMenuService()
// TODO: this needs a neutrino restart after changing parentallock_prompt to activate :-(
CLockedMenuForwarder *lf;
lf = new CLockedMenuForwarder(LOCALE_BOUQUETEDITOR_NAME, g_settings.parentallock_pincode, g_settings.parentallock_prompt == PARENTALLOCK_PROMPT_CHANGETOLOCKED, true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_blue);
/* does not work with CLockedMenuForwarder yet?
lf->setHint(NEUTRINO_ICON_HINT_BEDIT, LOCALE_MENU_HINT_BEDIT);
*/
personalize.addItem(MENU_SERVICE, lf, &g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT]);
//channel reset