X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=mytest.py;h=5233d85e8324e168b3fe0decb604f692c764ce96;hb=8ade23537a682d4b0c9709d533b25702bde2ee23;hp=0cbeac02ae68e2776a45fdd2a8070b7c835f3bc5;hpb=9202d4248dd7df2f6e5eb53b4154c8297ec9b1d1;p=vuplus_dvbapp

diff --git a/mytest.py b/mytest.py
index 0cbeac0..5233d85 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
@@ -29,7 +36,6 @@ screens["global"](components)
 
 # test our screens
 components["$001"] = screens["testDialog"]()
-components["$002"] = screens["clockDisplay"](components["clock"])
 
 print "*** classes:"
 dump(screens)
@@ -55,24 +61,76 @@ class GUIOutputDevice(OutputDevice):
 	def create(self, comp):
 		comp.createGUIScreen(self.parent)
 
-def runScreenTest():
-	desktop = getDesktop()
-
-	wnd = eWindow(desktop)
-	mainwnd = wnd
-	wnd.setTitle("Screen from python!")
-	wnd.move(ePoint(300, 100))
-	wnd.resize(eSize(300, 300))
-
-	gui = GUIOutputDevice()
-	gui.parent = wnd
-	gui.create(components["$002"])
-
-	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
+	
+	def processDelay(self):
+		self.currentDialog.close()
+		if self.currentWindow != None:
+			self.currentWindow.hide()
+		
+		del self.currentDialog
+		del self.currentWindow
+		
+		self.open(screens["testDialog"]())
+
+	def open(self, screen):
+		self.currentDialog = screen
+		screen.session = self
+		
+		if self.desktop != None:
+			self.currentWindow = wnd = eWindow(self.desktop)
+			wnd.setTitle("Screen from python!")
+			wnd.move(ePoint(300, 100))
+			wnd.resize(eSize(300, 300))
+
+			gui = GUIOutputDevice()
+			gui.parent = wnd
+			gui.create(self.currentDialog)
+
+		 	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)
 
-	wnd.show()
+def runScreenTest():
+	session = Session()
+	session.desktop = getDesktop()
+	
+	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)
 	
-#	components["$002"].data["okbutton"]["instance"].push()
 	runMainloop()
 	
 	return 0