fix close return values for non execing dialogs

[vuplus_dvbapp] / lib / python / Screens / Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 5349291..92efb70 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,50 +1,61 @@
-from Components.HTMLSkin import *
-from Components.GUISkin import *
+from Components.HTMLSkin import HTMLSkin
+from Components.GUISkin import GUISkin
 from Components.Sources.Source import Source
-
-import sys
+from Components.GUIComponent import GUIComponent
 
 class Screen(dict, HTMLSkin, GUISkin):
 
        ALLOW_SUSPEND = False
 
-       def __init__(self, session):
+       global_screen = None
+
+       def __init__(self, session, parent = None):
                self.skinName = self.__class__.__name__
                self.session = session
+               self.parent = parent
                GUISkin.__init__(self)
-               
+
                self.onClose = [ ]
                self.onFirstExecBegin = [ ]
                self.onExecBegin = [ ]
                self.onShown = [ ]
-               
+
                self.onShow = [ ]
                self.onHide = [ ]
-               
+
                self.execing = False
-               self.shown = False
                
+               self.shown = True
+               # already shown is false until the screen is really shown (after creation)
+               self.already_shown = False
+
                self.renderer = [ ]
-               
+
                # in order to support screens *without* a help,
                # we need the list in every screen. how ironic.
                self.helpList = [ ]
-               
+
                self.close_on_next_exec = None
 
+               self.in_close = False
+
+               # stand alone screens (for example web screens)
+               # don't care about having or not having focus.
+               self.stand_alone = False
+
        def execBegin(self):
                self.active_components = [ ]
                if self.close_on_next_exec is not None:
                        tmp = self.close_on_next_exec
                        self.close_on_next_exec = None
                        self.execing = True
-                       self.close(tmp)
+                       self.close(*tmp)
                else:
                        single = self.onFirstExecBegin
                        self.onFirstExecBegin = []
                        for x in self.onExecBegin + single:
                                x()
-                               if self.session.current_dialog != self:
+                               if not self.stand_alone and self.session.current_dialog != self:
                                        return
 
 #                      assert self.session == None, "a screen can only exec once per time"
@@ -52,7 +63,7 @@ class Screen(dict, HTMLSkin, GUISkin):
 
                        for val in self.values() + self.renderer:
                                val.execBegin()
-                               if self.session.current_dialog != self:
+                               if not self.stand_alone and self.session.current_dialog != self:
                                        return
                                self.active_components.append(val)
 
@@ -101,18 +112,21 @@ class Screen(dict, HTMLSkin, GUISkin):
                self.__dict__.clear()
        
        def close(self, *retval):
-               if not self.execing:
-                       self.close_on_next_exec = retval
-               else:
-                       self.session.close(self, *retval)
+               if not self.in_close:
+                       if not self.execing:
+                               self.close_on_next_exec = retval
+                       else:
+                               self.in_close = True
+                               self.session.close(self, *retval)
 
        def setFocus(self, o):
                self.instance.setFocus(o.instance)
 
        def show(self):
-               if self.shown:
+               if (self.shown and self.already_shown) or not self.instance:
                        return
                self.shown = True
+               self.already_shown = True
                self.instance.show()
                for x in self.onShow:
                        x()
@@ -121,7 +135,7 @@ class Screen(dict, HTMLSkin, GUISkin):
                                val.onShow()
 
        def hide(self):
-               if not self.shown:
+               if not self.shown or not self.instance:
                        return
                self.shown = False
                self.instance.hide()
@@ -133,3 +147,13 @@ class Screen(dict, HTMLSkin, GUISkin):
 
        def __repr__(self):
                return str(type(self))
+
+       def getRelatedScreen(self, name):
+               if name == "session":
+                       return self.session.screen
+               elif name == "parent":
+                       return self.parent
+               elif name == "global":
+                       return self.global_screen
+               else:
+                       return None