From 922ed30bb7de4d33b91d92830e658e0623b87ed5 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 12 Sep 2017 22:30:35 +0200 Subject: [PATCH] unify headers in miscsetting's submenus Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f19d288e71009cb226f25098fab82d94cf6a05bd Author: vanhofen Date: 2017-09-12 (Tue, 12 Sep 2017) Origin message was: ------------------ - unify headers in miscsetting's submenus ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/infoicons_setup.cpp | 4 ++-- src/gui/lcd4l_setup.cpp | 4 ++-- src/gui/zapit_setup.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gui/infoicons_setup.cpp b/src/gui/infoicons_setup.cpp index e6f35e904..f66aaf716 100644 --- a/src/gui/infoicons_setup.cpp +++ b/src/gui/infoicons_setup.cpp @@ -147,8 +147,8 @@ int CInfoIconsSetup::menu() int shortcut_delflag = 0; int shortcut_flagname = 0; - CMenuWidget* infoiconsMenu = new CMenuWidget(LOCALE_INFOICONS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_INFOICONS); - infoiconsMenu->addIntroItems(); + CMenuWidget* infoiconsMenu = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_INFOICONS); + infoiconsMenu->addIntroItems(LOCALE_INFOICONS_HEAD); //FIXME if Iconbar is active, set selected from LOCALE_INFOICONS_SKIN to LOCALE_INFOICONS_MODEICON if(g_settings.mode_icons && (infoiconsMenu->getSelected() == 4)) diff --git a/src/gui/lcd4l_setup.cpp b/src/gui/lcd4l_setup.cpp index c7fcaa614..c8c4f847d 100644 --- a/src/gui/lcd4l_setup.cpp +++ b/src/gui/lcd4l_setup.cpp @@ -127,8 +127,8 @@ int CLCD4lSetup::show() int temp_lcd4l_skin = g_settings.lcd4l_skin; // lcd4l setup - CMenuWidget* lcd4lSetup = new CMenuWidget(LOCALE_LCD4L_SUPPORT, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_LCD4L_SETUP); - lcd4lSetup->addIntroItems(); + CMenuWidget* lcd4lSetup = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_LCD4L_SETUP); + lcd4lSetup->addIntroItems(LOCALE_LCD4L_SUPPORT); mc = new CMenuOptionChooser(LOCALE_LCD4L_SUPPORT, &g_settings.lcd4l_support, LCD4L_SUPPORT_OPTIONS, LCD4L_SUPPORT_OPTION_COUNT, true, this, CRCInput::RC_red); mc->setHint(NEUTRINO_ICON_HINT_LCD4L, LOCALE_MENU_HINT_LCD4L_SUPPORT); diff --git a/src/gui/zapit_setup.cpp b/src/gui/zapit_setup.cpp index f4029afc2..dee9dbc89 100644 --- a/src/gui/zapit_setup.cpp +++ b/src/gui/zapit_setup.cpp @@ -60,8 +60,8 @@ int CZapitSetup::exec(CMenuTarget* parent, const std::string &/*actionKey*/) int CZapitSetup::showMenu() { //menue init - CMenuWidget *zapit = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_ZAPIT); - zapit->addIntroItems(LOCALE_ZAPITSETUP_INFO); + CMenuWidget *zapit = new CMenuWidget(LOCALE_MISCSETTINGS_HEAD, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_ZAPIT); + zapit->addIntroItems(LOCALE_ZAPITSETUP_HEAD); COnOffNotifier* miscZapitNotifier = new COnOffNotifier(1); //zapit CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_ZAPITSETUP_LAST_USE, &g_settings.uselastchannel, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, miscZapitNotifier, CRCInput::RC_red);