no need to define skin in skin_default.xml and .py files

[enigma2.git] / lib / python / Screens / StartWizard.py

diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py
index f96d38d1f03bcc447c66de000d9e59c755454b75..7f64624ece975141df4f61b1866f2259fcdcdddb 100644 (file)
--- a/lib/python/Screens/StartWizard.py
+++ b/lib/python/Screens/StartWizard.py
@@ -1,31 +1,19 @@
-from Wizard import Wizard, wizardManager
+from Wizard import wizardManager
+from Screens.WizardLanguage import WizardLanguage
 
-from Components.Pixmap import *
-from Components.config import configElementBoolean, config
+from Components.Pixmap import Pixmap, MovingPixmap
+from Components.config import config, ConfigBoolean, configfile
 
 from LanguageSelection import LanguageSelection
+#from DefaultWizard import DefaultWizard
 
-config.misc.firstrun = configElementBoolean("config.misc.firstrun", 1);
+config.misc.firstrun = 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="Arial;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" />                 
-                       <widget name="stepslider" position="50,500" zPosition="1" borderWidth="2" size="440,20" backgroundColor="dark" />
-                       <widget name="wizard" pixmap="/usr/share/enigma2/wizard.png" position="40,50" zPosition="10" size="110,174" transparent="1" alphatest="on"/>
-                       <widget name="rc" pixmap="/usr/share/enigma2/rc.png" position="500,600" zPosition="10" size="154,475" transparent="1" alphatest="on"/>
-                       <widget name="arrowdown" pixmap="/usr/share/enigma2/arrowdown.png" position="0,0" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
-                       <widget name="arrowup" pixmap="/usr/share/enigma2/arrowup.png" position="-100,-100" zPosition="11" size="37,70" transparent="1" alphatest="on"/>
-                       <widget name="arrowup2" pixmap="/usr/share/enigma2/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()
@@ -33,8 +21,10 @@ class StartWizard(Wizard):
                self["arrowup2"] = MovingPixmap()
                
        def markDone(self):
-               config.misc.firstrun.value = 0;
+               config.misc.firstrun.value = 0
                config.misc.firstrun.save()
+               configfile.save()
                
-wizardManager.registerWizard(LanguageSelection, config.misc.firstrun.value)
-wizardManager.registerWizard(StartWizard, config.misc.firstrun.value)
+wizardManager.registerWizard(LanguageSelection, config.misc.languageselected.value, priority = 5)
+#wizardManager.registerWizard(DefaultWizard, config.misc.defaultchosen.value)
+wizardManager.registerWizard(StartWizard, config.misc.firstrun.value, priority = 20)