- scan-setup: add addScanMenuFrontendOptions() only once

Conflicts:
	src/gui/scan_setup.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
Fixed build, because of missing locales and members.

data/locale/deutsch.locale

@@ -644,6 +644,8 @@ extra.volume_pos Lautstärkeanzeige
 extra.volume_size Höhe der Anzeige
 extra.west Westen
 extra.zap_cycle Zap nur in Bouquet
+extra.zapit_fe_no_same Verschiedene Tuner bei gleichen Transponder
+extra.zapit_fe_retries Tuning Wiederholungen
 extra.zapit_fe_timeout Tuning Timeout
 extra.zapit_hvoltage High (13.5/18.5) Voltage
 extra.zapit_motor_speed Rotor Drehzeit
@@ -1641,6 +1643,8 @@ menu.hint_scan_fastupdate Aktivieren/Deaktivieren Fastscan Auto-Update
 menu.hint_scan_fec Wählen Sie eine Transponder-FEC
 menu.hint_scan_felink Select tuner to link tuner to
 menu.hint_scan_femode Wählen Sie den Verbindungstyp für den zweiten Tuner
+menu.hint_scan_fenosame Für zwei gleiche CI Module:\nGleichen Tuner nur nutzen bei gleicher Service-ID
+menu.hint_scan_feretries Wiederholungen bei fehlgeschlagenem Tuning
 menu.hint_scan_fesetup Konfigurieren des oder der Tuner
 menu.hint_scan_fetimeout Maximale Wartezeit auf das Signal in 1/10 Sekunden
 menu.hint_scan_freq Geben Sie eine Transponder-Frequenz ein
@@ -2576,7 +2580,7 @@ scants.numberofdataservices Daten
 scants.numberofradioservices Radio
 scants.numberoftotalservices Alle
 scants.numberoftvservices TV
-scants.preverences_receiving_system Grundeinstellungen
+scants.preferences_receiving_system Grundeinstellungen
 scants.provider Anbieter
 scants.select_tp Wählen Sie einen Transponder
 scants.startnow Kanalsuche starten
@@ -2782,6 +2786,7 @@ tunersetup.mode Betriebsmodus
 tunersetup.power 5V-Versorgung bei DVB-T/T2 Kanälen
 tunersetup.sat Satellit (DVB-S/S2)
 tunersetup.terr Terrestrisch (DVB-T/T2)
+tunersetup.tunersetup Tunereinstellungen
 unicable.lnb Unicable Eingang
 unicable.pin Unicable PIN
 unicable.pin_hint PIN (1 - 255) für Benutzerfrequenz\n0 bedeutet inaktiv / aus

data/locale/english.locale

@@ -644,6 +644,8 @@ extra.volume_pos Volumebar
 extra.volume_size Height of display
 extra.west West
 extra.zap_cycle Zap cycle
+extra.zapit_fe_no_same Different tuners when same transponder
+extra.zapit_fe_retries Tune retries
 extra.zapit_fe_timeout Tune timeout
 extra.zapit_hvoltage 18V for rotor moving 
 extra.zapit_motor_speed Motor moving speed
@@ -1641,6 +1643,8 @@ menu.hint_scan_fastupdate Enable/disable fast scan auto-update
 menu.hint_scan_fec Select transponder FEC
 menu.hint_scan_felink Select tuner to link tuner to
 menu.hint_scan_femode Select tuner connection type
+menu.hint_scan_fenosame For two same CI units:\nUse same tuner only at the same service-id
+menu.hint_scan_feretries Number of retries on tuning failure
 menu.hint_scan_fesetup Configure tuner(s)
 menu.hint_scan_fetimeout Time to wait for signal, in 1/10 of second
 menu.hint_scan_freq Enter transponder frequency
@@ -2576,7 +2580,7 @@ scants.numberofdataservices Data
 scants.numberofradioservices Radio
 scants.numberoftotalservices Total
 scants.numberoftvservices TV
-scants.preverences_receiving_system Preferences
+scants.preferences_receiving_system Preferences
 scants.provider Provider:
 scants.select_tp Select transponder
 scants.startnow start scan
@@ -2782,6 +2786,7 @@ tunersetup.mode Operation mode
 tunersetup.power 5V supply on DVB-T/T2 channels
 tunersetup.sat Satellite (DVB-S/S2)
 tunersetup.terr Terrestrial (DVB-T/T2)
+tunersetup.tunersetup Tuner setup
 unicable.lnb Unicable Input
 unicable.pin Unicable PIN
 unicable.pin_hint PIN (1 - 255) for user frequency\n0 means inactive / off

data/locale/nederlands.locale

@@ -2007,7 +2007,7 @@ scants.numberofdataservices Data
 scants.numberofradioservices Radio
 scants.numberoftotalservices Totaal
 scants.numberoftvservices TV
-scants.preverences_receiving_system Voorkeuren
+scants.preferences_receiving_system Voorkeuren
 scants.provider Provider:
 scants.select_tp Selecteer transponder
 scants.startnow start scan

data/locale/slovak.locale

@@ -643,6 +643,7 @@ extra.volume_pos Ukazovateľ hlasitosti
 extra.volume_size Výška zobrazenia
 extra.west Západne
 extra.zap_cycle Cyklické prepínanie
+extra.zapit_fe_no_same Rôzne tunery, keď je rovnaký transpondér
 extra.zapit_fe_timeout Časový limit naladenia (1 = 10 msek)
 extra.zapit_hvoltage 18V pri točení motora
 extra.zapit_motor_speed Rýchlosť točenia (10 = 1st/sek)
@@ -2501,7 +2502,7 @@ scants.numberofdataservices Data
 scants.numberofradioservices Rádio
 scants.numberoftotalservices Celkom
 scants.numberoftvservices TV
-scants.preverences_receiving_system Nastavenia
+scants.preferences_receiving_system Nastavenia
 scants.provider Poskytovateľ:
 scants.select_tp Výber transpondéru
 scants.startnow Spustiť prehľadávanie

src/gui/scan_setup.cpp

@@ -601,7 +601,7 @@ int CScanSetup::showScanMenu()
 
 	//back
 	settings->addIntroItems(/*is_wizard ? NONEXISTANT_LOCALE : */ LOCALE_SERVICEMENU_SCANTS);
-	//----------------------------------------------------------------------
+
 #if 0
 	//save scan settings
 	mf = new CMenuForwarder(LOCALE_MAINSETTINGS_SAVESETTINGSNOW, true, NULL, this, "save_scansettings", CRCInput::RC_red);
@@ -611,7 +611,7 @@ int CScanSetup::showScanMenu()
 	settings->addItem(GenericMenuSeparatorLine);
 	//----------------------------------------------------------------------
 #endif
-	//sat/provider selector
+
 #if 0
 	if(CFEManager::getInstance()->haveSat() || CFEManager::getInstance()->getFrontendCount() > 1) {
 		mf = new CMenuForwarder(LOCALE_SATSETUP_FE_TUNER, allow_start, NULL, this, "setup_frontend", CRCInput::convertDigitToKey(shortcut++));
@@ -619,6 +619,8 @@ int CScanSetup::showScanMenu()
 		settings->addItem(mf);
 	}
 #endif
+
+	//sat/provider selector
 	if (CFEManager::getInstance()->haveSat()) {
 		r_system = ALL_SAT;
 
@@ -640,7 +642,7 @@ int CScanSetup::showScanMenu()
 		//auto scan all
 		CMenuWidget * autoScanAll = new CMenuWidget(LOCALE_SATSETUP_AUTO_SCAN_ALL, NEUTRINO_ICON_SETTINGS, w/*width*/, MN_WIDGET_ID_SCAN_AUTO_SCAN_ALL);
 		addScanMenuAutoScanAll(autoScanAll);
-		fautoScanAll = new CMenuDForwarder(LOCALE_SATSETUP_AUTO_SCAN_ALL, true /*(dmode != NO_DISEQC)*/, NULL, autoScanAll, "", CRCInput::RC_blue);
+		fautoScanAll = new CMenuDForwarder(LOCALE_SATSETUP_AUTO_SCAN_ALL, true /*(dmode != NO_DISEQC)*/, NULL, autoScanAll, "", CRCInput::RC_green);
 		fautoScanAll->setHint("", LOCALE_MENU_HINT_SCAN_AUTOALL);
 		settings->addItem(fautoScanAll);
 
@@ -650,36 +652,31 @@ int CScanSetup::showScanMenu()
 		mf = new CMenuDForwarder(LOCALE_SATSETUP_MANUAL_SCAN, true, NULL, manualScan, "", CRCInput::RC_yellow);
 		mf->setHint("", LOCALE_MENU_HINT_SCAN_MANUAL);
 		settings->addItem(mf);
+
 #ifdef ENABLE_FASTSCAN
 		//fast scan
 		CMenuWidget * fastScanMenu = new CMenuWidget(LOCALE_SATSETUP_FASTSCAN_HEAD, NEUTRINO_ICON_SETTINGS, w, MN_WIDGET_ID_SCAN_FAST_SCAN);
 		addScanMenuFastScan(fastScanMenu);
-		mf = new CMenuDForwarder(LOCALE_SATSETUP_FASTSCAN_HEAD, true, NULL, fastScanMenu, "", CRCInput::RC_0);
+		mf = new CMenuDForwarder(LOCALE_SATSETUP_FASTSCAN_HEAD, true, NULL, fastScanMenu, "", CRCInput::RC_blue);
 		mf->setHint("", LOCALE_MENU_HINT_SCAN_FAST);
 		settings->addItem(mf);
 #endif
+
 #if 0
 		//signal test
 		CMenuWidget * sTest = new CMenuWidget(LOCALE_SCANTS_TEST, NEUTRINO_ICON_SETTINGS, w/*width*/, MN_WIDGET_ID_SCAN_MANUAL_SCAN);
 		addScanMenuManualScan(sTest, true);
-		mf = new CMenuDForwarder(LOCALE_SCANTS_TEST, true, NULL, sTest, "", CRCInput::RC_green);
+		mf = new CMenuDForwarder(LOCALE_SCANTS_TEST, true, NULL, sTest, "", CRCInput::RC_0);
 		mf->setHint("", LOCALE_MENU_HINT_SCAN_TEST);
 		settings->addItem(mf);
 #endif
-		//settings->addItem(GenericMenuSeparatorLine);
 	}
 
 	if (CFEManager::getInstance()->haveCable()) {
 		r_system = ALL_CABLE;
 
 		settings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_TUNERSETUP_CABLE ));
-		//tune timeout
+
-		if(CFEManager::getInstance()->getFrontendCount() <= 1) {
-			CMenuOptionNumberChooser * nc = new CMenuOptionNumberChooser(LOCALE_EXTRA_ZAPIT_FE_TIMEOUT, (int *)&zapitCfg.feTimeout, true, 6, 100);
-			nc->setNumberFormat(std::string("%d00 ") + g_Locale->getText(LOCALE_UNIT_SHORT_MILLISECOND));
-			nc->setHint("", LOCALE_MENU_HINT_SCAN_FETIMEOUT);
-			settings->addItem(nc);
-		}
 		//nid = new CIntInput(LOCALE_SATSETUP_CABLE_NID, (int&) scansettings.cable_nid, 5, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE);
 
 		//auto scan
@@ -700,13 +697,13 @@ int CScanSetup::showScanMenu()
 		mf = new CMenuDForwarder(LOCALE_SATSETUP_MANUAL_SCAN, true, NULL, manualScan, "", have_other ? CRCInput::convertDigitToKey(shortcut++) : CRCInput::RC_yellow);
 		mf->setHint("", LOCALE_MENU_HINT_SCAN_MANUAL);
 		settings->addItem(mf);
+
 		//simple cable scan
 		CMenuWidget * cableScan = new CMenuWidget(LOCALE_SATSETUP_CABLE, NEUTRINO_ICON_SETTINGS, w/*width*/, MN_WIDGET_ID_SCAN_CABLE_SCAN);
 		addScanMenuCable(cableScan);
 		CMenuForwarder * fcableScan = new CMenuDForwarder(LOCALE_SATSETUP_CABLE, true, NULL, cableScan, "", have_other ? CRCInput::convertDigitToKey(shortcut++) : CRCInput::RC_blue);
 		fcableScan->setHint("", LOCALE_MENU_HINT_SCAN_CABLE_SIMPLE);
 		settings->addItem(fcableScan);
-		//settings->addItem(GenericMenuSeparatorLine);
 	}
 
 	if (CFEManager::getInstance()->haveTerr()) {
@@ -714,13 +711,6 @@ int CScanSetup::showScanMenu()
 
 		settings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_TUNERSETUP_TERR ));
 
-		// tune timeout, "Setup tuner" is not shown for only one non-sat tuner
-		if (CFEManager::getInstance()->getFrontendCount() <= 1) {
-			CMenuOptionNumberChooser * nc = new CMenuOptionNumberChooser(LOCALE_EXTRA_ZAPIT_FE_TIMEOUT, (int *)&zapitCfg.feTimeout, true, 6, 100);
-			nc->setHint("", LOCALE_MENU_HINT_SCAN_FETIMEOUT);
-			settings->addItem(nc);
-		}
-
 		//auto scan
 		char autoscan[64];
 		std::string s_capt_part = g_Locale->getText(LOCALE_TERRESTRIALSETUP_PROVIDER);
@@ -740,10 +730,19 @@ int CScanSetup::showScanMenu()
 		mf = new CMenuForwarder(LOCALE_SATSETUP_MANUAL_SCAN, true, NULL, manualScan, "", have_other ? CRCInput::convertDigitToKey(shortcut++) : CRCInput::RC_yellow);
 		mf->setHint("", LOCALE_MENU_HINT_SCAN_MANUAL);
 		settings->addItem(mf);
-		//settings->addItem(GenericMenuSeparatorLine);
 	}
 
-	settings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_SCANTS_PREVERENCES_RECEIVING_SYSTEM ));
+	if (CFEManager::getInstance()->haveCable() || CFEManager::getInstance()->haveTerr())
+	{
+		if (CFEManager::getInstance()->getFrontendCount() <= 1)
+		{
+			// tune timeout, "Setup tuner" is not shown for only one non-sat tuner
+			settings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_TUNERSETUP_TUNERSETUP));
+			addScanMenuFrontendOptions(settings);
+		}
+	}
+
+	settings->addItem(new CMenuSeparator(CMenuSeparator::LINE | CMenuSeparator::STRING, LOCALE_SCANTS_PREFERENCES_RECEIVING_SYSTEM ));
 
 	//service select mode
 	mc = new CMenuOptionChooser(LOCALE_ZAPIT_SCANTYPE, (int *)&scansettings.scanType, SCANTS_ZAPIT_SCANTYPE, SCANTS_ZAPIT_SCANTYPE_COUNT, true, NULL, CRCInput::convertDigitToKey(shortcut++), "", true);
@@ -797,6 +796,22 @@ neutrino_locale_t CScanSetup::getModeLocale(int mode)
 	return lmode;
 }
 
+void CScanSetup::addScanMenuFrontendOptions(CMenuWidget *m)
+{
+	CMenuOptionNumberChooser * nc = new CMenuOptionNumberChooser(LOCALE_EXTRA_ZAPIT_FE_TIMEOUT, (int *)&zapitCfg.feTimeout, true, 6, 100);
+	nc->setNumberFormat(std::string("%d00 ") + g_Locale->getText(LOCALE_UNIT_SHORT_MILLISECOND));
+	nc->setHint("", LOCALE_MENU_HINT_SCAN_FETIMEOUT);
+	m->addItem(nc);
+
+	nc = new CMenuOptionNumberChooser(LOCALE_EXTRA_ZAPIT_FE_RETRIES, (int *)&zapitCfg.feRetries, true, 0, 9);
+	nc->setHint("", LOCALE_MENU_HINT_SCAN_FERETRIES);
+	m->addItem(nc);
+
+	CMenuOptionChooser * mc = new CMenuOptionChooser(LOCALE_EXTRA_ZAPIT_FE_NO_SAME,  (int *)&zapitCfg.noSameFE, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL);
+	mc->setHint("", LOCALE_MENU_HINT_SCAN_FENOSAME);
+	m->addItem(mc);
+}
+
 int CScanSetup::showScanMenuFrontendSetup()
 {
 	CMenuForwarder * mf;
@@ -845,10 +860,7 @@ int CScanSetup::showScanMenuFrontendSetup()
 		if(i != 0)
 			frontendSetup = mf;
 	}
-	CMenuOptionNumberChooser * nc = new CMenuOptionNumberChooser(LOCALE_EXTRA_ZAPIT_FE_TIMEOUT, (int *)&zapitCfg.feTimeout, true, 6, 100);
+	addScanMenuFrontendOptions(setupMenu);
-	nc->setNumberFormat(std::string("%d00 ") + g_Locale->getText(LOCALE_UNIT_SHORT_MILLISECOND));
-	nc->setHint("", LOCALE_MENU_HINT_SCAN_FETIMEOUT);
-	setupMenu->addItem(nc);
 
 	std::string zapit_lat_str;
 	std::string zapit_long_str;
@@ -881,7 +893,7 @@ int CScanSetup::showScanMenuFrontendSetup()
 		mf->setHint("", LOCALE_MENU_HINT_SCAN_LONGITUDE);
 		rotorMenu->addItem(mf);
 
-		nc = new CMenuOptionNumberChooser(LOCALE_SATSETUP_USALS_REPEAT, (int *)&zapitCfg.repeatUsals, true, 0, 10, NULL, CRCInput::convertDigitToKey(shortcut++), NULL, 0, 0, LOCALE_OPTIONS_OFF);
+		CMenuOptionNumberChooser * nc = new CMenuOptionNumberChooser(LOCALE_SATSETUP_USALS_REPEAT, (int *)&zapitCfg.repeatUsals, true, 0, 10, NULL, CRCInput::convertDigitToKey(shortcut++), NULL, 0, 0, LOCALE_OPTIONS_OFF);
 		nc->setHint("", LOCALE_MENU_HINT_SCAN_USALS_REPEAT);
 		rotorMenu->addItem(nc);
 

src/gui/scan_setup.h

@@ -121,6 +121,7 @@ class CScanSetup : public CMenuTarget, public CChangeObserver
  		void addScanMenuManualScan(CMenuWidget *manual_Scan, bool stest = false);
  		void addScanMenuAutoScanAll(CMenuWidget *auto_ScanAll);
  		void addScanMenuAutoScan(CMenuWidget *auto_Scan);
+		void addScanMenuFrontendOptions(CMenuWidget *settings);
 
 		int addScanOptionsItems(CMenuWidget *options_menu, const int &shortcut = 1);
 		int addListFlagsItems(CMenuWidget *listflags_menu, const int &shortcut = 1, bool manual = false);

src/system/locals.h

@@ -671,6 +671,8 @@ typedef enum
 	LOCALE_EXTRA_VOLUME_SIZE,
 	LOCALE_EXTRA_WEST,
 	LOCALE_EXTRA_ZAP_CYCLE,
+	LOCALE_EXTRA_ZAPIT_FE_NO_SAME,
+	LOCALE_EXTRA_ZAPIT_FE_RETRIES,
 	LOCALE_EXTRA_ZAPIT_FE_TIMEOUT,
 	LOCALE_EXTRA_ZAPIT_HVOLTAGE,
 	LOCALE_EXTRA_ZAPIT_MOTOR_SPEED,
@@ -1668,6 +1670,8 @@ typedef enum
 	LOCALE_MENU_HINT_SCAN_FEC,
 	LOCALE_MENU_HINT_SCAN_FELINK,
 	LOCALE_MENU_HINT_SCAN_FEMODE,
+	LOCALE_MENU_HINT_SCAN_FENOSAME,
+	LOCALE_MENU_HINT_SCAN_FERETRIES,
 	LOCALE_MENU_HINT_SCAN_FESETUP,
 	LOCALE_MENU_HINT_SCAN_FETIMEOUT,
 	LOCALE_MENU_HINT_SCAN_FREQ,
@@ -2603,7 +2607,7 @@ typedef enum
 	LOCALE_SCANTS_NUMBEROFRADIOSERVICES,
 	LOCALE_SCANTS_NUMBEROFTOTALSERVICES,
 	LOCALE_SCANTS_NUMBEROFTVSERVICES,
-	LOCALE_SCANTS_PREVERENCES_RECEIVING_SYSTEM,
+	LOCALE_SCANTS_PREFERENCES_RECEIVING_SYSTEM,
 	LOCALE_SCANTS_PROVIDER,
 	LOCALE_SCANTS_SELECT_TP,
 	LOCALE_SCANTS_STARTNOW,
@@ -2809,6 +2813,7 @@ typedef enum
 	LOCALE_TUNERSETUP_POWER,
 	LOCALE_TUNERSETUP_SAT,
 	LOCALE_TUNERSETUP_TERR,
+	LOCALE_TUNERSETUP_TUNERSETUP,
 	LOCALE_UNICABLE_LNB,
 	LOCALE_UNICABLE_PIN,
 	LOCALE_UNICABLE_PIN_HINT,

src/system/locals_intern.h

@@ -671,6 +671,8 @@ const char * locale_real_names[] =
 	"extra.volume_size",
 	"extra.west",
 	"extra.zap_cycle",
+	"extra.zapit_fe_no_same",
+	"extra.zapit_fe_retries",
 	"extra.zapit_fe_timeout",
 	"extra.zapit_hvoltage",
 	"extra.zapit_motor_speed",
@@ -1668,6 +1670,8 @@ const char * locale_real_names[] =
 	"menu.hint_scan_fec",
 	"menu.hint_scan_felink",
 	"menu.hint_scan_femode",
+	"menu.hint_scan_fenosame",
+	"menu.hint_scan_feretries",
 	"menu.hint_scan_fesetup",
 	"menu.hint_scan_fetimeout",
 	"menu.hint_scan_freq",
@@ -2603,7 +2607,7 @@ const char * locale_real_names[] =
 	"scants.numberofradioservices",
 	"scants.numberoftotalservices",
 	"scants.numberoftvservices",
-	"scants.preverences_receiving_system",
+	"scants.preferences_receiving_system",
 	"scants.provider",
 	"scants.select_tp",
 	"scants.startnow",
@@ -2809,6 +2813,7 @@ const char * locale_real_names[] =
 	"tunersetup.power",
 	"tunersetup.sat",
 	"tunersetup.terr",
+	"tunersetup.tunersetup",
 	"unicable.lnb",
 	"unicable.pin",
 	"unicable.pin_hint",