X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b0ce62b0d959fd0d2d20022d803acb1c100d2bb5..58f7595413ff237526e5342d2346255d9396e60d:/lib/python/Screens/Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index e6abdef9..797acbc9 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -1,10 +1,12 @@
 from Components.HTMLSkin import *
 from Components.GUISkin import *
+from Components.Sources.Source import Source
 
 import sys
 
 class Screen(dict, HTMLSkin, GUISkin):
-	""" bla """
+
+	ALLOW_SUSPEND = False
 
 	def __init__(self, session):
 		self.skinName = self.__class__.__name__
@@ -12,6 +14,7 @@ class Screen(dict, HTMLSkin, GUISkin):
 		GUISkin.__init__(self)
 		
 		self.onClose = [ ]
+		self.onFirstExecBegin = [ ]
 		self.onExecBegin = [ ]
 		self.onShown = [ ]
 		
@@ -21,30 +24,46 @@ class Screen(dict, HTMLSkin, GUISkin):
 		self.execing = False
 		self.shown = False
 		
+		self.renderer = [ ]
+		
 		# in order to support screens *without* a help,
 		# we need the list in every screen. how ironic.
 		self.helpList = [ ]
 		
+		self.close_on_next_exec = None
+		
+		# stand alone screens (for example web screens)
+		# don't care about having or not having focus.
+		self.stand_alone = False
+
 	def execBegin(self):
 		self.active_components = [ ]
-		for x in self.onExecBegin:
-			x()
-			if self.session.current_dialog != self:
-				return
+		if self.close_on_next_exec is not None:
+			tmp = self.close_on_next_exec
+			self.close_on_next_exec = None
+			self.execing = True
+			self.close(tmp)
+		else:
+			single = self.onFirstExecBegin
+			self.onFirstExecBegin = []
+			for x in self.onExecBegin + single:
+				x()
+				if not self.stand_alone and self.session.current_dialog != self:
+					return
 
-#		assert self.session == None, "a screen can only exec once per time"
-#		self.session = session
+#			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)
+			for val in self.values() + self.renderer:
+				val.execBegin()
+				if not self.stand_alone and self.session.current_dialog != self:
+					return
+				self.active_components.append(val)
 
-		self.execing = True
+			self.execing = True
 	
-		for x in self.onShown:
-			x()
+			for x in self.onShown:
+				x()
 	
 	def execEnd(self):
 #		for (name, val) in self.items():
@@ -64,17 +83,32 @@ class Screen(dict, HTMLSkin, GUISkin):
 		# fixup circular references
 		del self.helpList
 		GUISkin.close(self)
+
+		# first disconnect all render from their sources.
+		# we might split this out into a "unskin"-call,
+		# but currently we destroy the screen afterwards
+		# anyway.
+		for val in self.renderer:
+			val.disconnectAll()  # disconnected converter/sources and probably destroy them
 		
 		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()
 	
 	def close(self, *retval):
-		self.session.close(self, *retval)
+		if not self.execing:
+			self.close_on_next_exec = retval
+		else:
+			self.session.close(self, *retval)
 
 	def setFocus(self, o):
 		self.instance.setFocus(o.instance)
@@ -86,8 +120,8 @@ class Screen(dict, HTMLSkin, GUISkin):
 		self.instance.show()
 		for x in self.onShow:
 			x()
-		for (name, val) in self.items():
-			if isinstance(val, GUIComponent):
+		for val in self.values() + self.renderer:
+			if isinstance(val, GUIComponent) or isinstance(val, Source):
 				val.onShow()
 
 	def hide(self):
@@ -97,6 +131,9 @@ class Screen(dict, HTMLSkin, GUISkin):
 		self.instance.hide()
 		for x in self.onHide:
 			x()
-		for (name, val) in self.items():
-			if isinstance(val, GUIComponent):
+		for val in self.values() + self.renderer:
+			if isinstance(val, GUIComponent) or isinstance(val, Source):
 				val.onHide()
+
+	def __repr__(self):
+		return str(type(self))