change session handling

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index a8559c065854fdb473dba1112150d13fb869b6f4..01db6e65c263e949306c3d56ef919a907b054a74 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,12 +1,16 @@
 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 +39,6 @@ def dump(dir, p = ""):
 
 # + ":" + str(dir.__class__)
 
-# defined components
-components = {}
-
-# do global
-doGlobal(components)
-
 # display
 
 class OutputDevice:
@@ -56,8 +54,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 +75,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 +93,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, self.desktop)
-               
+               gui.create(dlg, self.desktop)
+               
                return dlg
         
        def pushCurrent(self):
@@ -130,69 +132,11 @@ 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)
 
-# TODO: remove pNavgation, eNavigation and rewrite this stuff in python.
-class Navigation:
-       def __init__(self):
-               self.pnav = pNavigation()
-               self.pnav.m_event.get().append(self.callEvent)
-               self.event = [ ]
-               self.currentlyPlayingService = None
-
-       def callEvent(self, i):
-               for x in self.event:
-                       x(i)
-       
-       def playService(self, ref):
-               self.currentlyPlayingServiceReference = None
-               if not self.pnav.playService(ref):
-                       self.currentlyPlayingServiceReference = ref
-                       return 0
-               return 1
-       
-       def getCurrentlyPlayingServiceReference(self):
-               return self.currentlyPlayingServiceReference
-       
-       def recordService(self, ref):
-               print "recording service: %s" % (str(ref))
-               print self.pnav.recordService
-               return self.pnav.recordService(ref)
-       
-       def endRecording(self):
-               return self.pnav.endRecording()
-       
-       def enqueueService(self, ref):
-               return self.pnav.enqueueService(ref)
-       
-       def getCurrentService(self):
-               service = iPlayableServicePtr()
-               if self.pnav.getCurrentService(service):
-                       return None
-               return service
-       
-       def getPlaylist(self):
-               playlist = ePlaylistPtr()
-               if self.pnav.getPlaylist(playlist):
-                       return None
-               return playlist
-       
-       def pause(self, p):
-               return self.pnav.pause(p)
 
 def runScreenTest():
        session = Session()
@@ -200,18 +144,20 @@ def runScreenTest():
        
        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()
+skin.loadSkin(getDesktop())
 
 # first, setup a screen
 runScreenTest()