X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FWizard.py;h=555110a4f9559e995cf864e244be0f96f62811e1;hp=feba8ac224672bad58893be5560c0d070671c8cc;hb=574f425cc1ebece0aa5f09fb77a8cb7ad0310a1f;hpb=56ac7a4a764a4251a851778df09967405aa9a930

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index feba8ac..555110a 100755
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -1,7 +1,5 @@
 from Screen import Screen
 
-import string
-
 from Screens.HelpMenu import HelpableScreen
 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
 
@@ -87,9 +85,9 @@ class Wizard(Screen):
 					timeoutstep = ''
 				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")
+				self.wizard[self.lastStep]["text"] = str(attrs.get('value')).replace("\\n", "\n")
 			elif (name == "displaytext"):
-				self.wizard[self.lastStep]["displaytext"] = string.replace(str(attrs.get('value')), "\\n", "\n")
+				self.wizard[self.lastStep]["displaytext"] = str(attrs.get('value')).replace("\\n", "\n")
 			elif (name == "list"):
 				if (attrs.has_key('type')):
 					if attrs["type"] == "dynamic":
@@ -477,6 +475,11 @@ class Wizard(Screen):
 			self.currStep += 1
 			self.updateValues()
 		else:
+			if self.wizard[self.currStep].has_key("displaytext"):
+				displaytext = self.wizard[self.currStep]["displaytext"]
+				print "set LCD text"
+				for x in self.lcdCallbacks:
+					x(displaytext)
 			if len(self.stepHistory) == 0 or self.stepHistory[-1] != self.currStep:
 				self.stepHistory.append(self.currStep)
 			print "wizard step:", self.wizard[self.currStep]
@@ -601,10 +604,7 @@ class WizardManager:
 		self.wizards.append((wizard, precondition, priority))
 	
 	def getWizards(self):
-		list = []
-		for x in self.wizards:
-			if x[1] == 1: # precondition
-				list.append((x[2], x[0]))
-		return list
+		# x[1] is precondition
+		return [(x[2], x[0]) for x in self.wizards if x[1] == 1]
 
 wizardManager = WizardManager()