X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FStartWizard.py;h=aab81f634c6a7dc0476918d646b4887f2ac93f38;hp=8fc4ecdfddddb790521e0fe4ef103067d9a85de9;hb=80a99b08bd6e0932a420e805d928dc5ae5b80f61;hpb=08fca93e7f2a37a452399d08c5c84b969b7e52af

diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py
index 8fc4ecd..aab81f6 100644
--- a/lib/python/Screens/StartWizard.py
+++ b/lib/python/Screens/StartWizard.py
@@ -1,42 +1,32 @@
-from Wizard import Wizard, wizardManager
+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 *
-from Components.config import configElementBoolean, config, configfile
+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 = configElementBoolean("config.misc.firstrun", 1);
-config.misc.languageselected = configElementBoolean("config.misc.languageselected", 1);
+config.misc.firstrun = ConfigBoolean(default = True)
+config.misc.startwizard = ConfigSubsection()
+config.misc.startwizard.shownimconfig = ConfigBoolean(default = True)
+config.misc.startwizard.doservicescan = ConfigBoolean(default = True)
+config.misc.languageselected = ConfigBoolean(default = True)
 
-class StartWizard(Wizard):
-	skin = """
-		<screen position="0,0" size="720,576" title="Welcome..." flags="wfNoBorder" >
-			<widget name="text" position="153,50" size="340,270" font="Regular;23" />
-			<widget name="list" position="50,300" zPosition="1" size="440,200" />
-			<widget name="config" position="50,300" zPosition="1" size="440,200" transparent="1" scrollbarMode="showOnDemand" />			
-			<widget name="stepslider" position="50,500" zPosition="1" borderWidth="2" size="440,20" backgroundColor="dark" />
-			<widget name="wizard" pixmap="wizard.png" position="40,50" zPosition="10" size="110,174" transparent="1" alphatest="on"/>
-			<widget name="rc" pixmap="rc.png" position="500,600" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
-			<widget name="arrowdown" pixmap="arrowdown.png" position="0,0" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
-			<widget name="arrowup" pixmap="arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
-			<widget name="arrowup2" pixmap="arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
-		</screen>"""
-	
-	def __init__(self, session):
-		self.skin = StartWizard.skin
-		self.xmlfile = "startwizard.xml"
-		
-		Wizard.__init__(self, session, showSteps = False)
+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)
-wizardManager.registerWizard(StartWizard, config.misc.firstrun.value)
+wizardManager.registerWizard(LanguageWizard, config.misc.languageselected.value, priority = 5)
+wizardManager.registerWizard(StartWizard, config.misc.firstrun.value, priority = 20)