From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Sun, 18 Dec 2005 01:38:16 +0000 (+0000)
Subject: add a wizard attribute pos="after" to <code> to execute code after a step is finished
X-Git-Tag: 2.6.0~4675
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/98208302bd3bdbf99ab801260bf8d023035d8d41?ds=sidebyside

add a wizard attribute pos="after" to <code> to execute code after a step is finished
close the infobar in step 2
---

diff --git a/data/tutorialwizard.xml b/data/tutorialwizard.xml
index 53046a20..06d48bc6 100644
--- a/data/tutorialwizard.xml
+++ b/data/tutorialwizard.xml
@@ -7,14 +7,13 @@ self.infobardialog = self.session.instantiateDialog(InfoBar)
 self.infobardialog.hideTimer.stop()
 self.infobardialog.instance.show()
 			</code>
+			<code pos="after">
+self.infobardialog.instance.hide()
+del self.infobardialog
+			</code>
+
 		</step>
 		<step number="2">
-			<text value="By pressing the OK Button on your remote control, the info bar is being displayed." />
-			<code>
-from Screens.InfoBar import InfoBar
-self.infobardialog = self.session.instantiateDialog(InfoBar)
-self.infobardialog.hideTimer.stop()
-self.infobardialog.instance.show()
-			</code>
+			<text value="This is step number 2." />
 		</step>
 </wizard>
diff --git a/lib/python/Screens/Wizard.py b/lib/python/Screens/Wizard.py
index 610dd295..e894278d 100644
--- a/lib/python/Screens/Wizard.py
+++ b/lib/python/Screens/Wizard.py
@@ -26,7 +26,7 @@ class Wizard(Screen, HelpableScreen):
 			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.wizard[self.lastStep] = {"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,18 +38,29 @@ 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, showList = True, showConfig = True):
@@ -140,6 +151,7 @@ class Wizard(Screen, HelpableScreen):
 			self.markDone()
 			self.session.close()
 		else:
+			self.runCode(self.wizard[self.currStep]["codeafter"])
 			self.currStep += 1
 			self.updateValues()
 			
@@ -173,6 +185,11 @@ class Wizard(Screen, HelpableScreen):
 			self["list"].instance.moveSelection(self["list"].instance.moveDown)
 		print "down"
 		
+	def runCode(self, code):
+		if code != "":
+			print code
+			exec(code)
+		
 	def updateValues(self):
 		print "Updating values in step " + str(self.currStep)
 		
@@ -187,9 +204,7 @@ class Wizard(Screen, HelpableScreen):
 			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.runCode(self.wizard[self.currStep]["code"])
 			
 			if self.showList:
 				self["list"].instance.setZPosition(1)