support for renderer

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

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 8398dadd0fb17169c3828173d4bd29691452725c..bbc6b1ec128bc7cd24449a96fc17d371db1f57a8 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -35,7 +35,7 @@ class Screen(dict, HTMLSkin, GUISkin):
 #              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
@@ -67,13 +67,19 @@ class Screen(dict, HTMLSkin, GUISkin):
                
                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)
@@ -85,7 +91,7 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.instance.show()
                for x in self.onShow:
                        x()
-               for (name, val) in self.items():
+               for val in self.values() + self.renderer:
                        if isinstance(val, GUIComponent):
                                val.onShow()
 
@@ -96,6 +102,6 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.instance.hide()
                for x in self.onHide:
                        x()
-               for (name, val) in self.items():
+               for val in self.values() + self.renderer:
                        if isinstance(val, GUIComponent):
                                val.onHide()