X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/35604d1b74e329aed018b90c222f4717a0726236..82aa264d3b1732f8c5883a13401a45cb32e00bc1:/mytest.py

diff --git a/mytest.py b/mytest.py
index 829c8fd3..ef2f6fb6 100644
--- a/mytest.py
+++ b/mytest.py
@@ -13,15 +13,7 @@ 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
 
 had = dict()
 
@@ -72,16 +64,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 +90,11 @@ 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 TypeError, x:
+			errstr = "Screen %s(%s): %s" % (str(screen), str(arguments), str(x))
+			raise TypeError(errstr)
 	
 	def instantiateDialog(self, screen, *arguments):
 		# create dialog
@@ -103,7 +105,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,23 +130,30 @@ class Session:
 		if len(self.dialogStack):
 			self.currentDialog = self.dialogStack.pop()
 			self.execBegin()
-	
+
 	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)
 
 
@@ -160,6 +169,8 @@ def runScreenTest():
 	
 	runMainloop()
 	
+	configfile.save()
+	
 	session.nav.shutdown()
 	
 	return 0
@@ -178,11 +189,16 @@ Components.AVSwitch.InitAVSwitch()
 import Components.Network
 Components.Network.InitNetwork()
 
+import Components.Lcd
+Components.Lcd.InitLcd()
+
 import Components.SetupDevices
 Components.SetupDevices.InitSetupDevices()
 
+import Components.RFmod
+Components.RFmod.InitRFmod()
+
 import Components.NimManager
-#Components.NimManager.InitNimManager()
 
 # first, setup a screen
 try:
@@ -191,24 +207,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)
-#
-