- add "getCurrent" to service listbox

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index e4a722ac3cc265c527271649b03ac83c85e7a650..388fcdac56a6006be4762222d10f335af41cc18d 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,4 +1,5 @@
 from enigma import *
+from tools import *
 
 import sys
 import time
@@ -6,13 +7,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 +26,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,32 +53,40 @@ 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
                
                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(self.currentDialog)
 
-                       applyGUIskin(self.currentDialog, None, screen.__class__.__name__)
+                       applyGUIskin(self.currentDialog, wnd, None, screen.__class__.__name__)
 
                        wnd.show()
                else:
@@ -102,10 +95,16 @@ class Session:
        def keyEvent(self, 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,21 +113,10 @@ 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()