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 e9f9affda207c050fbaf1ac03da7ba541ae57dfa..5f1cf6d610193b848db2aba773613a11ff83ce87 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -11,34 +11,104 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.session = session
                GUISkin.__init__(self)
                
+               self.onClose = [ ]
+               self.onExecBegin = [ ]
+               self.onShown = [ ]
+               
+               self.onShow = [ ]
+               self.onHide = [ ]
+               
+               self.execing = False
+               self.shown = False
+               
                # in order to support screens *without* a help,
                # we need the list in every screen. how ironic.
                self.helpList = [ ]
                
        def execBegin(self):
-#              assert self.session == None, "a screen can only exec one per time"
+               self.active_components = [ ]
+               for x in self.onExecBegin:
+                       x()
+                       if self.session.current_dialog != self:
+                               return
+
+#              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.current_dialog != self:
+                               return
+                       self.active_components.append(val)
+
+               self.execing = True
+       
+               for x in self.onShown:
+                       x()
        
        def execEnd(self):
-               for (name, val) in self.items():
+#              for (name, val) in self.items():
+               for val in self.active_components:
                        val.execEnd()
+               del self.active_components
 #              assert self.session != None, "execEnd on non-execing screen!"
 #              self.session = None
+               self.execing = False
        
        # 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)
+
+       def show(self):
+               if self.shown:
+                       return
+               self.shown = True
+               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:
+                       return
+               self.shown = False
+               self.instance.hide()
+               for x in self.onHide:
+                       x()
+               for val in self.values() + self.renderer:
+                       if isinstance(val, GUIComponent):
+                               val.onHide()