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

diff --git a/mytest.py b/mytest.py
index 0cbeac02..ef2f6fb6 100644
--- a/mytest.py
+++ b/mytest.py
@@ -1,41 +1,37 @@
 from enigma import *
+from tools import *
+
+import traceback
+import Screens.InfoBar
 
 import sys
 import time
 
-from screens import *
-from skin import applyGUIskin
+import ServiceReference
+
+from Navigation import Navigation
 
-# 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.
+from skin import readSkin, applyAllAttributes
 
-# 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()
 
 def dump(dir, p = ""):
 	if isinstance(dir, dict):
 		for (entry, val) in dir.items():
-			dump(val, p + "/" + entry)
-	print p + ":" + str(dir.__class__)
-
-# defined components
-components = {}
-
-# do global
-screens["global"](components)
-
-# test our screens
-components["$001"] = screens["testDialog"]()
-components["$002"] = screens["clockDisplay"](components["clock"])
-
-print "*** classes:"
-dump(screens)
-
-print "*** instances:"
-dump(components)
+			dump(val, p + "(dict)/" + entry)
+	if hasattr(dir, "__dict__"):
+		for name, value in dir.__dict__.items():
+			if not had.has_key(str(value)):
+				had[str(value)] = 1
+				dump(value, p + "/" + str(name))
+			else:
+				print p + "/" + str(name) + ":" + str(dir.__class__) + "(cycle)"
+	else:
+		print p + ":" + str(dir)
+
+# + ":" + str(dir.__class__)
 
 # display
 
@@ -52,33 +48,164 @@ html = HTMLOutputDevice()
 
 class GUIOutputDevice(OutputDevice):
 	parent = None
-	def create(self, comp):
-		comp.createGUIScreen(self.parent)
+	def create(self, comp, desktop):
+		comp.createGUIScreen(self.parent, desktop)
+
+class Session:
+	def __init__(self):
+		self.desktop = None
+		self.delayTimer = eTimer()
+		self.delayTimer.timeout.get().append(self.processDelay)
+		
+		self.currentDialog = None
+		
+		self.dialogStack = [ ]
+	
+	def processDelay(self):
+		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:
+			del self.currentDialog.callback
+		
+		self.popCurrent()
+		if callback is not None:
+			callback(*retval)
+
+	def execBegin(self):
+			self.currentDialog.execBegin()
+			self.currentDialog.instance.show()
+		
+	def execEnd(self):
+			self.currentDialog.execEnd()
+			self.currentDialog.instance.hide()
+	
+	def create(self, screen, arguments):
+		# 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)
+	
+	def instantiateDialog(self, screen, *arguments):
+		# create dialog
+		
+		try:
+			dlg = self.create(screen, arguments)
+		except:
+			print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:'
+			print '-'*60
+			traceback.print_exc(file=sys.stdout)
+			quitMainloop(5)
+			print '-'*60
+		
+		# read skin data
+		readSkin(dlg, None, dlg.skinName, self.desktop)
+
+		# create GUI view of this dialog
+		assert self.desktop != None
+		dlg.instance = eWindow(self.desktop)
+		applyAllAttributes(dlg.instance, self.desktop, dlg.skinAttributes)
+		gui = GUIOutputDevice()
+		gui.parent = dlg.instance
+		gui.create(dlg, self.desktop)
+		
+		return dlg
+	 
+	def pushCurrent(self):
+		if self.currentDialog:
+			self.dialogStack.append(self.currentDialog)
+			self.execEnd()
+	
+	def popCurrent(self):
+		if len(self.dialogStack):
+			self.currentDialog = self.dialogStack.pop()
+			self.execBegin()
 
-def runScreenTest():
-	desktop = getDesktop()
+	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
 
-	wnd = eWindow(desktop)
-	mainwnd = wnd
-	wnd.setTitle("Screen from python!")
-	wnd.move(ePoint(300, 100))
-	wnd.resize(eSize(300, 300))
+	def open(self, screen, *arguments):
+		self.pushCurrent()
+		self.currentDialog = self.instantiateDialog(screen, *arguments)
+		self.currentDialog.isTmp = True
+		self.currentDialog.callback = None
+		self.execBegin()
 
-	gui = GUIOutputDevice()
-	gui.parent = wnd
-	gui.create(components["$002"])
+	def keyEvent(self, code):
+		print "code " + str(code)
 
-	applyGUIskin(components["$002"], None, "clockDialog")
+	def close(self, *retval):
+		self.currentDialog.returnValue = retval
+		self.delayTimer.start(0, 1)
 
-	wnd.show()
+
+def runScreenTest():
+	session = Session()
+	session.desktop = getDesktop()
+	
+	session.nav = Navigation()
+	
+	session.open(Screens.InfoBar.InfoBar)
+
+	CONNECT(keyPressedSignal(), session.keyEvent)
 	
-#	components["$002"].data["okbutton"]["instance"].push()
 	runMainloop()
 	
+	configfile.save()
+	
+	session.nav.shutdown()
+	
 	return 0
 
+import keymapparser
+keymapparser.readKeymap()
+import skin
+skin.loadSkin(getDesktop())
 
-# first, setup a screen
-runScreenTest()
+import Components.InputDevice
+Components.InputDevice.InitInputDevices()
 
-# now, run the mainloop
+import Components.AVSwitch
+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
+
+# first, setup a screen
+try:
+	runScreenTest()
+except:
+	print 'EXCEPTION IN PYTHON STARTUP CODE:'
+	print '-'*60
+	traceback.print_exc(file=sys.stdout)
+	quitMainloop(5)
+	print '-'*60