add disconnect to elements, and disconnect renderer from sources on screen close

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

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index a8d0b0481f9efedad6432b1852f2da15a6e925a3..5f1cf6d610193b848db2aba773613a11ff83ce87 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -29,15 +29,15 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.active_components = [ ]
                for x in self.onExecBegin:
                        x()
-                       if self.session.currentDialog != self:
+                       if self.session.current_dialog != self:
                                return
 
-#              assert self.session == None, "a screen can only exec one per time"
+#              assert self.session == None, "a screen can only exec once per time"
 #              self.session = session
 
-               for (name, val) in self.items():
+               for val in self.values() + self.renderer:
                        val.execBegin()
-                       if self.session.currentDialog != self:
+                       if self.session.current_dialog != self:
                                return
                        self.active_components.append(val)
 
@@ -57,22 +57,36 @@ class Screen(dict, HTMLSkin, GUISkin):
        
        # never call this directly - it will be called from the session!
        def doClose(self):
+               self.hide()
                for x in self.onClose:
                        x()
                
                # fixup circular references
                del self.helpList
                GUISkin.close(self)
+
+               # first disconnect all render from their sources.
+               # we might split this out into a "unskin"-call,
+               # but currently we destroy the screen afterwards
+               # anyway.
+               for val in self.renderer:
+                       val.disconnectAll()  # disconnected converter/sources and probably destroy them
                
                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()
        
        def close(self, *retval):
-               self.session.close(*retval)
+               self.session.close(self, *retval)
 
        def setFocus(self, o):
                self.instance.setFocus(o.instance)
@@ -84,6 +98,9 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.instance.show()
                for x in self.onShow:
                        x()
+               for val in self.values() + self.renderer:
+                       if isinstance(val, GUIComponent):
+                               val.onShow()
 
        def hide(self):
                if not self.shown:
@@ -92,3 +109,6 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.instance.hide()
                for x in self.onHide:
                        x()
+               for val in self.values() + self.renderer:
+                       if isinstance(val, GUIComponent):
+                               val.onHide()