- fixed console input mode restore
[enigma2.git] / mytest.py
index 54f0f86..2f6cecf 100644 (file)
--- 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,16 +32,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
 
@@ -59,37 +57,61 @@ class Session:
                self.desktop = None
                self.delayTimer = eTimer()
                self.delayTimer.timeout.get().append(self.processDelay)
+               
+               self.currentDialog = None
+               
+               self.dialogStack = [ ]
        
        def processDelay(self):
-               components[self.screenname].close()
+               self.currentDialog.doClose()
                if self.currentWindow != None:
                        self.currentWindow.hide()
                
-               del components[self.screenname]
+               del self.currentDialog
                del self.currentWindow
                
-
-       def open(self, screenname, screen):
-               components[screenname] = screen
-               self.screenname = screenname
+               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))
+#                      wnd.setTitle("Screen from python!")
+#                      wnd.move(ePoint(300, 100))
+#                      wnd.resize(eSize(300, 300))
 
                        gui = GUIOutputDevice()
                        gui.parent = wnd
-                       gui.create(components["$002"])
+                       gui.create(self.currentDialog)
 
-                       applyGUIskin(components["$002"], None, "clockDialog")
+                       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)
 
@@ -97,21 +119,9 @@ def runScreenTest():
        session = Session()
        session.desktop = getDesktop()
        
-#      components["$002"] = screens["clockDisplay"](components["clock"])
-
-       session.open("$002", screens["clockDisplay"](components["clock"]))
+       session.open(infoBar())
 
-       
-       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)
+       CONNECT(keyPressedSignal(), session.keyEvent)
        
        runMainloop()