make bouquet +/- keys working in providers and satellites too

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

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index d4b3d729e32ac11ceb2de790d7d40a291c2429d1..989f90a9e6a5d9dfc6185ecf91955090bee06e2b 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,10 +1,12 @@
 from Components.HTMLSkin import *
 from Components.GUISkin import *
+from Components.Sources.Source import Source
 
 import sys
 
 class Screen(dict, HTMLSkin, GUISkin):
-       """ bla """
+
+       ALLOW_SUSPEND = False
 
        def __init__(self, session):
                self.skinName = self.__class__.__name__
@@ -12,6 +14,7 @@ class Screen(dict, HTMLSkin, GUISkin):
                GUISkin.__init__(self)
                
                self.onClose = [ ]
+               self.onFirstExecBegin = [ ]
                self.onExecBegin = [ ]
                self.onShown = [ ]
                
@@ -21,13 +24,18 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.execing = False
                self.shown = False
                
+               self.renderer = [ ]
+               
                # in order to support screens *without* a help,
                # we need the list in every screen. how ironic.
                self.helpList = [ ]
                
        def execBegin(self):
                self.active_components = [ ]
-               for x in self.onExecBegin:
+
+               single = self.onFirstExecBegin
+               self.onFirstExecBegin = []
+               for x in self.onExecBegin + single:
                        x()
                        if self.session.current_dialog != self:
                                return
@@ -35,7 +43,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
@@ -64,17 +72,29 @@ class Screen(dict, HTMLSkin, GUISkin):
                # 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)
@@ -86,8 +106,8 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.instance.show()
                for x in self.onShow:
                        x()
-               for (name, val) in self.items():
-                       if isinstance(val, GUIComponent):
+               for val in self.values() + self.renderer:
+                       if isinstance(val, GUIComponent) or isinstance(val, Source):
                                val.onShow()
 
        def hide(self):
@@ -97,6 +117,9 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.instance.hide()
                for x in self.onHide:
                        x()
-               for (name, val) in self.items():
-                       if isinstance(val, GUIComponent):
+               for val in self.values() + self.renderer:
+                       if isinstance(val, GUIComponent) or isinstance(val, Source):
                                val.onHide()
+
+       def __repr__(self):
+               return str(type(self))