X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=mytest.py;h=ea4913cc49ddcae4b94e37363d70f3d854c0651e;hp=745c47c0c6ed2b3dc40ae18f1e9bdd4d903caa1f;hb=2b72cfe222c5c013e9a10372c826ae5b3f56ef33;hpb=bb59fd202b257cce05684912216678d9872ff0cc

diff --git a/mytest.py b/mytest.py
index 745c47c..ea4913c 100644
--- a/mytest.py
+++ b/mytest.py
@@ -16,6 +16,8 @@ from Navigation import Navigation
 from skin import readSkin, applyAllAttributes
 
 from Components.config import configfile
+from Screens.Wizard import listActiveWizards
+from Tools.BoundFunction import boundFunction
 
 had = dict()
 
@@ -94,9 +96,12 @@ class Session:
 		# creates an instance of 'screen' (which is a class)
 		try:
 			return screen(self, *arguments)
-		except TypeError, x:
-			errstr = "Screen %s(%s): %s" % (str(screen), str(arguments), str(x))
-			raise TypeError(errstr)
+		except:
+			errstr = "Screen %s(%s): %s" % (str(screen), str(arguments), sys.exc_info()[0])
+			print errstr
+			traceback.print_exc(file=sys.stdout)
+			quitMainloop(5)
+			
 	
 	def instantiateDialog(self, screen, *arguments):
 		# create dialog
@@ -132,6 +137,8 @@ class Session:
 		if len(self.dialogStack):
 			self.currentDialog = self.dialogStack.pop()
 			self.execBegin()
+		else:
+			self.currentDialog = None
 
 	def execDialog(self, dialog):
 		self.pushCurrent()
@@ -159,13 +166,28 @@ class Session:
 		self.delayTimer.start(0, 1)
 
 
+
 def runScreenTest():
 	session = Session()
 	session.desktop = getDesktop()
 	
 	session.nav = Navigation()
 	
-	session.open(Screens.InfoBar.InfoBar)
+	screensToRun = listActiveWizards()
+	screensToRun.append(Screens.InfoBar.InfoBar)
+	
+	def runNextScreen(session, screensToRun, *result):
+		if result:
+			quitMainloop(result)
+
+		screen = screensToRun[0]
+		
+		if len(screensToRun):
+			session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen)
+		else:
+			session.open(screen)
+	
+	runNextScreen(session, screensToRun)
 
 	CONNECT(keyPressedSignal(), session.keyEvent)