X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/aa4c8cba2870da29c89ea6015770ed37c0cc1ffb..7c8c99715d23af5678bbc8ded629f06202648025:/lib/python/Screens/Wizard.py

diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 5b59d2c0..01797267 100644
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -1,5 +1,7 @@
 from Screen import Screen
 
+import string
+
 from Screens.HelpMenu import HelpableScreen
 from Components.Label import Label
 from Components.Slider import Slider
@@ -27,9 +29,9 @@ class Wizard(Screen, HelpableScreen):
 			self.currContent = name
 			if (name == "step"):
 				self.lastStep = int(attrs.get('number'))
-				self.wizard[self.lastStep] = {"text": "", "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": ""}
+				self.wizard[self.lastStep] = {"condition": "", "text": "", "list": [], "config": {"screen": None, "args": None, "type": "" }, "code": ""}
 			elif (name == "text"):
-				self.wizard[self.lastStep]["text"] = _(str(attrs.get('value')))
+				self.wizard[self.lastStep]["text"] = string.replace(str(attrs.get('value')), "\\n", "\n")
 			elif (name == "listentry"):
 				self.wizard[self.lastStep]["list"].append((str(attrs.get('caption')), str(attrs.get('step'))))
 			elif (name == "config"):
@@ -39,15 +41,20 @@ 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 == "condition"):
+				pass
 		def endElement(self, name):
 			self.currContent = ""
 			if name == 'code':
 				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
-				
+			elif self.currContent == "condition":
+				 self.wizard[self.lastStep]["condition"] = self.wizard[self.lastStep]["condition"] + ch
 	def __init__(self, session):
 		Screen.__init__(self, session)
 		HelpableScreen.__init__(self)
@@ -74,6 +81,7 @@ class Wizard(Screen, HelpableScreen):
 		self["list"] = MenuList(self.list)
 
 		self.onShown.append(self.updateValues)
+		self.onClose.append(self.delReferences)
 		
 		self["actions"] = NumberActionMap(["WizardActions", "NumberActions"],
 		{
@@ -163,39 +171,50 @@ class Wizard(Screen, HelpableScreen):
 		
 	def updateValues(self):
 		print "Updating values in step " + str(self.currStep)
-		self["step"].setText(_("Step ") + str(self.currStep) + "/" + str(self.numSteps))
-		self["stepslider"].setValue(self.currStep)
-
-		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["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"])
+		self.condition = True
+		exec (self.wizard[self.currStep]["condition"])
+		if self.condition:
+			self["step"].setText(_("Step ") + str(self.currStep) + "/" + str(self.numSteps))
+			self["stepslider"].setValue(self.currStep)
+		
+			print _(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["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.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 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()
+
+	def delReferences(self):
+		del self.configInstance
 
 class WizardManager:
 	def __init__(self):