- fixed dvb scan

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index c0967d78fadcf34359dd45d4401779eeea46ed6a..e257f11a160c5a84e37599f10c808430080ddcda 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
@@ -27,15 +34,6 @@ components = {}
 # do global
 screens["global"](components)
 
-# test our screens
-components["$001"] = screens["testDialog"]()
-
-print "*** classes:"
-dump(screens)
-
-print "*** instances:"
-dump(components)
-
 # display
 
 class OutputDevice:
@@ -61,18 +59,26 @@ class Session:
                self.delayTimer.timeout.get().append(self.processDelay)
                
                self.currentDialog = None
+               
+               self.dialogStack = [ ]
        
        def processDelay(self):
-               self.currentDialog.close()
+               self.currentDialog.doClose()
                if self.currentWindow != None:
                        self.currentWindow.hide()
                
                del self.currentDialog
                del self.currentWindow
                
-               self.open(screens["testDialog"]())
-
+               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
                
@@ -92,6 +98,14 @@ class Session:
                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)
 
@@ -99,19 +113,22 @@ def runScreenTest():
        session = Session()
        session.desktop = getDesktop()
        
-       session.open(screens["clockDisplay"](components["clock"]))
-#      session.open(screens["testDialog"]())
+#      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()
-       
-       tmr = eTimer()
-       tmr.timeout.get().append(blub)
-       tmr.start(4000, 0)
+#      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()