X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e3a70a61207238b3c6ac464752a61f5965d95f14..90d9f3e7624282749eb59b57d4996f5d1d06c6b1:/lib/python/Screens/Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index aed7dc67..08e0baa9 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -11,28 +11,61 @@ class Screen(dict, HTMLSkin, GUISkin):
 		self.session = session
 		GUISkin.__init__(self)
 		
+		self.onClose = [ ]
+		self.onExecBegin = [ ]
+		self.onShown = [ ]
+		
+		self.execing = False
+		
+		# in order to support screens *without* a help,
+		# we need the list in every screen. how ironic.
+		self.helpList = [ ]
+		
 	def execBegin(self):
+		self.active_components = [ ]
+		for x in self.onExecBegin:
+			x()
+			if self.session.currentDialog != self:
+				return
+
 #		assert self.session == None, "a screen can only exec one per time"
 #		self.session = session
+
 		for (name, val) in self.items():
 			val.execBegin()
+			if self.session.currentDialog != self:
+				return
+			self.active_components.append(val)
+
+		self.execing = True
+	
+		for x in self.onShown:
+			x()
 	
 	def execEnd(self):
-		for (name, val) in self.items():
+#		for (name, val) in self.items():
+		for val in self.active_components:
 			val.execEnd()
+		del self.active_components
 #		assert self.session != None, "execEnd on non-execing screen!"
 #		self.session = None
+		self.execing = False
 	
 	# never call this directly - it will be called from the session!
 	def doClose(self):
+		for x in self.onClose:
+			x()
+		
+		# fixup circular references
+		del self.helpList
 		GUISkin.close(self)
 		
 		del self.session
 		for (name, val) in self.items():
 			del self[name]
 	
-	def close(self, retval=None):
-		self.session.close()
+	def close(self, *retval):
+		self.session.close(*retval)
 
 	def setFocus(self, o):
 		self.instance.setFocus(o.instance)