X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FScreen.py;h=e6abdef95a06f21153786b70ce53781d89dd2aac;hb=b0ce62b0d959fd0d2d20022d803acb1c100d2bb5;hp=ef9b2bb003452c4cd9141ff4d6bc67255d3861ca;hpb=a4da9cccc2575c4bf299bde9594dad3e049ddf6a;p=vuplus_dvbapp

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index ef9b2bb..e6abdef 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -11,27 +11,92 @@ class Screen(dict, HTMLSkin, GUISkin):
 		self.session = session
 		GUISkin.__init__(self)
 		
+		self.onClose = [ ]
+		self.onExecBegin = [ ]
+		self.onShown = [ ]
+		
+		self.onShow = [ ]
+		self.onHide = [ ]
+		
+		self.execing = False
+		self.shown = False
+		
+		# in order to support screens *without* a help,
+		# we need the list in every screen. how ironic.
+		self.helpList = [ ]
+		
 	def execBegin(self):
-#		assert self.session == None, "a screen can only exec one per time"
+		self.active_components = [ ]
+		for x in self.onExecBegin:
+			x()
+			if self.session.current_dialog != self:
+				return
+
+#		assert self.session == None, "a screen can only exec once per time"
 #		self.session = session
+
 		for (name, val) in self.items():
 			val.execBegin()
+			if self.session.current_dialog != 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):
+		self.hide()
+		for x in self.onClose:
+			x()
+		
+		# fixup circular references
+		del self.helpList
 		GUISkin.close(self)
 		
 		del self.session
 		for (name, val) in self.items():
-			print "%s -> %d" % (name, sys.getrefcount(val))
+			val.destroy()
 			del self[name]
+		
+		# really delete all elements now
+		self.__dict__.clear()
 	
-	def close(self, retval=None):
-		self.session.close()
+	def close(self, *retval):
+		self.session.close(self, *retval)
+
+	def setFocus(self, o):
+		self.instance.setFocus(o.instance)
 
+	def show(self):
+		if self.shown:
+			return
+		self.shown = True
+		self.instance.show()
+		for x in self.onShow:
+			x()
+		for (name, val) in self.items():
+			if isinstance(val, GUIComponent):
+				val.onShow()
+
+	def hide(self):
+		if not self.shown:
+			return
+		self.shown = False
+		self.instance.hide()
+		for x in self.onHide:
+			x()
+		for (name, val) in self.items():
+			if isinstance(val, GUIComponent):
+				val.onHide()