X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/9764dd91d335a6e02384029c90911f1d500ffa97..140a68de78d89faa79e64f29179a254ab8bd2607:/mytest.py

diff --git a/mytest.py b/mytest.py
index 2a7eb9a1..206802e7 100644
--- a/mytest.py
+++ b/mytest.py
@@ -1,6 +1,8 @@
 from enigma import *
 from tools import *
 
+from Components.Language import language
+
 import traceback
 import Screens.InfoBar
 
@@ -13,6 +15,10 @@ 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()
 
 def dump(dir, p = ""):
@@ -63,11 +69,12 @@ 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
@@ -79,16 +86,27 @@ 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)
-		return screen(self, *arguments)
+		try:
+			return screen(self, *arguments)
+		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
@@ -124,6 +142,8 @@ class Session:
 		if len(self.dialogStack):
 			self.currentDialog = self.dialogStack.pop()
 			self.execBegin()
+		else:
+			self.currentDialog = None
 
 	def execDialog(self, dialog):
 		self.pushCurrent()
@@ -133,15 +153,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)
@@ -150,19 +171,34 @@ class Session:
 		self.currentDialog.returnValue = retval
 		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)
 	
 	runMainloop()
 	
+	configfile.save()
+	
 	session.nav.shutdown()
 	
 	return 0
@@ -201,22 +237,3 @@ except:
 	traceback.print_exc(file=sys.stdout)
 	quitMainloop(5)
 	print '-'*60
-
-# now, run the mainloop
-
-#pt = eDebugClassPtr()
-#eDebugClass.getDebug(pt, 12)
-#p = pt.__deref__()
-#print pt.x
-#print p.x
-#print "removing ptr..."
-#pt = 0
-#print "now"
-#print "p is " + str(p)
-#print p.x
-#p = 0
-#
-#bla = eDebugClass()
-#bla = eDebugClass(2)
-#
-