X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a377b6ea97e78df6256d23fc128c17c680574d44..f4a635a25517d6e644e43537d10b894eab3e524e:/lib/python/Screens/Wizard.py

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 20aa4970..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,21 +43,32 @@ 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):
+	def __init__(self, session, showSteps = True, showStepSlider = True, showList = True, showConfig = True):
 		Screen.__init__(self, session)
 		HelpableScreen.__init__(self)
 
@@ -65,13 +81,16 @@ class Wizard(Screen, HelpableScreen):
 
 		self.showSteps = showSteps
 		self.showStepSlider = showStepSlider
+		self.showList = showList
+		self.showConfig = showConfig
 
 		self.numSteps = len(self.wizard)
 		self.currStep = 1
 
 		self["text"] = Label()
 
-		self["config"] = ConfigList([])
+		if showConfig:
+			self["config"] = ConfigList([])
 
 		if self.showSteps:
 			self["step"] = Label()
@@ -79,8 +98,9 @@ class Wizard(Screen, HelpableScreen):
 		if self.showStepSlider:
 			self["stepslider"] = Slider(1, self.numSteps)
 		
-		self.list = []
-		self["list"] = MenuList(self.list)
+		if self.showList:
+			self.list = []
+			self["list"] = MenuList(self.list)
 
 		self.onShown.append(self.updateValues)
 		
@@ -103,11 +123,6 @@ class Wizard(Screen, HelpableScreen):
 			"9": self.keyNumberGlobal,
 			"0": self.keyNumberGlobal
 		}, -1)
-		
-		#self["actions"] = HelpableActionMap(self, "OkCancelActions",
-			#{
-				#"ok": (self.ok, _("Close this Screen...")),
-			#})
 
 	def back(self):
 		self.currStep -= 1
@@ -117,28 +132,34 @@ 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"
-		if (self.wizard[self.currStep]["config"]["screen"] != None):
-			try: # don't die, if no run() is available
-				self.configInstance.run()
-			except:
-				print "Failed to run configInstance"
+		if self.showConfig:
+			if (self.wizard[self.currStep]["config"]["screen"] != None):
+				try: # don't die, if no run() is available
+					self.configInstance.run()
+				except:
+					print "Failed to run configInstance"
 		
-		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
+		if self.showList:
+			if (len(self.wizard[self.currStep]["list"]) > 0):
+				nextStep = self.wizard[self.currStep]["list"][self["list"].l.getCurrentSelectionIndex()][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()
 			
@@ -159,19 +180,24 @@ class Wizard(Screen, HelpableScreen):
 		print "right"
 
 	def up(self):
-		if (self.wizard[self.currStep]["config"]["screen"] != None):
-			self["config"].instance.moveSelection(self["config"].instance.moveUp)
-		elif (len(self.wizard[self.currStep]["list"]) > 0):
+		if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None):
+				self["config"].instance.moveSelection(self["config"].instance.moveUp)
+		elif (self.showList and len(self.wizard[self.currStep]["list"]) > 0):
 			self["list"].instance.moveSelection(self["list"].instance.moveUp)
 		print "up"
 		
 	def down(self):
-		if (self.wizard[self.currStep]["config"]["screen"] != None):
+		if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None):
 			self["config"].instance.moveSelection(self["config"].instance.moveDown)
-		elif (len(self.wizard[self.currStep]["list"]) > 0):
+		elif (self.showList and len(self.wizard[self.currStep]["list"]) > 0):
 			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)
 		
@@ -183,37 +209,37 @@ 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"])
 			
-			self["list"].instance.setZPosition(1)
-			self.list = []
-			if (len(self.wizard[self.currStep]["list"]) > 0):
-				self["list"].instance.setZPosition(2)
-				for x in self.wizard[self.currStep]["list"]:
-					self.list.append((_(x[0]), None))
-			self["list"].l.setList(self.list)
+			if self.showList:
+				self["list"].instance.setZPosition(1)
+				self.list = []
+				if (len(self.wizard[self.currStep]["list"]) > 0):
+					self["list"].instance.setZPosition(2)
+					for x in self.wizard[self.currStep]["list"]:
+						self.list.append((_(x[0]), None))
+				self["list"].l.setList(self.list)
 	
-			self["config"].instance.setZPosition(1)
-			if (self.wizard[self.currStep]["config"]["screen"] != None):
-				if self.wizard[self.currStep]["config"]["type"] == "standalone":
-					print "Type is standalone"
-					self.session.openWithCallback(self.ok, self.wizard[self.currStep]["config"]["screen"])
-				else:
-					self["config"].instance.setZPosition(2)
-					print 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"])
+			if self.showConfig:
+				self["config"].instance.setZPosition(1)
+				if (self.wizard[self.currStep]["config"]["screen"] != None):
+					if self.wizard[self.currStep]["config"]["type"] == "standalone":
+						print "Type is standalone"
+						self.session.openWithCallback(self.ok, self.wizard[self.currStep]["config"]["screen"])
 					else:
-						self.configInstance = self.session.instantiateDialog(self.wizard[self.currStep]["config"]["screen"], eval(self.wizard[self.currStep]["config"]["args"]))
-					self["config"].l.setList(self.configInstance["config"].list)
-					self.configInstance["config"] = self["config"]
-			else:
-				self["config"].l.setList([])
+						self["config"].instance.setZPosition(2)
+						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:
+							self.configInstance = self.session.instantiateDialog(self.wizard[self.currStep]["config"]["screen"], eval(self.wizard[self.currStep]["config"]["args"]))
+						self["config"].l.setList(self.configInstance["config"].list)
+						self.configInstance["config"] = self["config"]
+				else:
+					self["config"].l.setList([])
 		else: # condition false
 				self.currStep += 1
 				self.updateValues()