From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Sun, 22 Jan 2006 20:16:21 +0000 (+0000)
Subject: use IDs for jumping in the wizards
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=9265166c3f7a24bc6e9938b8d9a790d31dee5bb4

use IDs for jumping in the wizards
---

diff --git a/data/startwizard.xml b/data/startwizard.xml
index 8d168a5..7e352f0 100644
--- a/data/startwizard.xml
+++ b/data/startwizard.xml
@@ -1,5 +1,5 @@
 <wizard>
-		<step number="1">
+		<step id="welcome">
 			<text value="Welcome.\n\nThis start wizard will guide you through the basic setup of your Dreambox.\nPress the OK button on your remote control to move to the next step." />
 			<code>
 self["arrowdown"].moveTo(557, 232, 1)
@@ -10,10 +10,10 @@ self["rc"].moveTo(500, 50, 1)
 self["rc"].startMoving()
 			</code>
 		</step>
-		<step number="2">
+		<step>
 			<text value="Use the up/down keys on your remote control to select an option. After that, press OK." />
 			<list>
-				<listentry caption="Use wizard to set up basic features" step="next" />
+				<listentry caption="Use wizard to set up basic features" step="nima" />
 				<listentry caption="Exit wizard" step="end" />
 			</list>
 			<code>
@@ -27,7 +27,7 @@ self["rc"].moveTo(500, 50, 1)
 self["rc"].startMoving()
 			</code>
 		</step>
-		<step number="3">
+		<step id="nima">
 			<condition>
 from Components.NimManager import nimmanager
 self.condition = nimmanager.nimCount > 0
@@ -45,7 +45,7 @@ self["arrowdown"].moveTo(740, 355, 1)
 self["arrowdown"].startMoving()
 			</code>
 		</step>
-		<step number="4">
+		<step id="nimb">
 			<condition>
 from Components.NimManager import nimmanager
 self.condition = nimmanager.nimCount > 1
@@ -63,7 +63,7 @@ self["arrowdown"].moveTo(740, 355, 1)
 self["arrowdown"].startMoving()
 			</code>
 		</step>
-		<step number="5">
+		<step id="scanquestion">
 			<text value="Do you want to do a service scan?" />
 			<code>
 self["rc"].moveTo(800, 50, 1)
@@ -74,15 +74,15 @@ self["arrowup2"].moveTo(800, 310, 1)
 self["arrowup2"].startMoving()
 			</code>
 			<list>
-				<listentry caption="Yes, scan now" step="next" />
-				<listentry caption="No, scan later manually" step="7" />
+				<listentry caption="Yes, scan now" step="scan" />
+				<listentry caption="No, scan later manually" step="end" />
 			</list>
 		</step>
-		<step number="6">
+		<step id="scan">
 			<text value="What do you want to scan?" />
 			<config screen="ScanSimple" module="ScanSetup" type="ConfigList" />
 		</step>
-		<step number="7">
+		<step id="end">
 			<text value="Thanks for using the wizard. Your box is now ready to use." />
 		</step>
 </wizard>
diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index e894278..788f29d 100644
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -20,13 +20,18 @@ class Wizard(Screen, HelpableScreen):
 			self.isPointsElement, self.isReboundsElement = 0, 0
 			self.wizard = wizard
 			self.currContent = ""
+			self.lastStep = 0
 		
 		def startElement(self, name, attrs):
 			print name
 			self.currContent = name
 			if (name == "step"):
-				self.lastStep = int(attrs.get('number'))
-				self.wizard[self.lastStep] = {"condition": "", "text": "", "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": ""}
+				self.lastStep += 1
+				if attrs.has_key('id'):
+					id = str(attrs.get('id'))
+				else:
+					id = ""
+				self.wizard[self.lastStep] = {"id": id, "condition": "", "text": "", "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": ""}
 			elif (name == "text"):
 				self.wizard[self.lastStep]["text"] = string.replace(str(attrs.get('value')), "\\n", "\n")
 			elif (name == "listentry"):
@@ -127,6 +132,15 @@ class Wizard(Screen, HelpableScreen):
 		
 	def markDone(self):
 		pass
+	
+	def getStepWithID(self, id):
+		count = 0
+		print self.wizard
+		for x in self.wizard:
+			if self.wizard[x]["id"] == id:
+				return count
+			count += 1
+		return 0
 		
 	def ok(self):
 		print "OK"
@@ -140,12 +154,7 @@ class Wizard(Screen, HelpableScreen):
 		if self.showList:
 			if (len(self.wizard[self.currStep]["list"]) > 0):
 				nextStep = self.wizard[self.currStep]["list"][self["list"].l.getCurrentSelectionIndex()][1]
-				if nextStep == "end":
-					self.currStep = self.numSteps
-				elif nextStep == "next":
-					pass
-				else:
-					self.currStep = int(nextStep) - 1
+				self.currStep = self.getStepWithID(nextStep)
 
 		if (self.currStep == self.numSteps): # wizard finished
 			self.markDone()