differentiate between failures while and after tuning

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 1a4b03630fed5769acd189c5599d31e8b397041e..9e9971899765456069c6014250b95df2d62d774d 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,21 +1,17 @@
 from enigma import *
 from tools import *
 
+import traceback
+import Screens.InfoBar
 
 import sys
 import time
 
-from screens import *
-from skin import applyGUIskin
+import ServiceReference
 
-# 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.
+from Navigation import Navigation
 
-# 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()
 
@@ -35,12 +31,6 @@ def dump(dir, p = ""):
 
 # + ":" + str(dir.__class__)
 
-# defined components
-components = {}
-
-# do global
-doGlobal(components)
-
 # display
 
 class OutputDevice:
@@ -56,8 +46,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):
@@ -72,16 +62,22 @@ class Session:
        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
-                       dump(self.currentDialog)
+#                      dump(self.currentDialog)
                        del self.currentDialog
+               else:
+                       del self.currentDialog.callback
                
                self.popCurrent()
-                       
+               if callback is not None:
+                       callback(*retval)
+
        def execBegin(self):
                        self.currentDialog.execBegin()
                        self.currentDialog.instance.show()
@@ -95,16 +91,28 @@ class Session:
                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)
-
+               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):
@@ -116,57 +124,83 @@ class Session:
                if len(self.dialogStack):
                        self.currentDialog = self.dialogStack.pop()
                        self.execBegin()
-       
+
        def execDialog(self, dialog):
                self.pushCurrent()
                self.currentDialog = dialog
                self.currentDialog.isTmp = False
+               self.currentDialog.callback = None # would cause re-entrancy problems.
                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
+               self.currentDialog.callback = None
                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):
+       def close(self, *retval):
+               self.currentDialog.returnValue = retval
                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()
+skin.loadSkin(getDesktop())
+
+import Components.InputDevice
+Components.InputDevice.InitInputDevices()
+
+import Components.AVSwitch
+Components.AVSwitch.InitAVSwitch()
+
+import Components.Network
+Components.Network.InitNetwork()
+
+import Components.Lcd
+Components.Lcd.InitLcd()
+
+import Components.SetupDevices
+Components.SetupDevices.InitSetupDevices()
+
+import Components.RFmod
+Components.RFmod.InitRFmod()
+
+import Components.NimManager
 
 # 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