X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/13b7a9b397f36ca3195aad3702feb3db4cbb2f3e..48158ec0bbc8e623febb4d04a54e2e435daf865e:/mytest.py

diff --git a/mytest.py b/mytest.py
index 53a398ed..1a4b0363 100644
--- a/mytest.py
+++ b/mytest.py
@@ -1,4 +1,6 @@
 from enigma import *
+from tools import *
+
 
 import sys
 import time
@@ -15,27 +17,29 @@ 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__)
+			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__)
 
 # 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)
+doGlobal(components)
 
 # display
 
@@ -55,93 +59,130 @@ class GUIOutputDevice(OutputDevice):
 	def create(self, comp):
 		comp.createGUIScreen(self.parent)
 
-
-
-def test():
-	desktop = getDesktop()
-	print "desktop: " + str(desktop)
-
-	wnd = eWindow(desktop)
-	print "window " + str(wnd)
-	wnd.setTitle("python")
-	wnd.move(ePoint(300, 100))
-	wnd.resize(eSize(300, 300))
-
-	gui = GUIOutputDevice()
-	gui.parent = wnd
-	gui.create(components["$002"])
-#	for (x,y) in components["$001"].data.items():
-#		print str(x) + " -> " + str(y) + " (" + y["instance"].getText() + ")"
-
-#	print components["$001"].data["okbutton"]["instance"].doClick()
-
-# diese sachen gehoeren in den skin! :)
-	applyGUIskin(components["$002"], None, "clockDialog")
+class Session:
+	def __init__(self):
+		self.desktop = None
+		self.delayTimer = eTimer()
+		self.delayTimer.timeout.get().append(self.processDelay)
+		
+		self.currentDialog = None
+		
+		self.dialogStack = [ ]
 	
-# das ist dann schon die echte funktionalitaet ;)
-	components["clock"].doClock()
-	components["clock"].doClock()
-
-
-# output as html
-	print "--------------------------------------"
-	html.create(components["$001"])
-	print "--------------------------------------"
-	html.create(components["$002"])
-	print "--------------------------------------"
+	def processDelay(self):
+		self.execEnd()
+		
+		if self.currentDialog.isTmp:
+			self.currentDialog.doClose()
+		
+			print sys.getrefcount(self.currentDialog)
+			del self.currentDialog.instance
+			dump(self.currentDialog)
+			del self.currentDialog
+		
+		self.popCurrent()
+			
+	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)
+		return screen(self, *arguments)
 	
-# direkter test der GUI aus python:
-#	label1 = eLabel(wnd)
-#	label1.setText("hello world!\nfrom python!")
-#	label1.move(ePoint(10, 10))
-#	label1.resize(eSize(80, 50))
-#
-#	label2 = eLabel(wnd)
-#	label2.setText("the second\nlabel works\nas well!")
-#	label2.move(ePoint(90, 10))
-#	label2.resize(eSize(80, 50))
-#
-#	button = eButton(wnd)
-#	button.setText("OK")
-#	button.move(ePoint(200, 10))
-#	button.resize(eSize(80, 50)) 
-
-	wnd.show()
+	def instantiateDialog(self, screen, *arguments):
+		dlg = self.create(screen, arguments)
+		assert self.desktop != None
+		dlg.instance = eWindow(self.desktop)
+
+		gui = GUIOutputDevice()
+		gui.parent = dlg.instance
+		gui.create(dlg)
+
+		applyGUIskin(dlg, None, dlg.skinName, 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()
 	
-	components["$002"].data["okbutton"]["instance"].push()	
-
-	for x in range(200):
-		time.sleep(0.1)
-		components["clock"].doClock()
-		if x > 100:
-			r = 200 - x
-		else:
-			r = x
-#		components["$002"]["okbutton"].setValue(r)
-		desktop.paint()
+	def execDialog(self, dialog):
+		self.pushCurrent()
+		self.currentDialog = dialog
+		self.currentDialog.isTmp = False
+		self.execBegin()
+
+	def open(self, screen, *arguments):
+		self.pushCurrent()
+		self.currentDialog = self.instantiateDialog(screen, *arguments)
+		self.currentDialog.isTmp = True
+		self.execBegin()
+
+	def keyEvent(self, code):
+#		print "code " + str(code)
+		if code == 32:
+			self.currentDialog["okbutton"].instance.push()
+
+		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 close(self):
+		self.delayTimer.start(0, 1)
+
+def runScreenTest():
+	session = Session()
+	session.desktop = getDesktop()
 	
-#	
-#	print "delete label1"
-#	del button
-#	del label2
-#	del label1
-#	print "delete wnd"
-#	del wnd
-#	print "bye"
+	session.nav = pNavigation()
+	
+	session.open(infoBar)
 
+	CONNECT(keyPressedSignal(), session.keyEvent)
 	
+	runMainloop()
 	
 	return 0
 
-def testI2(a):
-	print "PYTHON says: it's a " + str(a) + "!!!"
-	return 0
+import keymapparser
+keymapparser.readKeymap()
+import skin
+skin.loadSkin()
+
+# 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)
+#
 
-def testI(a = 0):
-	print "magic integer is " + str(a)
-	
-	list = testsignal.get()
-	print "list -> " + str(list)
-	list.append(testI2)
-	return 1