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

diff --git a/mytest.py b/mytest.py
index 0cbeac02..2f6cecfd 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
@@ -25,17 +32,7 @@ def dump(dir, p = ""):
 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,24 +52,77 @@ 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"])
+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.currentDialog.doClose()
+		if self.currentWindow != None:
+			self.currentWindow.hide()
+		
+		del self.currentDialog
+		del self.currentWindow
+		
+		if len(self.dialogStack):
+			(self.currentDialog, self.currentWindow) = self.dialogStack.pop()
+			self.currentWindow.show()
+	
+	def open(self, screen):
+		if self.currentDialog:
+			self.dialogStack.append((self.currentDialog, self.currentWindow))
+			self.currentWindow.hide()
+		
+		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, wnd, 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 == 33:
+			self.currentDialog.data["channelSwitcher"]["instance"].push()
+		
+		if code >= 0x30 and code <= 0x39:
+			try:
+				self.currentDialog.data["menu"]["instance"].moveSelection(code - 0x31)
+			except:
+				self.currentDialog.data["list"]["instance"].moveSelection(code - 0x31)
+
+	def close(self):
+		self.delayTimer.start(0, 1)
 
-	applyGUIskin(components["$002"], None, "clockDialog")
+def runScreenTest():
+	session = Session()
+	session.desktop = getDesktop()
+	
+	session.open(infoBar())
 
-	wnd.show()
+	CONNECT(keyPressedSignal(), session.keyEvent)
 	
-#	components["$002"].data["okbutton"]["instance"].push()
 	runMainloop()
 	
 	return 0