X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ac203607d047ed489f339ab211907d1d1a1ff133..15171632716c0734526eefc55e3d0601be177b45:/lib/python/Screens/StartWizard.py

diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py
index d0ece295..aab81f63 100644
--- a/lib/python/Screens/StartWizard.py
+++ b/lib/python/Screens/StartWizard.py
@@ -1,10 +1,13 @@
 from Wizard import wizardManager
 from Screens.WizardLanguage import WizardLanguage
+from Screens.ScanSetup import DefaultSatLists
+from Screens.DefaultWizard import DefaultWizard
+from Screens.Rc import Rc
 
-from Components.Pixmap import Pixmap, MovingPixmap
+from Components.Pixmap import Pixmap, MovingPixmap, MultiPixmap
 from Components.config import config, ConfigBoolean, configfile, ConfigSubsection
 
-from LanguageSelection import LanguageSelection
+from LanguageSelection import LanguageWizard
 
 config.misc.firstrun = ConfigBoolean(default = True)
 config.misc.startwizard = ConfigSubsection()
@@ -12,20 +15,18 @@ config.misc.startwizard.shownimconfig = ConfigBoolean(default = True)
 config.misc.startwizard.doservicescan = ConfigBoolean(default = True)
 config.misc.languageselected = ConfigBoolean(default = True)
 
-class StartWizard(WizardLanguage):
-	def __init__(self, session):
-		self.xmlfile = "startwizard.xml"
+class StartWizard(DefaultSatLists, Rc):
+	def __init__(self, session, silent = True, showSteps = False, neededTag = None):
+		self.xmlfile = ["startwizard.xml", "defaultsatlists.xml"]
 		WizardLanguage.__init__(self, session, showSteps = False)
+		DefaultWizard.__init__(self, session, silent, showSteps, neededTag = "services")
+		Rc.__init__(self)
 		self["wizard"] = Pixmap()
-		self["rc"] = MovingPixmap()
-		self["arrowdown"] = MovingPixmap()
-		self["arrowup"] = MovingPixmap()
-		self["arrowup2"] = MovingPixmap()
-		
+				
 	def markDone(self):
 		config.misc.firstrun.value = 0
 		config.misc.firstrun.save()
 		configfile.save()
 		
-wizardManager.registerWizard(LanguageSelection, config.misc.languageselected.value, priority = 5)
+wizardManager.registerWizard(LanguageWizard, config.misc.languageselected.value, priority = 5)
 wizardManager.registerWizard(StartWizard, config.misc.firstrun.value, priority = 20)