X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/98208302bd3bdbf99ab801260bf8d023035d8d41..55b9e8af49d4f89639f87f92657975f194b6161d:/lib/python/Screens/Wizard.py

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index e894278d..43931576 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
+			print "startElement", 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,14 @@ class Wizard(Screen, HelpableScreen):
 		
 	def markDone(self):
 		pass
+	
+	def getStepWithID(self, id):
+		count = 0
+		for x in self.wizard:
+			if self.wizard[x]["id"] == id:
+				return count
+			count += 1
+		return 0
 		
 	def ok(self):
 		print "OK"
@@ -140,12 +153,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()
@@ -187,7 +195,7 @@ class Wizard(Screen, HelpableScreen):
 		
 	def runCode(self, code):
 		if code != "":
-			print code
+			print "code", code
 			exec(code)
 		
 	def updateValues(self):
@@ -201,7 +209,7 @@ class Wizard(Screen, HelpableScreen):
 			if self.showStepSlider:
 				self["stepslider"].setValue(self.currStep)
 		
-			print _(self.wizard[self.currStep]["text"])
+			print "wizard text", _(self.wizard[self.currStep]["text"])
 			self["text"].setText(_(self.wizard[self.currStep]["text"]))
 	
 			self.runCode(self.wizard[self.currStep]["code"])
@@ -223,7 +231,7 @@ class Wizard(Screen, HelpableScreen):
 						self.session.openWithCallback(self.ok, self.wizard[self.currStep]["config"]["screen"])
 					else:
 						self["config"].instance.setZPosition(2)
-						print self.wizard[self.currStep]["config"]["screen"]
+						print "wizard screen", self.wizard[self.currStep]["config"]["screen"]
 						if self.wizard[self.currStep]["config"]["args"] == None:
 							self.configInstance = self.session.instantiateDialog(self.wizard[self.currStep]["config"]["screen"])
 						else: