X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7d30259cc4f44f65507366600e6238a5decd275f..830d79376a0bc82a7c50930c5dc7d48b35bb8a21:/lib/python/Screens/StartWizard.py

diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py
index 0424771a..d0ece295 100644
--- a/lib/python/Screens/StartWizard.py
+++ b/lib/python/Screens/StartWizard.py
@@ -1,35 +1,21 @@
-from Wizard import Wizard, wizardManager
+from Wizard import wizardManager
+from Screens.WizardLanguage import WizardLanguage
 
 from Components.Pixmap import Pixmap, MovingPixmap
-from Components.config import config, ConfigBoolean, configfile
+from Components.config import config, ConfigBoolean, configfile, ConfigSubsection
 
 from LanguageSelection import LanguageSelection
-#from DefaultWizard import DefaultWizard
 
 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 source="list" render="Listbox" position="50,300" size="440,200" scrollbarMode="showOnDemand" >
-				<convert type="StringList" />
-			</widget>
-			<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>"""
-	
+class StartWizard(WizardLanguage):
 	def __init__(self, session):
-		self.skin = StartWizard.skin
 		self.xmlfile = "startwizard.xml"
-		
-		Wizard.__init__(self, session, showSteps = False)
+		WizardLanguage.__init__(self, session, showSteps = False)
 		self["wizard"] = Pixmap()
 		self["rc"] = MovingPixmap()
 		self["arrowdown"] = MovingPixmap()
@@ -41,7 +27,5 @@ class StartWizard(Wizard):
 		config.misc.firstrun.save()
 		configfile.save()
 		
-wizardManager.registerWizard(LanguageSelection, config.misc.languageselected.value)
-#wizardManager.registerWizard(DefaultWizard, config.misc.defaultchosen.value)
-wizardManager.registerWizard(StartWizard, config.misc.firstrun.value)
-
+wizardManager.registerWizard(LanguageSelection, config.misc.languageselected.value, priority = 5)
+wizardManager.registerWizard(StartWizard, config.misc.firstrun.value, priority = 20)