X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1cdf6cb021fcaa6548b90ba7b6765cf1e8b8b37b..a29d455a1f7860faa7ca1f36586bfc6f6f3337c5:/mytest.py

diff --git a/mytest.py b/mytest.py
index 80158884..68d777a9 100644
--- a/mytest.py
+++ b/mytest.py
@@ -1,12 +1,17 @@
 from enigma import *
 from tools import *
 
+import Screens.InfoBar
 
 import sys
 import time
 
-from screens import *
-from skin import applyGUIskin
+import ServiceReference
+
+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.
@@ -17,17 +22,23 @@ from skin import applyGUIskin
 # we thus have one (static) hierarchy of screens (classes, not instances)
 # and one with the instanciated components itself (both global and dynamic)
 
+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
-doGlobal(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
 
@@ -44,8 +55,8 @@ 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):
@@ -59,81 +70,117 @@ class Session:
 	
 	def processDelay(self):
 		self.execEnd()
-		self.currentDialog.doClose()
 		
-		del self.currentDialog
-		del self.currentWindow
+		if self.currentDialog.isTmp:
+			self.currentDialog.doClose()
 		
-		if len(self.dialogStack):
-			(self.currentDialog, self.currentWindow) = self.dialogStack.pop()
-			self.execBegin()
+			print sys.getrefcount(self.currentDialog)
+			del self.currentDialog.instance
+#			dump(self.currentDialog)
+			del self.currentDialog
+		
+		self.popCurrent()
 			
 	def execBegin(self):
 			self.currentDialog.execBegin()
-			self.currentWindow.show()
+			self.currentDialog.instance.show()
 		
 	def execEnd(self):
 			self.currentDialog.execEnd()
-			self.currentWindow.hide()
+			self.currentDialog.instance.hide()
 	
 	def create(self, screen, arguments):
+		# creates an instance of 'screen' (which is a class)
 		return screen(self, *arguments)
 	
-	def open(self, screen, *arguments):
-		if self.currentDialog:
-			self.dialogStack.append((self.currentDialog, self.currentWindow))
-			self.execEnd()
+	def instantiateDialog(self, screen, *arguments):
+		# create dialog
+		dlg = self.create(screen, arguments)
 		
-		self.currentDialog = self.create(screen, arguments)
+		# 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)
 		
-		if self.desktop != None:
-			self.currentWindow = eWindow(self.desktop)
-
-			gui = GUIOutputDevice()
-			gui.parent = self.currentWindow
-			gui.create(self.currentDialog)
-
-		 	applyGUIskin(self.currentDialog, self.currentWindow, None, self.currentDialog.skinName)
-
+		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()
-		else:
-			self.currentWindow = None
+	
+	def execDialog(self, dialog):
+		self.pushCurrent()
+		self.currentDialog = dialog
+		self.currentDialog.isTmp = False
+		self.execBegin()
 
-	def keyEvent(self, code):
-#		print "code " + str(code)
-		if code == 32:
-			self.currentDialog["okbutton"].instance.push()
+	def open(self, screen, *arguments):
+		self.pushCurrent()
+		self.currentDialog = self.instantiateDialog(screen, *arguments)
+		self.currentDialog.isTmp = True
+		self.execBegin()
 
-		if code == 33:
-			self.currentDialog["channelSwitcher"].instance.push()
-		
-		if code >= 0x30 and code <= 0x39:
-			try:
-				self.currentDialog["menu"].instance.moveSelection(code - 0x31)
-			except:
-				self.currentDialog["list"].instance.moveSelection(code - 0x31)
+	def keyEvent(self, code):
+		print "code " + str(code)
 
 	def close(self):
 		self.delayTimer.start(0, 1)
 
+
 def runScreenTest():
 	session = Session()
 	session.desktop = getDesktop()
 	
-	session.nav = pNavigation()
+	session.nav = Navigation()
 	
-	session.open(infoBar)
+	session.open(Screens.InfoBar.InfoBar)
 
 	CONNECT(keyPressedSignal(), session.keyEvent)
 	
 	runMainloop()
 	
+	session.nav.shutdown()
+	
 	return 0
 
 import keymapparser
 keymapparser.readKeymap()
+import skin
+skin.loadSkin(getDesktop())
+
+import Components.InputDevice
+Components.InputDevice.InitInputDevices()
 
 # first, setup a screen
 runScreenTest()
 
 # 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)
+#
+