use default service types for filtering in bouquets

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 74aa2fd1d5e7d36dda79bc8c619137f1d13408fe..cb1bc9076137a0f3c1cf21d8e86899bde905f81b 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -1,6 +1,8 @@
 from enigma import *
 from tools import *
 
+from Components.Language import language
+
 import traceback
 import Screens.InfoBar
 
@@ -14,6 +16,12 @@ from Navigation import Navigation
 from skin import readSkin, applyAllAttributes
 
 from Components.config import configfile
+from Screens.Wizard import wizardManager
+from Screens.StartWizard import *
+from Screens.TutorialWizard import *
+from Tools.BoundFunction import boundFunction
+from Tools.Directories import InitFallbackFiles
+InitFallbackFiles()
 
 had = dict()
 
@@ -65,12 +73,11 @@ class Session:
                self.execEnd()
                
                callback = self.currentDialog.callback
+
                retval = self.currentDialog.returnValue
-               
+
                if self.currentDialog.isTmp:
                        self.currentDialog.doClose()
-               
-                       del self.currentDialog.instance
 #                      dump(self.currentDialog)
                        del self.currentDialog
                else:
@@ -81,16 +88,27 @@ class Session:
                        callback(*retval)
 
        def execBegin(self):
-                       self.currentDialog.execBegin()
-                       self.currentDialog.instance.show()
+               c = self.currentDialog
+               c.execBegin()
+
+               # when execBegin opened a new dialog, don't bother showing the old one.
+               if c == self.currentDialog:
+                       c.instance.show()
                
        def execEnd(self):
-                       self.currentDialog.execEnd()
-                       self.currentDialog.instance.hide()
+               self.currentDialog.execEnd()
+               self.currentDialog.instance.hide()
        
        def create(self, screen, arguments):
                # creates an instance of 'screen' (which is a class)
-               return screen(self, *arguments)
+               try:
+                       return screen(self, *arguments)
+               except:
+                       errstr = "Screen %s(%s): %s" % (str(screen), str(arguments), sys.exc_info()[0])
+                       print errstr
+                       traceback.print_exc(file=sys.stdout)
+                       quitMainloop(5)
+                       
        
        def instantiateDialog(self, screen, *arguments):
                # create dialog
@@ -104,6 +122,9 @@ class Session:
                        quitMainloop(5)
                        print '-'*60
                
+               if dlg is None:
+                       return
+
                # read skin data
                readSkin(dlg, None, dlg.skinName, self.desktop)
 
@@ -126,6 +147,8 @@ class Session:
                if len(self.dialogStack):
                        self.currentDialog = self.dialogStack.pop()
                        self.execBegin()
+               else:
+                       self.currentDialog = None
 
        def execDialog(self, dialog):
                self.pushCurrent()
@@ -135,15 +158,16 @@ class Session:
                self.execBegin()
 
        def openWithCallback(self, callback, screen, *arguments):
-               self.open(screen, *arguments)
-               self.currentDialog.callback = callback
+               dlg = self.open(screen, *arguments)
+               dlg.callback = callback
 
        def open(self, screen, *arguments):
                self.pushCurrent()
-               self.currentDialog = self.instantiateDialog(screen, *arguments)
-               self.currentDialog.isTmp = True
-               self.currentDialog.callback = None
+               dlg = self.currentDialog = self.instantiateDialog(screen, *arguments)
+               dlg.isTmp = True
+               dlg.callback = None
                self.execBegin()
+               return dlg
 
        def keyEvent(self, code):
                print "code " + str(code)
@@ -152,14 +176,27 @@ class Session:
                self.currentDialog.returnValue = retval
                self.delayTimer.start(0, 1)
 
-
 def runScreenTest():
        session = Session()
        session.desktop = getDesktop()
        
        session.nav = Navigation()
        
-       session.open(Screens.InfoBar.InfoBar)
+       screensToRun = wizardManager.getWizards()
+       screensToRun.append(Screens.InfoBar.InfoBar)
+       
+       def runNextScreen(session, screensToRun, *result):
+               if result:
+                       quitMainloop(result)
+
+               screen = screensToRun[0]
+               
+               if len(screensToRun):
+                       session.openWithCallback(boundFunction(runNextScreen, session, screensToRun[1:]), screen)
+               else:
+                       session.open(screen)
+       
+       runNextScreen(session, screensToRun)
 
        CONNECT(keyPressedSignal(), session.keyEvent)
        
@@ -182,6 +219,9 @@ Components.InputDevice.InitInputDevices()
 import Components.AVSwitch
 Components.AVSwitch.InitAVSwitch()
 
+import Components.RecordingConfig
+Components.RecordingConfig.InitRecordingConfig()
+
 import Components.Network
 Components.Network.InitNetwork()