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

diff --git a/mytest.py b/mytest.py
index 5233d85e..80158884 100644
--- a/mytest.py
+++ b/mytest.py
@@ -1,4 +1,6 @@
 from enigma import *
+from tools import *
+
 
 import sys
 import time
@@ -6,13 +8,6 @@ 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
@@ -32,16 +27,7 @@ def dump(dir, p = ""):
 components = {}
 
 # do global
-screens["global"](components)
-
-# test our screens
-components["$001"] = screens["testDialog"]()
-
-print "*** classes:"
-dump(screens)
-
-print "*** instances:"
-dump(components)
+doGlobal(components)
 
 # display
 
@@ -68,44 +54,64 @@ class Session:
 		self.delayTimer.timeout.get().append(self.processDelay)
 		
 		self.currentDialog = None
+		
+		self.dialogStack = [ ]
 	
 	def processDelay(self):
-		self.currentDialog.close()
-		if self.currentWindow != None:
-			self.currentWindow.hide()
+		self.execEnd()
+		self.currentDialog.doClose()
 		
 		del self.currentDialog
 		del self.currentWindow
 		
-		self.open(screens["testDialog"]())
-
-	def open(self, screen):
-		self.currentDialog = screen
-		screen.session = self
+		if len(self.dialogStack):
+			(self.currentDialog, self.currentWindow) = self.dialogStack.pop()
+			self.execBegin()
+			
+	def execBegin(self):
+			self.currentDialog.execBegin()
+			self.currentWindow.show()
+		
+	def execEnd(self):
+			self.currentDialog.execEnd()
+			self.currentWindow.hide()
+	
+	def create(self, screen, arguments):
+		return screen(self, *arguments)
+	
+	def open(self, screen, *arguments):
+		if self.currentDialog:
+			self.dialogStack.append((self.currentDialog, self.currentWindow))
+			self.execEnd()
+		
+		self.currentDialog = self.create(screen, arguments)
 		
 		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))
+			self.currentWindow = eWindow(self.desktop)
 
 			gui = GUIOutputDevice()
-			gui.parent = wnd
+			gui.parent = self.currentWindow
 			gui.create(self.currentDialog)
 
-		 	applyGUIskin(self.currentDialog, None, screen.__class__.__name__)
+		 	applyGUIskin(self.currentDialog, self.currentWindow, None, self.currentDialog.skinName)
 
-			wnd.show()
+			self.execBegin()
 		else:
 			self.currentWindow = None
 
 	def keyEvent(self, code):
-		print "code " + str(code)
+#		print "code " + str(code)
 		if code == 32:
-			self.currentDialog.data["okbutton"]["instance"].push()
+			self.currentDialog["okbutton"].instance.push()
+
+		if code == 33:
+			self.currentDialog["channelSwitcher"].instance.push()
 		
 		if code >= 0x30 and code <= 0x39:
-			self.currentDialog.data["menu"]["instance"].moveSelection(code - 0x31)
+			try:
+				self.currentDialog["menu"].instance.moveSelection(code - 0x31)
+			except:
+				self.currentDialog["list"].instance.moveSelection(code - 0x31)
 
 	def close(self):
 		self.delayTimer.start(0, 1)
@@ -114,27 +120,18 @@ 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)
-#	
+	session.nav = pNavigation()
+	
+	session.open(infoBar)
+
 	CONNECT(keyPressedSignal(), session.keyEvent)
 	
 	runMainloop()
 	
 	return 0
 
+import keymapparser
+keymapparser.readKeymap()
 
 # first, setup a screen
 runScreenTest()