add destroy() for Components to fix bug #52

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

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 231cbfaa0a7314deeaee62baffaa9d8b66ad7724..d4b3d729e32ac11ceb2de790d7d40a291c2429d1 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -15,7 +15,11 @@ class Screen(dict, HTMLSkin, GUISkin):
                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.
@@ -25,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():
                        val.execBegin()
-                       if self.session.currentDialog != self:
+                       if self.session.current_dialog != self:
                                return
                        self.active_components.append(val)
 
@@ -46,12 +50,14 @@ class Screen(dict, HTMLSkin, GUISkin):
 #              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()
                
@@ -61,10 +67,36 @@ class Screen(dict, HTMLSkin, GUISkin):
                
                del self.session
                for (name, val) in self.items():
+                       val.destroy()
                        del self[name]
+               
+               # really delete all elements now
+               self.__dict__.clear()
        
        def close(self, *retval):
                self.session.close(*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 (name, val) in self.items():
+                       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 (name, val) in self.items():
+                       if isinstance(val, GUIComponent):
+                               val.onHide()