allow two different behaviours when going into resume: SUSPEND_STOPS (default as...

[enigma2.git] / lib / python / Screens / Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index ba96ef503680f7f3fea174694da5dec02ac7d5f3..7ac7841ca38bc20de7b098f5e2812593cc81ca90 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,10 +1,15 @@
-from Components.HTMLSkin import HTMLSkin
+from Tools.Profile import profile
+
+profile("LOAD:GUISkin")

 from Components.GUISkin import GUISkin
 from Components.GUISkin import GUISkin

+profile("LOAD:Source")

 from Components.Sources.Source import Source
 from Components.Sources.Source import Source

+profile("LOAD:GUIComponent")

 from Components.GUIComponent import GUIComponent
 
 from Components.GUIComponent import GUIComponent
 

-class Screen(dict, HTMLSkin, GUISkin):
+class Screen(dict, GUISkin):

 
 

+       False, SUSPEND_STOPS, SUSPEND_PAUSES = range(3)

        ALLOW_SUSPEND = False
 
        global_screen = None
        ALLOW_SUSPEND = False
 
        global_screen = None


@@ -47,7 +52,7 @@ class Screen(dict, HTMLSkin, GUISkin):
                        tmp = self.close_on_next_exec
                        self.close_on_next_exec = None
                        self.execing = True
                        tmp = self.close_on_next_exec
                        self.close_on_next_exec = None
                        self.execing = True

-                       self.close(tmp)
+                       self.close(*tmp)

                else:
                        single = self.onFirstExecBegin
                        self.onFirstExecBegin = []
                else:
                        single = self.onFirstExecBegin
                        self.onFirstExecBegin = []


@@ -71,10 +76,11 @@ class Screen(dict, HTMLSkin, GUISkin):
                                x()
        
        def execEnd(self):
                                x()
        
        def execEnd(self):

+               active_components = self.active_components

 #              for (name, val) in self.items():
 #              for (name, val) in self.items():

-               for val in self.active_components:
+               self.active_components = None
+               for val in active_components:

                        val.execEnd()
                        val.execEnd()

-               del self.active_components

 #              assert self.session != None, "execEnd on non-execing screen!"
 #              self.session = None
                self.execing = False
 #              assert self.session != None, "execEnd on non-execing screen!"
 #              self.session = None
                self.execing = False


@@ -94,18 +100,15 @@ class Screen(dict, HTMLSkin, GUISkin):
                # but currently we destroy the screen afterwards
                # anyway.
                for val in self.renderer:
                # but currently we destroy the screen afterwards
                # anyway.
                for val in self.renderer:

-                       val.disconnectAll()  # disconnected converter/sources and probably destroy them
-               
+                       val.disconnectAll()  # disconnected converter/sources and probably destroy them. Sources will not be destroyed.
+

                del self.session
                for (name, val) in self.items():
                        val.destroy()
                        del self[name]
                del self.session
                for (name, val) in self.items():
                        val.destroy()
                        del self[name]

-               
-               for val in self.renderer:
-                       val.destroy()
-               
+

                self.renderer = [ ]
                self.renderer = [ ]

-               
+

                # really delete all elements now
                self.__dict__.clear()
        
                # really delete all elements now
                self.__dict__.clear()