implement proper 'destroy' functions in Converter

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

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index a6106e1edd1c498f00919ffc4a63a16b8c648e0c..508309dbfa98a0a6966616083fd93140f1b2b453 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,16 +1,22 @@
-from Components.HTMLSkin import *
-from Components.GUISkin import *
-from Components.Sources.Source import Source
+from Tools.Profile import profile, profile_final
 
-import sys
+profile("LOAD:GUISkin")
+from Components.GUISkin import GUISkin
+profile("LOAD:Source")
+from Components.Sources.Source import Source
+profile("LOAD:GUIComponent")
+from Components.GUIComponent import GUIComponent
 
-class Screen(dict, HTMLSkin, GUISkin):
+class Screen(dict, GUISkin):
 
        ALLOW_SUSPEND = False
 
-       def __init__(self, session):
+       global_screen = None
+
+       def __init__(self, session, parent = None):
                self.skinName = self.__class__.__name__
                self.session = session
+               self.parent = parent
                GUISkin.__init__(self)
 
                self.onClose = [ ]
@@ -22,7 +28,10 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.onHide = [ ]
 
                self.execing = False
+               
                self.shown = True
+               # already shown is false until the screen is really shown (after creation)
+               self.already_shown = False
 
                self.renderer = [ ]
 
@@ -42,7 +51,7 @@ class Screen(dict, HTMLSkin, GUISkin):
                        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 = []
@@ -89,18 +98,15 @@ class Screen(dict, HTMLSkin, GUISkin):
                # 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]
-               
-               for val in self.renderer:
-                       val.destroy()
-               
+
                self.renderer = [ ]
-               
+
                # really delete all elements now
                self.__dict__.clear()
        
@@ -113,10 +119,11 @@ class Screen(dict, HTMLSkin, GUISkin):
        def setFocus(self, o):
                self.instance.setFocus(o.instance)
 
-       def show(self, force = False):
-               if (self.shown and not force) or not self.instance:
+       def show(self):
+               if (self.shown and self.already_shown) or not self.instance:
                        return
                self.shown = True
+               self.already_shown = True
                self.instance.show()
                for x in self.onShow:
                        x()
@@ -137,3 +144,13 @@ class Screen(dict, HTMLSkin, GUISkin):
 
        def __repr__(self):
                return str(type(self))
+
+       def getRelatedScreen(self, name):
+               if name == "session":
+                       return self.session.screen
+               elif name == "parent":
+                       return self.parent
+               elif name == "global":
+                       return self.global_screen
+               else:
+                       return None