From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Fri, 9 Dec 2005 00:44:40 +0000 (+0000)
Subject: some code cleanup
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=d2e6f12364527def4672a566323654758d8f3d19

some code cleanup
---

diff --git a/data/startwizard.xml b/data/startwizard.xml
index 13799a2..14bcd56 100644
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -1,6 +1,12 @@
 <wizard>
 		<step number="1">
 			<text value="Hello User.\n\nThis start-wizard will guide you through the basic setup of your Dreambox.\n\nPress the OK button on your remote control to move to the next step." />
+			<code>
+self["arrowdown"].moveTo(557, 232, 10)
+self["rc"].moveTo(500, 50, 10)		
+self["arrowdown"].startMoving()
+self["rc"].startMoving()
+			</code>
 		</step>
 		<step number="2">
 			<text value="Bla" />
@@ -25,7 +31,6 @@ self["arrowdown"].clearPath(True)
 self["arrowdown"].addMovePoint(510, 300, 10)
 self["arrowdown"].addMovePoint(610, 300, 10)
 self["arrowdown"].startMoving()
-self["config"].l.setList(self.scanSetupDialog["config"].list)
 			</code>
 		</step>
 		<step number="4">
diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 8922380..c055f31 100644
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -8,7 +8,6 @@ from Components.config import config, configElementBoolean
 from Components.Pixmap import *
 from Components.MenuList import MenuList
 from Components.ConfigList import ConfigList
-from Screens.ScanSetup import ScanSimple
 
 from xml.sax import make_parser
 from xml.sax.handler import ContentHandler
@@ -64,38 +63,27 @@ class WelcomeWizard(Screen, HelpableScreen):
 		HelpableScreen.__init__(self)
 
 		self.wizard = {}
-		print self.wizard
 		parser = make_parser()
 		print "Reading startwizard.xml"
 		wizardHandler = self.parseWizard(self.wizard)
 		parser.setContentHandler(wizardHandler)
 		parser.parse('/usr/share/enigma2/startwizard.xml')
 		
-		print self.wizard
-		
-		self.numSteps = 4
+		self.numSteps = len(self.wizard)
 		self.currStep = 1
 
 		self["text"] = Label()
 		self["rc"] = MovingPixmap()
 		self["arrowdown"] = MovingPixmap()
-		self["arrowdown"].moveTo(557, 232, 10)
 		self["arrowup"] = MovingPixmap()
-		self["rc"].moveTo(500, 50, 10)
+
 		self["config"] = ConfigList([])
-		
-		self.onShown.append(self["arrowdown"].startMoving)
-		self.onShown.append(self["rc"].startMoving)
 
 		self["step"] = Label()
 				
 		self["stepslider"] = Slider(1, self.numSteps)
 		
-		#self.scanSetupDialog = self.session.instantiateDialog(ScanSimple)
-		
 		self.list = []
-		#list.append(("Use wizard to set up basic features", None))
-		#list.append(("Exit wizard", None))
 		self["list"] = MenuList(self.list)
 
 		self.updateValues()