From 283ba146453fda624e56f93d87cac3cbb105778d Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Tue, 17 Apr 2012 19:26:51 +0400 Subject: [PATCH] gui/scan_setup.cpp: move cable network ID to next menu level Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/ced3a51fbd2cf6ac5bf6ebddc027ece85fd365bc Author: [CST] Focus Date: 2012-04-17 (Tue, 17 Apr 2012) --- src/gui/scan_setup.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/gui/scan_setup.cpp b/src/gui/scan_setup.cpp index 01cb55cf6..d485eefcc 100644 --- a/src/gui/scan_setup.cpp +++ b/src/gui/scan_setup.cpp @@ -380,8 +380,10 @@ int CScanSetup::showScanMenu() CMenuOptionChooser * mode = new CMenuOptionChooser(LOCALE_SATSETUP_FE_MODE, (int *)&femode, SATSETUP_FRONTEND_MODE, 2, true, this); settings->addItem(mode); } +#if 0 CIntInput* nid = new CIntInput(LOCALE_SATSETUP_CABLE_NID, (int&) scansettings.cable_nid, 5, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE); settings->addItem(new CMenuForwarder(LOCALE_SATSETUP_CABLE_NID, true, nid->getValue(), nid)); +#endif } //-------------------------------------------------------------- settings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_SCANTS_PREVERENCES_SCAN)); @@ -742,6 +744,10 @@ void CScanSetup::addScanMenuManualScan(CMenuWidget *manual_Scan) manual_Scan->addIntroItems(); //---------------------------------------------------------------------- manual_Scan->addItem(satSelect); + if (r_system == DVB_C) { //cable + CIntInput* nid = new CIntInput(LOCALE_SATSETUP_CABLE_NID, (int&) scansettings.cable_nid, 5, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE); + manual_Scan->addItem(new CMenuForwarder(LOCALE_SATSETUP_CABLE_NID, true, nid->getValue(), nid)); + } manual_Scan->addItem(new CMenuForwarder(LOCALE_SCANTS_SELECT_TP, true, NULL, new CTPSelectHandler()/*tpSelect*/, "test", CRCInput::RC_green, NEUTRINO_ICON_BUTTON_GREEN)); manual_Scan->addItem(GenericMenuSeparatorLine); @@ -813,6 +819,10 @@ void CScanSetup::addScanMenuAutoScan(CMenuWidget *auto_Scan) auto_Scan->addIntroItems(); auto_Scan->addItem(satSelect); + if (r_system == DVB_C) { //cable + CIntInput* nid = new CIntInput(LOCALE_SATSETUP_CABLE_NID, (int&) scansettings.cable_nid, 5, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE); + auto_Scan->addItem(new CMenuForwarder(LOCALE_SATSETUP_CABLE_NID, true, nid->getValue(), nid)); + } auto_Scan->addItem(GenericMenuSeparatorLine); //---------------------------------------------------------------------- addListFlagsItems(auto_Scan, 1);