Add context menu

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 1a4b03630fed5769acd189c5599d31e8b397041e..a3f28d7b5df6a89e979deaaa2aca2dd191b7ec57 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,12 +1,18 @@
 from enigma import *
 from tools import *
 
 from enigma import *
 from tools import *
 

+import traceback
+import Screens.InfoBar

 
 import sys
 import time
 
 
 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.
 
 # 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 +41,6 @@ def dump(dir, p = ""):
 
 # + ":" + str(dir.__class__)
 
 
 # + ":" + str(dir.__class__)
 

-# defined components
-components = {}
-
-# do global
-doGlobal(components)
-

 # display
 
 class OutputDevice:
 # display
 
 class OutputDevice:


@@ -56,8 +56,8 @@ html = HTMLOutputDevice()
 
 class GUIOutputDevice(OutputDevice):
        parent = None
 
 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):
 
 class Session:
        def __init__(self):


@@ -77,7 +77,7 @@ class Session:
                
                        print sys.getrefcount(self.currentDialog)
                        del self.currentDialog.instance
                
                        print sys.getrefcount(self.currentDialog)
                        del self.currentDialog.instance

-                       dump(self.currentDialog)
+#                      dump(self.currentDialog)

                        del self.currentDialog
                
                self.popCurrent()
                        del self.currentDialog
                
                self.popCurrent()


@@ -95,16 +95,28 @@ class Session:
                return screen(self, *arguments)
        
        def instantiateDialog(self, screen, *arguments):
                return screen(self, *arguments)
        
        def instantiateDialog(self, screen, *arguments):

-               dlg = self.create(screen, arguments)
+               # create dialog
+               
+               try:
+                       dlg = self.create(screen, arguments)
+               except:
+                       print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:'
+                       print '-'*60
+                       traceback.print_exc(file=sys.stdout)
+                       quitMainloop()
+                       print '-'*60
+               
+               # 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)
                assert self.desktop != None
                dlg.instance = eWindow(self.desktop)

-
+               applyAllAttributes(dlg.instance, self.desktop, dlg.skinAttributes)

                gui = GUIOutputDevice()
                gui.parent = dlg.instance
                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):
                return dlg
         
        def pushCurrent(self):


@@ -130,43 +142,54 @@ class Session:
                self.execBegin()
 
        def keyEvent(self, code):
                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 close(self):
                self.delayTimer.start(0, 1)
 

+

 def runScreenTest():
        session = Session()
        session.desktop = getDesktop()
        
 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()
        
 
        CONNECT(keyPressedSignal(), session.keyEvent)
        
        runMainloop()
        

+       session.nav.shutdown()
+       

        return 0
 
 import keymapparser
 keymapparser.readKeymap()
 import skin
        return 0
 
 import keymapparser
 keymapparser.readKeymap()
 import skin

-skin.loadSkin()
+skin.loadSkin(getDesktop())
+
+import Components.InputDevice
+Components.InputDevice.InitInputDevices()
+
+import Components.AVSwitch
+Components.AVSwitch.InitAVSwitch()
+
+import Components.Network
+Components.Network.InitNetwork()
+
+import Components.SetupDevices
+Components.SetupDevices.InitSetupDevices()

 
 # first, setup a screen
 
 # first, setup a screen

-runScreenTest()
+try:
+       runScreenTest()
+except:
+       print 'EXCEPTION IN PYTHON STARTUP CODE:'
+       print '-'*60
+       traceback.print_exc(file=sys.stdout)
+       quitMainloop()
+       print '-'*60

 
 # now, run the mainloop
 
 
 # now, run the mainloop