add a 'priority' for wizard screens to define the run order

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

diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py
index 8f356edc036937ff247b523896a66872003d18bc..a60e3d2ab72adc63da34723d768830495a52a2e0 100644 (file)
--- a/lib/python/Screens/StartWizard.py
+++ b/lib/python/Screens/StartWizard.py
@@ -1,17 +1,21 @@
 from Wizard import Wizard, wizardManager
 
-from Components.Pixmap import *
-from Components.config import configElementBoolean, config, configfile
+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="Regular;23" />
-                       <widget name="list" position="50,300" zPosition="1" size="440,200" />
+                       <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"/>
@@ -33,9 +37,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)