- start-wizard: remove Astrasat code

Signed-off-by: Thilo Graf <dbt@novatux.de>

data/locale/deutsch.locale

@@ -2902,11 +2902,6 @@ wizard.install_settings Kanalliste für Astra 19.2°E installieren?
 wizard.message_check_for_updates Aktualisierung
 wizard.message_check_for_updates_ask_enable Soll zukünftig automatisch auf Aktualisierungen geprüft werden?\nDie Prüfung erfolgt dann automatisch bei jedem Start.\nDie Prüfung kann jederzeit auch manuell erfolgen und in den Aktualsierungseinstellungen angepasst werden.
 wizard.message_check_for_updates_ask_now Jetzt auf Aktualisierungen prüfen?
-wizard.setup Erste Installation
-wizard.setup_advanced Erweitert
-wizard.setup_easy Einfach
-wizard.setup_type Installationstyp
-wizard.setup_type_hint Wählen Sie einfache Grundeinstellungen oder erweiterte Auswahlmöglichkeiten für die Installation
 wizard.welcome_head Willkommen zur Ersteinrichtung Ihres Receivers!
 wizard.welcome_text Neutrino ist eine von der Tuxbox-Community entwickelte und gepflegte Benutzeroberfläche für Set-Top-Boxen und lebt von der Unterstützung der Nutzer und vielen freiwilligen beitragenden Helfern.\nSollten Sie Hilfe benötigen, Anregungen, Verbesserungsvorschläge haben oder Fehler bemerken,\nkönnen Sie sich gerne auf unseren Supportseiten melden oder Kontakt aufnehmen. Kontakt- bzw. Webaddressen entnehmen Sie bitte hierfür im Hauptmenü unter "Informationen". \nIn den folgenden Schritten wird Sie Neutrino durch die Ersteinrichtung führen.\nSicherheitshinweis:\n Ihre Set-Top-Box lässt sich auch per Webinterface steuern, um zum Beispiel die Timer-Verwaltung zu nutzen oder Live-TV im Web-Browser zu schauen.\nAchten Sie bitte darauf, dass Ihr Gerät nicht von aussen zugänglich ist,\nda sonst ein unbefugter Zugriff über das Internet nicht ausgeschlossen werden kann!\nNächster Schritt?
 word.after nach

data/locale/english.locale

@@ -2902,11 +2902,6 @@ wizard.install_settings Do you want to install channels for Astra 19.2°E?
 wizard.message_check_for_updates Update
 wizard.message_check_for_updates_ask_enable Should updates be checked automatically in future? The check up will run automatically at background on each startup. The check up can also be launched manually at any time and can be adjusted by the update settings.
 wizard.message_check_for_updates_ask_now Now check for updates?
-wizard.setup First installation
-wizard.setup_advanced Advanced
-wizard.setup_easy Easy
-wizard.setup_type Installation type
-wizard.setup_type_hint Easy to setup for CanalDigitaal/TéléSAT/TV Vlaanderen providers or simple cable scan
 wizard.welcome_head Welcome to the Setup Wizard
 wizard.welcome_text Neutrino is designed for set-top boxes and is maintained by the Tuxbox community and lives from the support of users and many volontary contributors./nIf you need help or have  suggestions, found bugs, please feel free to contact us.\nSupport pages or Contact and / or Web addresses can be found in the main menu under "Information".\nNext steps will guide you through initial installation of the device.\nImportant: Your set-top box can be conveniently controlled\nwith the web interface for timer management or live TV on the Web browser.\nDo not make it accessible to untrusted networks!\nDo you want to continue?
 word.after after

src/gui/start_wizard.cpp

@@ -69,14 +69,6 @@ CStartUpWizard::~CStartUpWizard()
 {
 }
 
-#ifdef ENABLE_FASTSCAN
-const CMenuOptionChooser::keyval WIZARD_SETUP_TYPE[] =
-{
-	{ 0, LOCALE_WIZARD_SETUP_EASY },
-	{ 1, LOCALE_WIZARD_SETUP_ADVANCED },
-};
-#endif
-
 int CStartUpWizard::exec(CMenuTarget *parent, const string &/*actionKey*/)
 {
 	// remove menu-timeout during wizard
@@ -107,34 +99,21 @@ int CStartUpWizard::exec(CMenuTarget *parent, const string &/*actionKey*/)
 
 	//if (ShowMsg(LOCALE_WIZARD_WELCOME_HEAD, g_Locale->getText(LOCALE_WIZARD_WELCOME_TEXT), CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbrCancel) == CMsgBox::mbrYes)
 	{
-		int advanced = 1;
-#ifdef ENABLE_FASTSCAN
-		std::string lang = g_settings.language;
-		if (lang == "nederlands")
-		{
-			advanced = 0;
-			CMenuWidget wtype(LOCALE_WIZARD_SETUP);
-			wtype.setWizardMode(SNeutrinoSettings::WIZARD_ON);
-			wtype.addIntroItems();
-			CMenuOptionChooser *mc = new CMenuOptionChooser(LOCALE_WIZARD_SETUP_TYPE, &advanced, WIZARD_SETUP_TYPE, 2, true, NULL);
-			mc->setHint("", LOCALE_WIZARD_SETUP_TYPE_HINT);
-			wtype.addItem(mc);
-			wtype.exec(NULL, "");
-		}
-#endif
 		// open video settings in wizardmode
-		if (advanced && res != menu_return::RETURN_EXIT_ALL)
+		if (res != menu_return::RETURN_EXIT_ALL)
 		{
 			g_videoSettings->setWizardMode(SNeutrinoSettings::WIZARD_ON);
 			res = g_videoSettings->exec(NULL, "");
 			g_videoSettings->setWizardMode(SNeutrinoSettings::WIZARD_OFF);
 		}
-		if (advanced && res != menu_return::RETURN_EXIT_ALL)
+
+		if (res != menu_return::RETURN_EXIT_ALL)
 		{
 			COsdSetup osdSettings(SNeutrinoSettings::WIZARD_ON);
 			res = osdSettings.exec(NULL, "");
 		}
-		if (advanced && res != menu_return::RETURN_EXIT_ALL)
+
+		if (res != menu_return::RETURN_EXIT_ALL)
 		{
 			CNetworkSetup::getInstance()->setWizardMode(SNeutrinoSettings::WIZARD_ON);
 			res = CNetworkSetup::getInstance()->exec(NULL, "");
@@ -143,7 +122,7 @@ int CStartUpWizard::exec(CMenuTarget *parent, const string &/*actionKey*/)
 
 #if ENABLE_PKG_MANAGEMENT
 		// package update check
-		if (advanced && res != menu_return::RETURN_EXIT_ALL)
+		if (res != menu_return::RETURN_EXIT_ALL)
 		{
 			COPKGManager man(SNeutrinoSettings::WIZARD_START);
 			if (man.hasOpkgSupport())
@@ -162,7 +141,7 @@ int CStartUpWizard::exec(CMenuTarget *parent, const string &/*actionKey*/)
 		if (CFEManager::getInstance()->haveSat())
 			init_settings = file_exists(CONFIGDIR "/initial/");
 
-		if (advanced && init_settings && (res != menu_return::RETURN_EXIT_ALL))
+		if (init_settings && res != menu_return::RETURN_EXIT_ALL)
 		{
 			if (ShowMsg(LOCALE_WIZARD_INITIAL_SETTINGS, g_Locale->getText(LOCALE_WIZARD_INSTALL_SETTINGS),
 					CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NULL, 450, 30) == CMsgBox::mbrYes)
@@ -176,32 +155,9 @@ int CStartUpWizard::exec(CMenuTarget *parent, const string &/*actionKey*/)
 		if (res != menu_return::RETURN_EXIT_ALL)
 		{
 			CScanSetup::getInstance()->setWizardMode(SNeutrinoSettings::WIZARD_ON);
-			if (advanced)
-			{
-				res = CScanSetup::getInstance()->exec(NULL, "setup_frontend");
-				if (res != menu_return::RETURN_EXIT_ALL)
-					res = CScanSetup::getInstance()->exec(NULL, "");
-			}
-			else
-			{
-				CZapit::getInstance()->GetConfig(zapitCfg);
-#ifdef ENABLE_FASTSCAN
-				if (CFEManager::getInstance()->haveSat())
-				{
-					CMenuWidget fastScanMenu(LOCALE_SATSETUP_FASTSCAN_HEAD, NEUTRINO_ICON_SETTINGS, 45, MN_WIDGET_ID_SCAN_FAST_SCAN);
-					fastScanMenu.setWizardMode(SNeutrinoSettings::WIZARD_ON);
-					CScanSetup::getInstance()->addScanMenuFastScan(&fastScanMenu);
-					res = fastScanMenu.exec(NULL, "");
-				}
-#endif
-				if (CFEManager::getInstance()->haveCable())
-				{
-					CMenuWidget cableScan(LOCALE_SATSETUP_CABLE, NEUTRINO_ICON_SETTINGS, 45, MN_WIDGET_ID_SCAN_CABLE_SCAN);
-					cableScan.setWizardMode(SNeutrinoSettings::WIZARD_ON);
-					CScanSetup::getInstance()->addScanMenuCable(&cableScan);
-					res = cableScan.exec(NULL, "");
-				}
-			}
+			res = CScanSetup::getInstance()->exec(NULL, "setup_frontend");
+			if (res != menu_return::RETURN_EXIT_ALL)
+				res = CScanSetup::getInstance()->exec(NULL, "");
 			CScanSetup::getInstance()->setWizardMode(SNeutrinoSettings::WIZARD_OFF);
 		}
 	}

src/system/locals.h

@@ -2929,11 +2929,6 @@ typedef enum
 	LOCALE_WIZARD_MESSAGE_CHECK_FOR_UPDATES,
 	LOCALE_WIZARD_MESSAGE_CHECK_FOR_UPDATES_ASK_ENABLE,
 	LOCALE_WIZARD_MESSAGE_CHECK_FOR_UPDATES_ASK_NOW,
-	LOCALE_WIZARD_SETUP,
-	LOCALE_WIZARD_SETUP_ADVANCED,
-	LOCALE_WIZARD_SETUP_EASY,
-	LOCALE_WIZARD_SETUP_TYPE,
-	LOCALE_WIZARD_SETUP_TYPE_HINT,
 	LOCALE_WIZARD_WELCOME_HEAD,
 	LOCALE_WIZARD_WELCOME_TEXT,
 	LOCALE_WORD_AFTER,

src/system/locals_intern.h

@@ -2929,11 +2929,6 @@ const char * locale_real_names[] =
 	"wizard.message_check_for_updates",
 	"wizard.message_check_for_updates_ask_enable",
 	"wizard.message_check_for_updates_ask_now",
-	"wizard.setup",
-	"wizard.setup_advanced",
-	"wizard.setup_easy",
-	"wizard.setup_type",
-	"wizard.setup_type_hint",
 	"wizard.welcome_head",
 	"wizard.welcome_text",
 	"word.after",