X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4ec4e352738fdb205ab54f61045f36b6df4d58bc..45cc9a317c299b699756778a64eb3414e2b6bacb:/mytest.py

diff --git a/mytest.py b/mytest.py
index 564b564c..ea4913cc 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,15 +15,9 @@ from Navigation import Navigation
 
 from skin import readSkin, applyAllAttributes
 
-
-# A screen is a function which instanciates all components of a screen into a temporary component.
-# Thus, the global stuff is a screen, too.
-# In a screen, components can either be instanciated from the class-tree, cloned (copied) or
-# "linked" from the instance tree.
-# A screen itself lives as the container of the components, so a screen is a component, too.
-
-# we thus have one (static) hierarchy of screens (classes, not instances)
-# and one with the instanciated components itself (both global and dynamic)
+from Components.config import configfile
+from Screens.Wizard import listActiveWizards
+from Tools.BoundFunction import boundFunction
 
 had = dict()
 
@@ -72,16 +68,22 @@ class Session:
 	def processDelay(self):
 		self.execEnd()
 		
+		callback = self.currentDialog.callback
+		retval = self.currentDialog.returnValue
+		
 		if self.currentDialog.isTmp:
 			self.currentDialog.doClose()
 		
-			print sys.getrefcount(self.currentDialog)
 			del self.currentDialog.instance
 #			dump(self.currentDialog)
 			del self.currentDialog
+		else:
+			del self.currentDialog.callback
 		
 		self.popCurrent()
-			
+		if callback is not None:
+			callback(*retval)
+
 	def execBegin(self):
 			self.currentDialog.execBegin()
 			self.currentDialog.instance.show()
@@ -92,7 +94,14 @@ class Session:
 	
 	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
@@ -103,7 +112,7 @@ class Session:
 			print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:'
 			print '-'*60
 			traceback.print_exc(file=sys.stdout)
-			quitMainloop()
+			quitMainloop(5)
 			print '-'*60
 		
 		# read skin data
@@ -128,38 +137,64 @@ class Session:
 		if len(self.dialogStack):
 			self.currentDialog = self.dialogStack.pop()
 			self.execBegin()
-	
+		else:
+			self.currentDialog = None
+
 	def execDialog(self, dialog):
 		self.pushCurrent()
 		self.currentDialog = dialog
 		self.currentDialog.isTmp = False
+		self.currentDialog.callback = None # would cause re-entrancy problems.
 		self.execBegin()
 
+	def openWithCallback(self, callback, screen, *arguments):
+		self.open(screen, *arguments)
+		self.currentDialog.callback = callback
+
 	def open(self, screen, *arguments):
 		self.pushCurrent()
 		self.currentDialog = self.instantiateDialog(screen, *arguments)
 		self.currentDialog.isTmp = True
+		self.currentDialog.callback = None
 		self.execBegin()
 
 	def keyEvent(self, code):
 		print "code " + str(code)
 
-	def close(self):
+	def close(self, *retval):
+		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
@@ -178,13 +213,16 @@ Components.AVSwitch.InitAVSwitch()
 import Components.Network
 Components.Network.InitNetwork()
 
+import Components.Lcd
+Components.Lcd.InitLcd()
+
 import Components.SetupDevices
 Components.SetupDevices.InitSetupDevices()
 
-import Components.NimManager
+import Components.RFmod
+Components.RFmod.InitRFmod()
 
-import Components.ScanSetup
-Components.ScanSetup.InitScanSetup()
+import Components.NimManager
 
 # first, setup a screen
 try:
@@ -193,24 +231,5 @@ except:
 	print 'EXCEPTION IN PYTHON STARTUP CODE:'
 	print '-'*60
 	traceback.print_exc(file=sys.stdout)
-	quitMainloop()
+	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)
-#
-