add lcd

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index d6cfb1a2d81823618ce2e3b6230a24294aefc094..49283357fcb39d4d7903114ccb027bd3fe93ed71 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,6 +1,7 @@
 from enigma import *
 from tools import *
 
 from enigma import *
 from tools import *
 

+import traceback

 import Screens.InfoBar
 
 import sys
 import Screens.InfoBar
 
 import sys


@@ -10,16 +11,7 @@ import ServiceReference
 
 from Navigation import Navigation
 
 
 from Navigation import Navigation
 

-from skin import applyGUIskin
-
-# 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
-# "linked" from the instance tree.
-# A screen itself lives as the container of the components, so a screen is a component, too.
-
-# we thus have one (static) hierarchy of screens (classes, not instances)
-# and one with the instanciated components itself (both global and dynamic)
+from skin import readSkin, applyAllAttributes

 
 had = dict()
 
 
 had = dict()
 


@@ -54,8 +46,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):


@@ -70,16 +62,23 @@ class Session:
        def processDelay(self):
                self.execEnd()
                
        def processDelay(self):
                self.execEnd()
                

+               callback = self.currentDialog.callback
+               retval = self.currentDialog.returnValue
+               

                if self.currentDialog.isTmp:
                        self.currentDialog.doClose()
                
                        print sys.getrefcount(self.currentDialog)
                        del self.currentDialog.instance
                if self.currentDialog.isTmp:
                        self.currentDialog.doClose()
                
                        print sys.getrefcount(self.currentDialog)
                        del self.currentDialog.instance

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

                        del self.currentDialog
                        del self.currentDialog

+               else:
+                       del self.currentDialog.callback

                
                self.popCurrent()
                
                self.popCurrent()

-                       
+               if callback is not None:
+                       callback(*retval)
+

        def execBegin(self):
                        self.currentDialog.execBegin()
                        self.currentDialog.instance.show()
        def execBegin(self):
                        self.currentDialog.execBegin()
                        self.currentDialog.instance.show()


@@ -93,16 +92,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):


@@ -114,23 +125,30 @@ class Session:
                if len(self.dialogStack):
                        self.currentDialog = self.dialogStack.pop()
                        self.execBegin()
                if len(self.dialogStack):
                        self.currentDialog = self.dialogStack.pop()
                        self.execBegin()

-       
+

        def execDialog(self, dialog):
                self.pushCurrent()
                self.currentDialog = dialog
                self.currentDialog.isTmp = False
        def execDialog(self, dialog):
                self.pushCurrent()
                self.currentDialog = dialog
                self.currentDialog.isTmp = False

+               self.currentDialog.callback = None # would cause re-entrancy problems.

                self.execBegin()
 
                self.execBegin()
 

+       def openWithCallback(self, callback, screen, *arguments):
+               self.open(screen, *arguments)
+               self.currentDialog.callback = callback
+

        def open(self, screen, *arguments):
                self.pushCurrent()
                self.currentDialog = self.instantiateDialog(screen, *arguments)
                self.currentDialog.isTmp = True
        def open(self, screen, *arguments):
                self.pushCurrent()
                self.currentDialog = self.instantiateDialog(screen, *arguments)
                self.currentDialog.isTmp = True

+               self.currentDialog.callback = None

                self.execBegin()
 
        def keyEvent(self, code):
                print "code " + str(code)
 
                self.execBegin()
 
        def keyEvent(self, code):
                print "code " + str(code)
 

-       def close(self):
+       def close(self, *retval):
+               self.currentDialog.returnValue = retval

                self.delayTimer.start(0, 1)
 
 
                self.delayTimer.start(0, 1)
 
 


@@ -155,8 +173,29 @@ keymapparser.readKeymap()
 import skin
 skin.loadSkin(getDesktop())
 
 import skin
 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()
+
+import Components.NimManager
+

 # 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