X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8cdb470ac78c6692503d50fb1a80126f5c3dcea9..eb47577c32b49a28eb7986b0fd86ed0d76207150:/mytest.py

diff --git a/mytest.py b/mytest.py
index ea4913cc..571747c9 100644
--- a/mytest.py
+++ b/mytest.py
@@ -16,7 +16,9 @@ from Navigation import Navigation
 from skin import readSkin, applyAllAttributes
 
 from Components.config import configfile
-from Screens.Wizard import listActiveWizards
+from Screens.Wizard import wizardManager
+from Screens.StartWizard import *
+from Screens.TutorialWizard import *
 from Tools.BoundFunction import boundFunction
 
 had = dict()
@@ -69,12 +71,11 @@ class Session:
 		self.execEnd()
 		
 		callback = self.currentDialog.callback
+
 		retval = self.currentDialog.returnValue
-		
+
 		if self.currentDialog.isTmp:
 			self.currentDialog.doClose()
-		
-			del self.currentDialog.instance
 #			dump(self.currentDialog)
 			del self.currentDialog
 		else:
@@ -85,12 +86,16 @@ class Session:
 			callback(*retval)
 
 	def execBegin(self):
-			self.currentDialog.execBegin()
-			self.currentDialog.instance.show()
+		c = self.currentDialog
+		c.execBegin()
+
+		# when execBegin opened a new dialog, don't bother showing the old one.
+		if c == self.currentDialog:
+			c.instance.show()
 		
 	def execEnd(self):
-			self.currentDialog.execEnd()
-			self.currentDialog.instance.hide()
+		self.currentDialog.execEnd()
+		self.currentDialog.instance.hide()
 	
 	def create(self, screen, arguments):
 		# creates an instance of 'screen' (which is a class)
@@ -115,6 +120,9 @@ class Session:
 			quitMainloop(5)
 			print '-'*60
 		
+		if dlg is None:
+			return
+
 		# read skin data
 		readSkin(dlg, None, dlg.skinName, self.desktop)
 
@@ -148,15 +156,16 @@ class Session:
 		self.execBegin()
 
 	def openWithCallback(self, callback, screen, *arguments):
-		self.open(screen, *arguments)
-		self.currentDialog.callback = callback
+		dlg = self.open(screen, *arguments)
+		dlg.callback = callback
 
 	def open(self, screen, *arguments):
 		self.pushCurrent()
-		self.currentDialog = self.instantiateDialog(screen, *arguments)
-		self.currentDialog.isTmp = True
-		self.currentDialog.callback = None
+		dlg = self.currentDialog = self.instantiateDialog(screen, *arguments)
+		dlg.isTmp = True
+		dlg.callback = None
 		self.execBegin()
+		return dlg
 
 	def keyEvent(self, code):
 		print "code " + str(code)
@@ -165,15 +174,13 @@ class Session:
 		self.currentDialog.returnValue = retval
 		self.delayTimer.start(0, 1)
 
-
-
 def runScreenTest():
 	session = Session()
 	session.desktop = getDesktop()
 	
 	session.nav = Navigation()
 	
-	screensToRun = listActiveWizards()
+	screensToRun = wizardManager.getWizards()
 	screensToRun.append(Screens.InfoBar.InfoBar)
 	
 	def runNextScreen(session, screensToRun, *result):