X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1334dd393c3e099c9196a0f6935aac696bdcf661..90a6f5184efbee4252e015a82aecd296749bcad3:/lib/python/Screens/Wizard.py

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index e574f861..9f87ee31 100644
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -3,7 +3,7 @@ from Screen import Screen
 import string
 
 from Screens.HelpMenu import HelpableScreen
-from Components.config import config
+from Components.config import config, KEY_LEFT, KEY_RIGHT, KEY_DELETE, KEY_BACKSPACE
 from Components.Label import Label
 from Components.Slider import Slider
 from Components.ActionMap import NumberActionMap
@@ -45,21 +45,20 @@ class WizardSummary(Screen):
 	def setText(self, text):
 		self["text"].setText(text)
 
-class Wizard(Screen, HelpableScreen):
+class Wizard(Screen):
+	def createSummary(self):
+			print "WizardCreateSummary"
+			return WizardSummary
 
 	class parseWizard(ContentHandler):
 		def __init__(self, wizard):
 			self.isPointsElement, self.isReboundsElement = 0, 0
 			self.wizard = wizard
 			self.currContent = ""
-			self.lastStep = 0
-			
-		def createSummary(self):
-			print "WizardCreateSummary"
-			return WizardSummary
-		
+			self.lastStep = 0	
+
 		def startElement(self, name, attrs):
-			print "startElement", name
+			#print "startElement", name
 			self.currContent = name
 			if (name == "step"):
 				self.lastStep += 1
@@ -67,7 +66,7 @@ class Wizard(Screen, HelpableScreen):
 					id = str(attrs.get('id'))
 				else:
 					id = ""
-				print "id:", id
+				#print "id:", id
 				if attrs.has_key('nextstep'):
 					nextstep = str(attrs.get('nextstep'))
 				else:
@@ -96,19 +95,29 @@ class Wizard(Screen, HelpableScreen):
 						self.wizard[self.lastStep]["dynamiclist"] = attrs.get("source")
 					#self.wizard[self.lastStep]["list"].append(("Hallo", "test"))
 				if (attrs.has_key("evaluation")):
-					print "evaluation"
+					#print "evaluation"
 					self.wizard[self.lastStep]["listevaluation"] = attrs.get("evaluation")
 				if (attrs.has_key("onselect")):
 					self.wizard[self.lastStep]["onselect"] = attrs.get("onselect")			
 			elif (name == "listentry"):
 				self.wizard[self.lastStep]["list"].append((str(attrs.get('caption')), str(attrs.get('step'))))
 			elif (name == "config"):
-				exec "from Screens." + str(attrs.get('module')) + " import *"
-				self.wizard[self.lastStep]["config"]["screen"] = eval(str(attrs.get('screen')))
-				if (attrs.has_key('args')):
-					print "has args"
-					self.wizard[self.lastStep]["config"]["args"] = str(attrs.get('args'))
-				self.wizard[self.lastStep]["config"]["type"] = str(attrs.get('type'))
+				type = str(attrs.get('type'))
+				self.wizard[self.lastStep]["config"]["type"] = type
+				if type == "ConfigList" or type == "standalone":
+					try:
+						exec "from Screens." + str(attrs.get('module')) + " import *"
+					except:
+						exec "from " + str(attrs.get('module')) + " import *"
+				
+					self.wizard[self.lastStep]["config"]["screen"] = eval(str(attrs.get('screen')))
+					if (attrs.has_key('args')):
+						#print "has args"
+						self.wizard[self.lastStep]["config"]["args"] = str(attrs.get('args'))
+				elif type == "dynamic":
+					self.wizard[self.lastStep]["config"]["source"] = str(attrs.get('source'))
+					if (attrs.has_key('evaluation')):
+						self.wizard[self.lastStep]["config"]["evaluation"] = str(attrs.get('evaluation'))
 			elif (name == "code"):
 				if attrs.has_key('pos') and str(attrs.get('pos')) == "after":
 					self.codeafter = True
@@ -116,6 +125,7 @@ class Wizard(Screen, HelpableScreen):
 					self.codeafter = False
 			elif (name == "condition"):
 				pass
+			
 		def endElement(self, name):
 			self.currContent = ""
 			if name == 'code':
@@ -126,7 +136,8 @@ class Wizard(Screen, HelpableScreen):
 			elif name == 'condition':
 				self.wizard[self.lastStep]["condition"] = self.wizard[self.lastStep]["condition"].strip()
 			elif name == 'step':
-				print "Step number", self.lastStep, ":", self.wizard[self.lastStep]
+				#print "Step number", self.lastStep, ":", self.wizard[self.lastStep]
+				pass
 								
 		def characters(self, ch):
 			if self.currContent == "code":
@@ -139,19 +150,21 @@ class Wizard(Screen, HelpableScreen):
 
 	def __init__(self, session, showSteps = True, showStepSlider = True, showList = True, showConfig = True):
 		Screen.__init__(self, session)
-		HelpableScreen.__init__(self)
 
 		self.stepHistory = []
 
 		self.wizard = {}
 		parser = make_parser()
-		print "Reading " + self.xmlfile
+		if not isinstance(self.xmlfile, list):
+			self.xmlfile = [self.xmlfile]
+		print "Reading ", self.xmlfile
 		wizardHandler = self.parseWizard(self.wizard)
 		parser.setContentHandler(wizardHandler)
-		if self.xmlfile[0] != '/':
-			parser.parse('/usr/share/enigma2/' + self.xmlfile)
-		else:
-			parser.parse(self.xmlfile)
+		for xmlfile in self.xmlfile:
+			if xmlfile[0] != '/':
+				parser.parse('/usr/share/enigma2/' + xmlfile)
+			else:
+				parser.parse(xmlfile)
 
 		self.showSteps = showSteps
 		self.showStepSlider = showStepSlider
@@ -159,15 +172,15 @@ class Wizard(Screen, HelpableScreen):
 		self.showConfig = showConfig
 
 		self.numSteps = len(self.wizard)
-		self.currStep = 1
+		self.currStep = self.getStepWithID("start") + 1
 		
 		self.timeoutTimer = eTimer()
-		self.timeoutTimer.timeout.get().append(self.timeoutCounterFired)
+		self.timeoutTimer.callback.append(self.timeoutCounterFired)
 
 		self["text"] = Label()
 
 		if showConfig:
-			self["config"] = ConfigList([])
+			self["config"] = ConfigList([], session = session)
 
 		if self.showSteps:
 			self["step"] = Label()
@@ -187,7 +200,9 @@ class Wizard(Screen, HelpableScreen):
 		
 		self.lcdCallbacks = []
 		
-		self["actions"] = NumberActionMap(["WizardActions", "NumberActions"],
+		self.disableKeys = False
+		
+		self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions", "SetupActions"],
 		{
 			"ok": self.ok,
 			"back": self.back,
@@ -195,6 +210,12 @@ class Wizard(Screen, HelpableScreen):
 			"right": self.right,
 			"up": self.up,
 			"down": self.down,
+			"red": self.red,
+			"green": self.green,
+			"yellow": self.yellow,
+			"blue":self.blue,
+			"deleteBackward": self.deleteBackward,
+			"deleteForward": self.deleteForward,
 			"1": self.keyNumberGlobal,
 			"2": self.keyNumberGlobal,
 			"3": self.keyNumberGlobal,
@@ -206,17 +227,56 @@ class Wizard(Screen, HelpableScreen):
 			"9": self.keyNumberGlobal,
 			"0": self.keyNumberGlobal
 		}, -1)
+		
+	def red(self):
+		print "red"
+		pass
 
+	def green(self):
+		print "green"
+		pass
+	
+	def yellow(self):
+		print "yellow"
+		pass
+	
+	def blue(self):
+		print "blue"
+		pass
+	
+	def deleteForward(self):
+		self.resetCounter()
+		if (self.wizard[self.currStep]["config"]["screen"] != None):
+			self.configInstance.keyDelete()
+		elif (self.wizard[self.currStep]["config"]["type"] == "dynamic"):
+			self["config"].handleKey(KEY_DELETE)
+		print "deleteForward"
+
+	def deleteBackward(self):
+		self.resetCounter()
+		if (self.wizard[self.currStep]["config"]["screen"] != None):
+			self.configInstance.keyBackspace()
+		elif (self.wizard[self.currStep]["config"]["type"] == "dynamic"):
+			self["config"].handleKey(KEY_BACKSPACE)
+		print "deleteBackward"
+	
 	def setLCDTextCallback(self, callback):
 		self.lcdCallbacks.append(callback)
 
 	def back(self):
+		if self.disableKeys:
+			return
+		print "getting back..."
+		print "stepHistory:", self.stepHistory
 		if len(self.stepHistory) > 1:
 			self.currStep = self.stepHistory[-2]
 			self.stepHistory = self.stepHistory[:-2]
 		if self.currStep < 1:
 			self.currStep = 1
+		print "currStep:", self.currStep
+		print "new stepHistory:", self.stepHistory
 		self.updateValues()
+		print "after updateValues stepHistory:", self.stepHistory
 		
 	def markDone(self):
 		pass
@@ -224,7 +284,7 @@ class Wizard(Screen, HelpableScreen):
 	def getStepWithID(self, id):
 		print "getStepWithID:", id
 		count = 0
-		for x in self.wizard:
+		for x in self.wizard.keys():
 			if self.wizard[x]["id"] == id:
 				print "result:", count
 				return count
@@ -238,6 +298,10 @@ class Wizard(Screen, HelpableScreen):
 
 		if self.updateValues not in self.onShown:
 			self.onShown.append(self.updateValues)
+			
+		if self.showConfig:
+			if self.wizard[currStep]["config"]["type"] == "dynamic":
+				eval("self." + self.wizard[currStep]["config"]["evaluation"])()
 
 		if self.showList:
 			if (len(self.wizard[currStep]["evaluatedlist"]) > 0):
@@ -248,7 +312,8 @@ class Wizard(Screen, HelpableScreen):
 				else:
 					self.currStep = self.getStepWithID(nextStep)
 
-		if (currStep == self.numSteps): # wizard finished
+		if ((currStep == self.numSteps and self.wizard[currStep]["nextstep"] is None) or self.wizard[currStep]["id"] == "end"): # wizard finished
+			print "wizard finished"
 			self.markDone()
 			self.close()
 		else:
@@ -265,6 +330,8 @@ class Wizard(Screen, HelpableScreen):
 
 	def ok(self):
 		print "OK"
+		if self.disableKeys:
+			return
 		currStep = self.currStep
 		
 		if self.showConfig:
@@ -289,30 +356,34 @@ class Wizard(Screen, HelpableScreen):
 		self.resetCounter()
 		if (self.wizard[self.currStep]["config"]["screen"] != None):
 			self.configInstance.keyLeft()
+		elif (self.wizard[self.currStep]["config"]["type"] == "dynamic"):
+			self["config"].handleKey(KEY_LEFT)
 		print "left"
 	
 	def right(self):
 		self.resetCounter()
 		if (self.wizard[self.currStep]["config"]["screen"] != None):
 			self.configInstance.keyRight()
+		elif (self.wizard[self.currStep]["config"]["type"] == "dynamic"):
+			self["config"].handleKey(KEY_RIGHT)	
 		print "right"
 
 	def up(self):
 		self.resetCounter()
-		if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None):
+		if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None  or self.wizard[self.currStep]["config"]["type"] == "dynamic"):
 				self["config"].instance.moveSelection(self["config"].instance.moveUp)
 		elif (self.showList and len(self.wizard[self.currStep]["evaluatedlist"]) > 0):
 			self["list"].selectPrevious()
 			if self.wizard[self.currStep].has_key("onselect"):
 				print "current:", self["list"].current
-				self.selection = self["list"].current[1]
+				self.selection = self["list"].current[-1]
 				#self.selection = self.wizard[self.currStep]["evaluatedlist"][self["list"].l.getCurrentSelectionIndex()][1]
 				exec("self." + self.wizard[self.currStep]["onselect"] + "()")
 		print "up"
 		
 	def down(self):
 		self.resetCounter()
-		if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None):
+		if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None  or self.wizard[self.currStep]["config"]["type"] == "dynamic"):
 			self["config"].instance.moveSelection(self["config"].instance.moveDown)
 		elif (self.showList and len(self.wizard[self.currStep]["evaluatedlist"]) > 0):
 			#self["list"].instance.moveSelection(self["list"].instance.moveDown)
@@ -321,7 +392,7 @@ class Wizard(Screen, HelpableScreen):
 				print "current:", self["list"].current
 				#self.selection = self.wizard[self.currStep]["evaluatedlist"][self["list"].l.getCurrentSelectionIndex()][1]
 				#exec("self." + self.wizard[self.currStep]["onselect"] + "()")
-				self.selection = self["list"].current[1]
+				self.selection = self["list"].current[-1]
 				#self.selection = self.wizard[self.currStep]["evaluatedlist"][self["list"].l.getCurrentSelectionIndex()][1]
 				exec("self." + self.wizard[self.currStep]["onselect"] + "()")
 		print "down"
@@ -330,10 +401,10 @@ class Wizard(Screen, HelpableScreen):
 		self.resetCounter()
 		
 		if (self.showConfig and self.wizard[self.currStep]["config"]["screen"] != None):
-				self["config"].instance.moveSelection(self["config"].instance.moveUp)
+			self["config"].instance.moveSelection(self["config"].instance.moveUp)
 		elif (self.showList and len(self.wizard[self.currStep]["evaluatedlist"]) > 0):
 			if self.wizard[self.currStep].has_key("onselect"):
-				self.selection = self["list"].current[1]
+				self.selection = self["list"].current[-1]
 				print "self.selection:", self.selection
 				exec("self." + self.wizard[self.currStep]["onselect"] + "()")
 		
@@ -345,8 +416,11 @@ class Wizard(Screen, HelpableScreen):
 			print "code", code
 			exec(code)
 			
+	def getTranslation(self, text):
+		return _(text)
+			
 	def updateText(self, firstset = False):
-		text = _(self.wizard[self.currStep]["text"])
+		text = self.getTranslation(self.wizard[self.currStep]["text"])
 		if text.find("[timeout]") != -1:
 			text = text.replace("[timeout]", str(self.timeoutCounter))
 			self["text"].setText(text)
@@ -356,9 +430,18 @@ class Wizard(Screen, HelpableScreen):
 		
 	def updateValues(self):
 		print "Updating values in step " + str(self.currStep)
+		# calling a step which doesn't exist can only happen if the condition in the last step is not fulfilled
+		# if a non-existing step is called, end the wizard 
+		if self.currStep > len(self.wizard):
+			self.markDone()
+			self.close()
+			return
+
 		self.timeoutTimer.stop()
 		
 		if self.configInstance is not None:
+			# remove callbacks
+			self.configInstance["config"].onSelectionChanged = []
 			del self.configInstance["config"]
 			self.configInstance.doClose()
 			self.configInstance = None
@@ -366,11 +449,12 @@ class Wizard(Screen, HelpableScreen):
 		self.condition = True
 		exec (self.wizard[self.currStep]["condition"])
 		if self.condition:
-			self.stepHistory.append(self.currStep)
+			if len(self.stepHistory) == 0 or self.stepHistory[-1] != self.currStep:
+				self.stepHistory.append(self.currStep)
 			print "wizard step:", self.wizard[self.currStep]
 			
 			if self.showSteps:
-				self["step"].setText(_("Step ") + str(self.currStep) + "/" + str(self.numSteps))
+				self["step"].setText(self.getTranslation("Step ") + str(self.currStep) + "/" + str(self.numSteps))
 			if self.showStepSlider:
 				self["stepslider"].setValue(self.currStep)
 		
@@ -378,7 +462,7 @@ class Wizard(Screen, HelpableScreen):
 				self.resetCounter() 
 				self.timeoutTimer.start(1000)
 			
-			print "wizard text", _(self.wizard[self.currStep]["text"])
+			print "wizard text", self.getTranslation(self.wizard[self.currStep]["text"])
 			self.updateText(firstset = True)
 			if self.wizard[self.currStep].has_key("displaytext"):
 				displaytext = self.wizard[self.currStep]["displaytext"]
@@ -412,7 +496,7 @@ class Wizard(Screen, HelpableScreen):
 				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]), x[1]))
+						self.list.append((self.getTranslation(x[0]), x[1]))
 				self.wizard[self.currStep]["evaluatedlist"] = self.list
 				self["list"].list = self.list
 				self["list"].index = 0
@@ -420,8 +504,13 @@ class Wizard(Screen, HelpableScreen):
 				self["list"].hide()
 	
 			if self.showConfig:
+				print "showing config"
 				self["config"].instance.setZPosition(1)
-				if (self.wizard[self.currStep]["config"]["screen"] != None):
+				if self.wizard[self.currStep]["config"]["type"] == "dynamic":
+						print "config type is dynamic"
+						self["config"].instance.setZPosition(2)
+						self["config"].l.setList(eval("self." + self.wizard[self.currStep]["config"]["source"])())
+				elif (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"])
@@ -434,11 +523,14 @@ class Wizard(Screen, HelpableScreen):
 							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"].destroy()
+						print "clearConfigList", self.configInstance["config"], self["config"] 
 						self.configInstance["config"] = self["config"]
+						print "clearConfigList", self.configInstance["config"], self["config"]
 				else:
 					self["config"].l.setList([])
 			else:
-				self["config"].hide()
+				if self.has_key("config"):
+					self["config"].hide()
 		else: # condition false
 				self.currStep += 1
 				self.updateValues()
@@ -459,14 +551,14 @@ class WizardManager:
 	def __init__(self):
 		self.wizards = []
 	
-	def registerWizard(self, wizard, precondition):
-		self.wizards.append((wizard, precondition))
+	def registerWizard(self, wizard, precondition, priority = 0):
+		self.wizards.append((wizard, precondition, priority))
 	
 	def getWizards(self):
 		list = []
 		for x in self.wizards:
 			if x[1] == 1: # precondition
-				list.append(x[0])
+				list.append((x[2], x[0]))
 		return list
 
 wizardManager = WizardManager()