X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/32027c3eaa6b04ce081640ef89a73a93081aea85..efc5aca651306518e6f21a6bd7cbfa1928821b60:/lib/python/Screens/Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index 46b94fd4..508309db 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 = [ ]
@@ -22,7 +28,10 @@ class Screen(dict, HTMLSkin, GUISkin):
 		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 = [ ]
 
@@ -42,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 = []
@@ -89,18 +98,15 @@ class Screen(dict, HTMLSkin, GUISkin):
 		# but currently we destroy the screen afterwards
 		# anyway.
 		for val in self.renderer:
-			val.disconnectAll()  # disconnected converter/sources and probably destroy them
-		
+			val.disconnectAll()  # disconnected converter/sources and probably destroy them. Sources will not be destroyed.
+
 		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()
 	
@@ -114,9 +120,10 @@ class Screen(dict, HTMLSkin, GUISkin):
 		self.instance.setFocus(o.instance)
 
 	def show(self):
-		if self.shown or not self.instance:
+		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()
@@ -137,3 +144,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