X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f011625d4c8a1a7be9b6c147f5ab849fd5616071..15171632716c0734526eefc55e3d0601be177b45:/lib/python/Screens/Wizard.py

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
old mode 100644
new mode 100755
index 7c39b3e4..feba8ac2
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -3,7 +3,8 @@ from Screen import Screen
 import string
 
 from Screens.HelpMenu import HelpableScreen
-from Components.config import config, KEY_LEFT, KEY_RIGHT, KEY_DELETE, KEY_BACKSPACE
+from Components.config import config, KEY_LEFT, KEY_RIGHT, KEY_HOME, KEY_END, KEY_0, KEY_DELETE, KEY_BACKSPACE, KEY_OK, KEY_TOGGLEOW, KEY_ASCII, KEY_TIMEOUT, KEY_NUMBERS
+
 from Components.Label import Label
 from Components.Slider import Slider
 from Components.ActionMap import NumberActionMap
@@ -84,7 +85,7 @@ class Wizard(Screen):
 					timeoutstep = str(attrs.get('timeoutstep'))
 				else:
 					timeoutstep = ''
-				self.wizard[self.lastStep] = {"id": id, "condition": "", "text": "", "timeout": timeout, "timeoutaction": timeoutaction, "timeoutstep": timeoutstep, "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": "", "nextstep": nextstep}
+				self.wizard[self.lastStep] = {"id": id, "condition": "", "text": "", "timeout": timeout, "timeoutaction": timeoutaction, "timeoutstep": timeoutstep, "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": "", "codeafter": "", "code_async": "", "codeafter_async": "", "nextstep": nextstep}
 			elif (name == "text"):
 				self.wizard[self.lastStep]["text"] = string.replace(str(attrs.get('value')), "\\n", "\n")
 			elif (name == "displaytext"):
@@ -119,6 +120,7 @@ class Wizard(Screen):
 					if (attrs.has_key('evaluation')):
 						self.wizard[self.lastStep]["config"]["evaluation"] = str(attrs.get('evaluation'))
 			elif (name == "code"):
+				self.async_code = attrs.has_key('async') and str(attrs.get('async')) == "yes"
 				if attrs.has_key('pos') and str(attrs.get('pos')) == "after":
 					self.codeafter = True
 				else:
@@ -129,10 +131,16 @@ class Wizard(Screen):
 		def endElement(self, name):
 			self.currContent = ""
 			if name == 'code':
-				if self.codeafter:
-					self.wizard[self.lastStep]["codeafter"] = self.wizard[self.lastStep]["codeafter"].strip()
+				if self.async_code:
+					if self.codeafter:
+						self.wizard[self.lastStep]["codeafter_async"] = self.wizard[self.lastStep]["codeafter_async"].strip()
+					else:
+						self.wizard[self.lastStep]["code_async"] = self.wizard[self.lastStep]["code_async"].strip()
 				else:
-					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()
 			elif name == 'step':
@@ -141,13 +149,19 @@ class Wizard(Screen):
 								
 		def characters(self, ch):
 			if self.currContent == "code":
-				if self.codeafter:
-					self.wizard[self.lastStep]["codeafter"] = self.wizard[self.lastStep]["codeafter"] + ch
+				if self.async_code:
+					if self.codeafter:
+						self.wizard[self.lastStep]["codeafter_async"] = self.wizard[self.lastStep]["codeafter_async"] + ch
+					else:
+						self.wizard[self.lastStep]["code_async"] = self.wizard[self.lastStep]["code_async"] + ch
 				else:
-					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):
 		Screen.__init__(self, session)
 
@@ -202,8 +216,9 @@ class Wizard(Screen):
 		
 		self.disableKeys = False
 		
-		self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions", "SetupActions"],
+		self["actions"] = NumberActionMap(["WizardActions", "NumberActions", "ColorActions", "SetupActions", "InputAsciiActions"],
 		{
+			"gotAsciiCode": self.keyGotAscii,
 			"ok": self.ok,
 			"back": self.back,
 			"left": self.left,
@@ -302,7 +317,7 @@ class Wizard(Screen):
 		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):
 				print "current:", self["list"].current
@@ -312,21 +327,24 @@ class Wizard(Screen):
 				else:
 					self.currStep = self.getStepWithID(nextStep)
 
+		print_now = True
 		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:
+			self.codeafter = True
 			self.runCode(self.wizard[currStep]["codeafter"])
-			if self.wizard[currStep]["nextstep"] is not None:
-				self.currStep = self.getStepWithID(self.wizard[currStep]["nextstep"])
-			if gotoStep is not None:
-				self.currStep = self.getStepWithID(gotoStep)
-			self.currStep += 1
-			self.updateValues()
-
-		print "Now: " + str(self.currStep)
+			self.prevStep = currStep
+			self.gotoStep = gotoStep
+			if not self.runCode(self.wizard[currStep]["codeafter_async"]):
+				self.afterAsyncCode()
+			else:
+				if self.updateValues in self.onShown:
+					self.onShown.remove(self.updateValues)
 
+		if print_now:
+			print "Now: " + str(self.currStep)
 
 	def ok(self):
 		print "OK"
@@ -341,7 +359,8 @@ class Wizard(Screen):
 				# for this. If there is one, please do a more specific check
 				# and/or a comment in which situation there is no run()
 				if callable(getattr(self.configInstance, "runAsync", None)):
-					self.onShown.remove(self.updateValues)
+					if self.updateValues in self.onShown:
+						self.onShown.remove(self.updateValues)
 					self.configInstance.runAsync(self.finished)
 					return
 				else:
@@ -351,6 +370,10 @@ class Wizard(Screen):
 	def keyNumberGlobal(self, number):
 		if (self.wizard[self.currStep]["config"]["screen"] != None):
 			self.configInstance.keyNumberGlobal(number)
+
+	def keyGotAscii(self):
+		if (self.wizard[self.currStep]["config"]["screen"] != None):
+			self["config"].handleKey(KEY_ASCII)
 		
 	def left(self):
 		self.resetCounter()
@@ -371,7 +394,7 @@ class Wizard(Screen):
 	def up(self):
 		self.resetCounter()
 		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)
+			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"):
@@ -401,7 +424,7 @@ class Wizard(Screen):
 		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]
@@ -415,7 +438,9 @@ class Wizard(Screen):
 		if code != "":
 			print "code", code
 			exec(code)
-			
+			return True
+		return False
+
 	def getTranslation(self, text):
 		return _(text)
 			
@@ -440,13 +465,18 @@ class Wizard(Screen):
 		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
-		
+
 		self.condition = True
 		exec (self.wizard[self.currStep]["condition"])
-		if self.condition:
+		if not self.condition:
+			self.currStep += 1
+			self.updateValues()
+		else:
 			if len(self.stepHistory) == 0 or self.stepHistory[-1] != self.currStep:
 				self.stepHistory.append(self.currStep)
 			print "wizard step:", self.wizard[self.currStep]
@@ -468,8 +498,27 @@ class Wizard(Screen):
 				for x in self.lcdCallbacks:
 					x(displaytext)
 				
+			self.codeafter=False
 			self.runCode(self.wizard[self.currStep]["code"])
-			
+			if self.runCode(self.wizard[self.currStep]["code_async"]):
+				if self.updateValues in self.onShown:
+					self.onShown.remove(self.updateValues)
+			else:
+				self.afterAsyncCode()
+
+	def afterAsyncCode(self):
+		if not self.updateValues in self.onShown:
+			self.onShown.append(self.updateValues)
+
+		if self.codeafter:
+			if self.wizard[self.prevStep]["nextstep"] is not None:
+				self.currStep = self.getStepWithID(self.wizard[self.prevStep]["nextstep"])
+			if self.gotoStep is not None:
+				self.currStep = self.getStepWithID(self.gotoStep)
+			self.currStep += 1
+			self.updateValues()
+			print "Now: " + str(self.currStep)
+		else:
 			if self.showList:
 				print "showing list,", self.currStep
 				for renderer in self.renderer:
@@ -480,7 +529,7 @@ class Wizard(Screen):
 							print "setZPosition"
 							rootrenderer.instance.setZPosition(1)
 						renderer = renderer.source
-						
+
 				#self["list"].instance.setZPosition(1)
 				self.list = []
 				if (self.wizard[self.currStep].has_key("dynamiclist")):
@@ -520,17 +569,18 @@ class Wizard(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)
+						callbacks = self.configInstance["config"].onSelectionChanged
 						self.configInstance["config"].destroy()
+						print "clearConfigList", self.configInstance["config"], self["config"]
 						self.configInstance["config"] = self["config"]
+						self.configInstance["config"].onSelectionChanged = callbacks
+						print "clearConfigList", self.configInstance["config"], self["config"]
 				else:
 					self["config"].l.setList([])
 			else:
 				if self.has_key("config"):
 					self["config"].hide()
-		else: # condition false
-				self.currStep += 1
-				self.updateValues()
-				
+
 	def timeoutCounterFired(self):
 		self.timeoutCounter -= 1
 		print "timeoutCounter:", self.timeoutCounter