disable debug output

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

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index cfcb52840e4e4a558cb2a12089f63e95ed42610b..92efb7053b7e209e7fc5c4b92af9174c7e5ae51b 100644 (file)
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,16 +1,18 @@
-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 = [ ]
@@ -35,6 +37,8 @@ class Screen(dict, HTMLSkin, GUISkin):
 
                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
@@ -45,7 +49,7 @@ class Screen(dict, HTMLSkin, GUISkin):
                        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 = []
@@ -108,10 +112,12 @@ 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)
@@ -141,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