X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/242c6b39353c18564993022d46560e0d29c6526b..e66f4bdb5fd20a77e5db713d732275aa32b22af5:/lib/python/Screens/Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index cfcb5284..4c4f117b 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,16 +1,22 @@
-from Components.HTMLSkin import *
-from Components.GUISkin import *
-from Components.Sources.Source import Source
+from Tools.Profile import profile, profile_final
 
-import sys
+profile("LOAD:GUISkin")
+from Components.GUISkin import GUISkin
+profile("LOAD:Source")
+from Components.Sources.Source import Source
+profile("LOAD:GUIComponent")
+from Components.GUIComponent import GUIComponent
 
-class Screen(dict, HTMLSkin, GUISkin):
+class Screen(dict, 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 = [ ]
@@ -45,7 +51,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 = []
@@ -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