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

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 610dd295..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": ""}
+				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"):
@@ -38,18 +43,29 @@ class Wizard(Screen, HelpableScreen):
 					print "has args"
 					self.wizard[self.lastStep]["config"]["args"] = str(attrs.get('args'))
 				self.wizard[self.lastStep]["config"]["type"] = str(attrs.get('type'))
+			elif (name == "code"):
+				if attrs.has_key('pos') and str(attrs.get('pos')) == "after":
+					self.codeafter = True
+				else:
+					self.codeafter = False
 			elif (name == "condition"):
 				pass
 		def endElement(self, name):
 			self.currContent = ""
 			if name == 'code':
-				self.wizard[self.lastStep]["code"] = self.wizard[self.lastStep]["code"].strip()
+				if self.codeafter:
+					self.wizard[self.lastStep]["codeafter"] = self.wizard[self.lastStep]["codeafter"].strip()
+				else:
+					self.wizard[self.lastStep]["code"] = self.wizard[self.lastStep]["code"].strip()
 			elif name == 'condition':
 				self.wizard[self.lastStep]["condition"] = self.wizard[self.lastStep]["condition"].strip()
 								
 		def characters(self, ch):
 			if self.currContent == "code":
-				 self.wizard[self.lastStep]["code"] = self.wizard[self.lastStep]["code"] + ch
+				if self.codeafter:
+					self.wizard[self.lastStep]["codeafter"] = self.wizard[self.lastStep]["codeafter"] + ch
+				else:
+					self.wizard[self.lastStep]["code"] = self.wizard[self.lastStep]["code"] + ch
 			elif self.currContent == "condition":
 				 self.wizard[self.lastStep]["condition"] = self.wizard[self.lastStep]["condition"] + ch
 	def __init__(self, session, showSteps = True, showStepSlider = True, showList = True, showConfig = True):
@@ -116,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"
@@ -129,17 +153,13 @@ 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()
 			self.session.close()
 		else:
+			self.runCode(self.wizard[self.currStep]["codeafter"])
 			self.currStep += 1
 			self.updateValues()
 			
@@ -173,6 +193,11 @@ class Wizard(Screen, HelpableScreen):
 			self["list"].instance.moveSelection(self["list"].instance.moveDown)
 		print "down"
 		
+	def runCode(self, code):
+		if code != "":
+			print "code", code
+			exec(code)
+		
 	def updateValues(self):
 		print "Updating values in step " + str(self.currStep)
 		
@@ -184,12 +209,10 @@ 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"]))
 	
-			if self.wizard[self.currStep]["code"] != "":
-				print self.wizard[self.currStep]["code"]
-				exec(self.wizard[self.currStep]["code"])
+			self.runCode(self.wizard[self.currStep]["code"])
 			
 			if self.showList:
 				self["list"].instance.setZPosition(1)
@@ -208,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: