- add "wildcard" (empty) context to receive all keys

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index a40e263556ba6baaca6a4a2f691c82c259183300..461fdfa2593c7f90c19f71f30f09cc61844d68f5 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,11 +1,15 @@
 from enigma import *
 from tools import *
 
+import Screens.InfoBar
 
 import sys
 import time
 
-from screens import *
+import ServiceReference
+
+from Navigation import Navigation
+
 from skin import applyGUIskin
 
 # A screen is a function which instanciates all components of a screen into a temporary component.
@@ -35,12 +39,6 @@ def dump(dir, p = ""):
 
 # + ":" + str(dir.__class__)
 
-# defined components
-components = {}
-
-# do global
-doGlobal(components)
-
 # display
 
 class OutputDevice:
@@ -75,20 +73,20 @@ class Session:
                if self.currentDialog.isTmp:
                        self.currentDialog.doClose()
                
-                       dump(self.currentDialog)
                        print sys.getrefcount(self.currentDialog)
+                       del self.currentDialog.instance
+                       dump(self.currentDialog)
                        del self.currentDialog
-                       del self.currentWindow
                
                self.popCurrent()
                        
        def execBegin(self):
                        self.currentDialog.execBegin()
-                       self.currentWindow.show()
+                       self.currentDialog.instance.show()
                
        def execEnd(self):
                        self.currentDialog.execEnd()
-                       self.currentWindow.hide()
+                       self.currentDialog.instance.hide()
        
        def create(self, screen, arguments):
                # creates an instance of 'screen' (which is a class)
@@ -97,71 +95,65 @@ class Session:
        def instantiateDialog(self, screen, *arguments):
                dlg = self.create(screen, arguments)
                assert self.desktop != None
-               wnd = eWindow(self.desktop)
+               dlg.instance = eWindow(self.desktop)
 
                gui = GUIOutputDevice()
-               gui.parent = wnd
+               gui.parent = dlg.instance
                gui.create(dlg)
 
-               applyGUIskin(dlg, wnd, None, dlg.skinName)
+               applyGUIskin(dlg, None, dlg.skinName, self.desktop)
                
-               return (dlg, wnd)
+               return dlg
         
        def pushCurrent(self):
                if self.currentDialog:
-                       self.dialogStack.append((self.currentDialog, self.currentWindow))
+                       self.dialogStack.append(self.currentDialog)
                        self.execEnd()
        
        def popCurrent(self):
                if len(self.dialogStack):
-                       (self.currentDialog, self.currentWindow) = self.dialogStack.pop()
+                       self.currentDialog = self.dialogStack.pop()
                        self.execBegin()
        
        def execDialog(self, dialog):
                self.pushCurrent()
-               (self.currentDialog, self.currentWindow) = dialog
+               self.currentDialog = dialog
                self.currentDialog.isTmp = False
                self.execBegin()
 
        def open(self, screen, *arguments):
                self.pushCurrent()
-               (self.currentDialog, self.currentWindow) = self.instantiateDialog(screen, *arguments)
+               self.currentDialog = self.instantiateDialog(screen, *arguments)
                self.currentDialog.isTmp = True
                self.execBegin()
 
        def keyEvent(self, code):
-#              print "code " + str(code)
-               if code == 32:
-                       self.currentDialog["okbutton"].instance.push()
-
-               if code == 33:
-                       self.currentDialog["channelSwitcher"].instance.push()
-               
-               if code >= 0x30 and code <= 0x39:
-                       try:
-                               self.currentDialog["menu"].instance.moveSelection(code - 0x31)
-                       except:
-                               self.currentDialog["list"].instance.moveSelection(code - 0x31)
+               print "code " + str(code)
 
        def close(self):
                self.delayTimer.start(0, 1)
 
+
 def runScreenTest():
        session = Session()
        session.desktop = getDesktop()
        
-       session.nav = pNavigation()
+       session.nav = Navigation()
        
-       session.open(infoBar)
+       session.open(Screens.InfoBar.InfoBar)
 
        CONNECT(keyPressedSignal(), session.keyEvent)
        
        runMainloop()
        
+       session.nav.shutdown()
+       
        return 0
 
 import keymapparser
 keymapparser.readKeymap()
+import skin
+skin.loadSkin()
 
 # first, setup a screen
 runScreenTest()