X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/bb9ce4897ba4326cd0cdf4b394631c679ba353dc..fb412ff32c7938649c72d55eed3f5c8ccb5e0a99:/lib/python/Screens/Screen.py

diff --git a/lib/python/Screens/Screen.py b/lib/python/Screens/Screen.py
index a8d0b048..e6abdef9 100644
--- a/lib/python/Screens/Screen.py
+++ b/lib/python/Screens/Screen.py
@@ -29,15 +29,15 @@ class Screen(dict, HTMLSkin, GUISkin):
 		self.active_components = [ ]
 		for x in self.onExecBegin:
 			x()
-			if self.session.currentDialog != self:
+			if self.session.current_dialog != self:
 				return
 
-#		assert self.session == None, "a screen can only exec one per time"
+#		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.currentDialog != self:
+			if self.session.current_dialog != self:
 				return
 			self.active_components.append(val)
 
@@ -57,6 +57,7 @@ class Screen(dict, HTMLSkin, GUISkin):
 	
 	# never call this directly - it will be called from the session!
 	def doClose(self):
+		self.hide()
 		for x in self.onClose:
 			x()
 		
@@ -66,13 +67,14 @@ class Screen(dict, HTMLSkin, GUISkin):
 		
 		del self.session
 		for (name, val) in self.items():
+			val.destroy()
 			del self[name]
 		
 		# really delete all elements now
 		self.__dict__.clear()
 	
 	def close(self, *retval):
-		self.session.close(*retval)
+		self.session.close(self, *retval)
 
 	def setFocus(self, o):
 		self.instance.setFocus(o.instance)
@@ -84,6 +86,9 @@ class Screen(dict, HTMLSkin, GUISkin):
 		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:
@@ -92,3 +97,6 @@ class Screen(dict, HTMLSkin, GUISkin):
 		self.instance.hide()
 		for x in self.onHide:
 			x()
+		for (name, val) in self.items():
+			if isinstance(val, GUIComponent):
+				val.onHide()