widget: add - untested, as usual - z ordering

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 49283357fcb39d4d7903114ccb027bd3fe93ed71..ea4913cc49ddcae4b94e37363d70f3d854c0651e 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
 
@@ -13,6 +15,10 @@ from Navigation import Navigation
 
 from skin import readSkin, applyAllAttributes
 
+from Components.config import configfile
+from Screens.Wizard import listActiveWizards
+from Tools.BoundFunction import boundFunction
+
 had = dict()
 
 def dump(dir, p = ""):
@@ -68,7 +74,6 @@ class Session:
                if self.currentDialog.isTmp:
                        self.currentDialog.doClose()
                
-                       print sys.getrefcount(self.currentDialog)
                        del self.currentDialog.instance
 #                      dump(self.currentDialog)
                        del self.currentDialog
@@ -89,7 +94,14 @@ class Session:
        
        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
@@ -100,7 +112,7 @@ class Session:
                        print 'EXCEPTION IN DIALOG INIT CODE, ABORTING:'
                        print '-'*60
                        traceback.print_exc(file=sys.stdout)
-                       quitMainloop()
+                       quitMainloop(5)
                        print '-'*60
                
                # read skin data
@@ -125,6 +137,8 @@ class Session:
                if len(self.dialogStack):
                        self.currentDialog = self.dialogStack.pop()
                        self.execBegin()
+               else:
+                       self.currentDialog = None
 
        def execDialog(self, dialog):
                self.pushCurrent()
@@ -152,18 +166,35 @@ class Session:
                self.delayTimer.start(0, 1)
 
 
+
 def runScreenTest():
        session = Session()
        session.desktop = getDesktop()
        
        session.nav = Navigation()
        
-       session.open(Screens.InfoBar.InfoBar)
+       screensToRun = listActiveWizards()
+       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)
        
        runMainloop()
        
+       configfile.save()
+       
        session.nav.shutdown()
        
        return 0
@@ -182,9 +213,15 @@ 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
@@ -194,24 +231,5 @@ except:
        print 'EXCEPTION IN PYTHON STARTUP CODE:'
        print '-'*60
        traceback.print_exc(file=sys.stdout)
-       quitMainloop()
+       quitMainloop(5)
        print '-'*60
-
-# now, run the mainloop
-
-#pt = eDebugClassPtr()
-#eDebugClass.getDebug(pt, 12)
-#p = pt.__deref__()
-#print pt.x
-#print p.x
-#print "removing ptr..."
-#pt = 0
-#print "now"
-#print "p is " + str(p)
-#print p.x
-#p = 0
-#
-#bla = eDebugClass()
-#bla = eDebugClass(2)
-#
-