add save

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 74ac27365e2428d60e591961157b88fd350eb20b..68d777a9ee562cacf961ff07e344dbaf89dc439a 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,12 +1,17 @@
 from enigma import *
 from tools import *
 
+import Screens.InfoBar
 
 import sys
 import time
 
-from screens import *
-from skin import applyGUIskin
+import ServiceReference
+
+from Navigation import Navigation
+
+from skin import readSkin, applyAllAttributes
+
 
 # A screen is a function which instanciates all components of a screen into a temporary component.
 # Thus, the global stuff is a screen, too.
@@ -35,12 +40,6 @@ def dump(dir, p = ""):
 
 # + ":" + str(dir.__class__)
 
-# defined components
-components = {}
-
-# do global
-doGlobal(components)
-
 # display
 
 class OutputDevice:
@@ -56,8 +55,8 @@ html = HTMLOutputDevice()
 
 class GUIOutputDevice(OutputDevice):
        parent = None
-       def create(self, comp):
-               comp.createGUIScreen(self.parent)
+       def create(self, comp, desktop):
+               comp.createGUIScreen(self.parent, desktop)
 
 class Session:
        def __init__(self):
@@ -77,7 +76,7 @@ class Session:
                
                        print sys.getrefcount(self.currentDialog)
                        del self.currentDialog.instance
-                       dump(self.currentDialog)
+#                      dump(self.currentDialog)
                        del self.currentDialog
                
                self.popCurrent()
@@ -95,16 +94,20 @@ class Session:
                return screen(self, *arguments)
        
        def instantiateDialog(self, screen, *arguments):
+               # create dialog
                dlg = self.create(screen, arguments)
+               
+               # read skin data
+               readSkin(dlg, None, dlg.skinName, self.desktop)
+
+               # create GUI view of this dialog
                assert self.desktop != None
                dlg.instance = eWindow(self.desktop)
-
+               applyAllAttributes(dlg.instance, self.desktop, dlg.skinAttributes)
                gui = GUIOutputDevice()
                gui.parent = dlg.instance
-               gui.create(dlg)
-
-               applyGUIskin(dlg, None, dlg.skinName)
-               
+               gui.create(dlg, self.desktop)
+               
                return dlg
         
        def pushCurrent(self):
@@ -130,38 +133,35 @@ class Session:
                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(getDesktop())
+
+import Components.InputDevice
+Components.InputDevice.InitInputDevices()
 
 # first, setup a screen
 runScreenTest()