X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FStartWizard.py;h=a60e3d2ab72adc63da34723d768830495a52a2e0;hp=56a09abebd1a00ee75ceef08d5acd14eb33c6b98;hb=5bc8209d19e1d41f289cfe198e4e3a839adf894b;hpb=a377b6ea97e78df6256d23fc128c17c680574d44

diff --git a/lib/python/Screens/StartWizard.py b/lib/python/Screens/StartWizard.py
index 56a09ab..a60e3d2 100644
--- a/lib/python/Screens/StartWizard.py
+++ b/lib/python/Screens/StartWizard.py
@@ -1,39 +1,46 @@
 from Wizard import Wizard, wizardManager
 
-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,560" title="Welcome..." flags="wfNoBorder" >
-			<widget name="text" position="50,100" size="440,200" 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="step" position="50,50" size="440,25" font="Arial;23" />
+		<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="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"/>
+			<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)
+		Wizard.__init__(self, session, showSteps = False)
+		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.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)