From 067891fe52903d61f3c4dadb7854cfd5bd6d9744 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Fri, 25 Oct 2013 14:27:38 +0400 Subject: [PATCH] move tuner setup to Service menu --- data/locale/english.locale | 2 +- src/gui/scan_setup.cpp | 4 ++-- src/neutrino_menue.cpp | 25 +++++++++++++++---------- src/system/settings.cpp | 1 + src/system/settings.h | 1 + 5 files changed, 20 insertions(+), 13 deletions(-) diff --git a/data/locale/english.locale b/data/locale/english.locale index edf6d0937..b79ddaf9b 100644 --- a/data/locale/english.locale +++ b/data/locale/english.locale @@ -1113,7 +1113,7 @@ menu.hint_scripts Run scripts menu.hint_selected_back Change selected item background color menu.hint_selected_text Change selected item text color menu.hint_service Tuner setup, service scan,\nbouquet editor, software upgrade -menu.hint_service_scan Tuner setup, service scan +menu.hint_service_scan Auto / manual service scan menu.hint_settings Configure Neutrino-HD\nNetwork, audio, video, OSD and more menu.hint_show_mute_icon Show mute icon, when volume set to 0 menu.hint_shutdown Put your box in deep standby mode\nNo confirmation diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 6f76968b4..a5fe182e7 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -394,13 +394,13 @@ int CScanSetup::showScanMenu() settings->addItem(mc); //sat/provider selector - +#if 0 if(CFEManager::getInstance()->haveSat() || CFEManager::getInstance()->getFrontendCount() > 1) { mf = new CMenuForwarder(LOCALE_SATSETUP_FE_SETUP, allow_start, NULL, this, "setup_frontend", CRCInput::convertDigitToKey(shortcut++)); mf->setHint("", LOCALE_MENU_HINT_SCAN_FESETUP); settings->addItem(mf); } - +#endif if (CFEManager::getInstance()->haveSat()) { r_system = DVB_S; diff --git a/src/neutrino_menue.cpp b/src/neutrino_menue.cpp index ebb1e7907..c2b7959bb 100644 --- a/src/neutrino_menue.cpp +++ b/src/neutrino_menue.cpp @@ -446,23 +446,31 @@ void CNeutrinoApp::InitMenuService() //1st section*************************************************************************************************** + CMenuForwarder * mf; + // tuner setup + if(CFEManager::getInstance()->haveSat() || CFEManager::getInstance()->getFrontendCount() > 1) { + mf = new CMenuForwarder(LOCALE_SATSETUP_FE_SETUP, true, NULL, CScanSetup::getInstance(), "setup_frontend", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); + mf->setHint(NEUTRINO_ICON_HINT_SETTINGS, LOCALE_MENU_HINT_SCAN_FESETUP); + personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_TUNER]); + } + // channel scan - CMenuForwarder * mf = new CMenuForwarder(LOCALE_SERVICEMENU_SCANTS , true, NULL, CScanSetup::getInstance(), "", CRCInput::RC_red, NEUTRINO_ICON_BUTTON_RED); + mf = new CMenuForwarder(LOCALE_SERVICEMENU_SCANTS , true, NULL, CScanSetup::getInstance(), "", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); mf->setHint(NEUTRINO_ICON_HINT_SERVICE_SCAN, LOCALE_MENU_HINT_SERVICE_SCAN); personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SCANTS]); if (!g_settings.easymenu) { //reload channels - mf = new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD , true, NULL, CScanSetup::getInstance(), "reloadchannels", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); + mf = new CMenuForwarder(LOCALE_SERVICEMENU_RELOAD , true, NULL, CScanSetup::getInstance(), "reloadchannels", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_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]); } //bouquet edit if (g_settings.easymenu) - mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN); - else mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); + else + mf = new CMenuForwarder(LOCALE_BOUQUETEDITOR_NAME , true, NULL, new CBEBouquetWidget(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); mf->setHint(NEUTRINO_ICON_HINT_BEDIT, LOCALE_MENU_HINT_BEDIT); personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_BOUQUET_EDIT]); @@ -470,9 +478,9 @@ void CNeutrinoApp::InitMenuService() //channel reset CDataResetNotifier *resetNotifier = new CDataResetNotifier(); if (g_settings.easymenu) - mf = new CMenuForwarder(LOCALE_RESET_CHANNELS , true, NULL, resetNotifier, "channels", CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); - else mf = new CMenuForwarder(LOCALE_RESET_CHANNELS , true, NULL, resetNotifier, "channels", CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); + else + mf = new CMenuForwarder(LOCALE_RESET_CHANNELS , true, NULL, resetNotifier, "channels"); mf->setHint(NEUTRINO_ICON_HINT_DELETE_CHANNELS, LOCALE_MENU_HINT_DELETE_CHANNELS); personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_RESET_CHANNELS]); @@ -512,10 +520,7 @@ void CNeutrinoApp::InitMenuService() } //firmware update - if (g_settings.easymenu) - mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate(), NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE); - else - mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate()); + mf = new CMenuForwarder(LOCALE_SERVICEMENU_UPDATE, true, NULL, new CSoftwareUpdate()); mf->setHint(NEUTRINO_ICON_HINT_SW_UPDATE, LOCALE_MENU_HINT_SW_UPDATE); personalize.addItem(MENU_SERVICE, mf, &g_settings.personalize[SNeutrinoSettings::P_MSER_SOFTUPDATE]); } diff --git a/src/system/settings.cpp b/src/system/settings.cpp index 461606d22..437db473f 100644 --- a/src/system/settings.cpp +++ b/src/system/settings.cpp @@ -72,6 +72,7 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE {"personalize_misc" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, //main menu->service menu + {"personalize_tuner" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_scants" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_reload_channels" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_bouquet_edit" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, diff --git a/src/system/settings.h b/src/system/settings.h index 0994ada4a..983d8354f 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -197,6 +197,7 @@ struct SNeutrinoSettings P_MSET_MISC, //service menu + P_MSER_TUNER, P_MSER_SCANTS, P_MSER_RELOAD_CHANNELS, P_MSER_BOUQUET_EDIT,