remove bouquets.tv and userbouquets... from Makefile (it is installed

[enigma2.git] / mytest.py

diff --git a/mytest.py b/mytest.py
index 7e7c662d15bf03a7cd3cbe5d2e650f5a1403bd5b..5b3258d12f36cfed9d504f48f032c98f69d271d1 100644 (file)
--- a/mytest.py
+++ b/mytest.py
@@ -8,7 +8,7 @@ from Tools.Profile import profile, profile_final
 profile("PYTHON_START")
 
 from enigma import runMainloop, eDVBDB, eTimer, quitMainloop, eDVBVolumecontrol, \
-       getDesktop, ePythonConfigQuery, eAVSwitch, eWindow, eServiceEvent
+       getDesktop, ePythonConfigQuery, eAVSwitch, eServiceEvent
 from tools import *
 
 profile("LANGUAGE")
@@ -74,6 +74,7 @@ profile("LOAD:Wizard")
 from Screens.Wizard import wizardManager
 from Screens.ImageWizard import *
 from Screens.StartWizard import *
+from Screens.DefaultWizard import *
 from Screens.TutorialWizard import *
 from Tools.BoundFunction import boundFunction
 from Plugins.Plugin import PluginDescriptor
@@ -99,14 +100,6 @@ def dump(dir, p = ""):
 
 # display
 
-class OutputDevice:
-       def create(self, screen): pass
-
-class GUIOutputDevice(OutputDevice):
-       parent = None
-       def create(self, comp, desktop):
-               comp.createGUIScreen(self.parent, desktop)
-
 profile("LOAD:ScreenGlobals")
 from Screens.Globals import Globals
 from Screens.SessionGlobals import SessionGlobals
@@ -249,20 +242,8 @@ class Session:
                # create GUI view of this dialog
                assert desktop is not None
 
-               z = 0
-               title = ""
-               for (key, value) in dlg.skinAttributes:
-                       if key == "zPosition":
-                               z = int(value)
-                       elif key == "title":
-                               title = value
-
-               dlg.instance = eWindow(desktop, z)
-               dlg.title = title
-               applyAllAttributes(dlg.instance, desktop, dlg.skinAttributes)
-               gui = GUIOutputDevice()
-               gui.parent = dlg.instance
-               gui.create(dlg, desktop)
+               dlg.setDesktop(desktop)
+               dlg.applySkin()
 
                return dlg
 
@@ -431,9 +412,9 @@ class PowerKey:
 
        def shutdown(self):
                print "PowerOff - Now!"
-               if not Screens.Standby.inTryQuitMainloop:
+               if not Screens.Standby.inTryQuitMainloop and self.session.current_dialog and self.session.current_dialog.ALLOW_SUSPEND:
                        self.session.open(Screens.Standby.TryQuitMainloop, 1)
-               
+
        def powerlong(self):
                self.standbyblocked = 1
                action = config.usage.on_long_powerpress.value
@@ -626,6 +607,11 @@ profile("Init:CI")
 import Screens.Ci
 Screens.Ci.InitCiConfig()
 
+#from enigma import dump_malloc_stats
+#t = eTimer()
+#t.callback.append(dump_malloc_stats)
+#t.start(1000)
+
 # first, setup a screen
 try:
        runScreenTest()