X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4c9d04cb33fb06dfa075b431e36e7ea938a5f963..cd621fe499141885e5a0d8b4e42a0f8a7f41a9ac:/mytest.py

diff --git a/mytest.py b/mytest.py
index 54f0f862..e4a722ac 100644
--- a/mytest.py
+++ b/mytest.py
@@ -6,6 +6,13 @@ import time
 from screens import *
 from skin import applyGUIskin
 
+
+def CONNECT(slot, fnc):
+	slot.get().append(fnc)
+
+def DISCONNECT(slot, fnc):
+	slot.get().remove(fnc)
+
 # 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
@@ -30,11 +37,11 @@ screens["global"](components)
 # test our screens
 components["$001"] = screens["testDialog"]()
 
-print "*** classes:"
-dump(screens)
-
-print "*** instances:"
-dump(components)
+#print "*** classes:"
+#dump(screens)
+#
+#print "*** instances:"
+#dump(components)
 
 # display
 
@@ -59,19 +66,21 @@ class Session:
 		self.desktop = None
 		self.delayTimer = eTimer()
 		self.delayTimer.timeout.get().append(self.processDelay)
+		
+		self.currentDialog = None
 	
 	def processDelay(self):
-		components[self.screenname].close()
+		self.currentDialog.close()
 		if self.currentWindow != None:
 			self.currentWindow.hide()
 		
-		del components[self.screenname]
+		del self.currentDialog
 		del self.currentWindow
 		
+		self.open(screens["testDialog"]())
 
-	def open(self, screenname, screen):
-		components[screenname] = screen
-		self.screenname = screenname
+	def open(self, screen):
+		self.currentDialog = screen
 		screen.session = self
 		
 		if self.desktop != None:
@@ -82,14 +91,22 @@ class Session:
 
 			gui = GUIOutputDevice()
 			gui.parent = wnd
-			gui.create(components["$002"])
+			gui.create(self.currentDialog)
 
-		 	applyGUIskin(components["$002"], None, "clockDialog")
+		 	applyGUIskin(self.currentDialog, None, screen.__class__.__name__)
 
 			wnd.show()
 		else:
 			self.currentWindow = None
 
+	def keyEvent(self, code):
+#		print "code " + str(code)
+		if code == 32:
+			self.currentDialog.data["okbutton"]["instance"].push()
+		
+		if code >= 0x30 and code <= 0x39:
+			self.currentDialog.data["menu"]["instance"].moveSelection(code - 0x31)
+
 	def close(self):
 		self.delayTimer.start(0, 1)
 
@@ -97,21 +114,22 @@ def runScreenTest():
 	session = Session()
 	session.desktop = getDesktop()
 	
-#	components["$002"] = screens["clockDisplay"](components["clock"])
-
-	session.open("$002", screens["clockDisplay"](components["clock"]))
-
-	
-	def blub():
-#		x = components["$002"]
-		components["$002"].data["okbutton"]["instance"].push()
-#		dump(components)
-#		print "session, close screen " + str(sys.getrefcount(x))
-#		session.close()
-		
-	tmr = eTimer()
-	tmr.timeout.get().append(blub)
-	tmr.start(4000, 1)
+	session.open(screens["clockDisplay"](components["clock"]))
+#	session.open(screens["testDialog"]())
+
+	# simple reason for this helper function: we want to call the currently
+	# active "okbutton", even when we changed the dialog
+	#
+	# more complicated reason: we don't want to hold a reference.
+#	def blub():
+#		session.currentDialog.data["okbutton"]["instance"].push()	
+#		session.currentDialog["okbutton"].setText("hello!")
+#	
+#	tmr = eTimer()
+#	CONNECT(tmr.timeout, blub)
+#	tmr.start(4000, 0)
+#	
+	CONNECT(keyPressedSignal(), session.keyEvent)
 	
 	runMainloop()