X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/67b53c1cb06988394c35a6e965c99b72b67fe1be..bb2800462a81afbcfce36fa15d90808d13eae55b:/lib/python/Screens/Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index ed61d9d6..7ac7841c 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,15 +1,23 @@
-from Components.HTMLSkin import HTMLSkin
+from Tools.Profile import profile
+
+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):
 
+	False, SUSPEND_STOPS, SUSPEND_PAUSES = range(3)
 	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 = [ ]
@@ -44,7 +52,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 = []
@@ -68,10 +76,11 @@ class Screen(dict, HTMLSkin, GUISkin):
 				x()
 	
 	def execEnd(self):
+		active_components = self.active_components
 #		for (name, val) in self.items():
-		for val in self.active_components:
+		self.active_components = None
+		for val in active_components:
 			val.execEnd()
-		del self.active_components
 #		assert self.session != None, "execEnd on non-execing screen!"
 #		self.session = None
 		self.execing = False
@@ -91,18 +100,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()
 	
@@ -140,3 +146,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