suspend timers when all renders are hidden

8 files changed, 52 insertions, 4 deletions

diff --git a/lib/python/Components/Converter/Poll.py b/lib/python/Components/Converter/Poll.py
index 2b81e325..060c12ea 100644
--- a/lib/python/Components/Converter/Poll.py
+++ b/lib/python/Components/Converter/Poll.py
@@ -23,3 +23,9 @@ class Poll(object):
 
 	def poll(self):
 		self.changed((self.CHANGED_POLL,))
+
+	def doSuspend(self, suspended):
+		self.enabled = not suspended
+		if not suspended:
+			self.poll()
+
diff --git a/lib/python/Components/Converter/StringList.py b/lib/python/Components/Converter/StringList.py
index d5421976..ed264651 100644
--- a/lib/python/Components/Converter/StringList.py
+++ b/lib/python/Components/Converter/StringList.py
@@ -7,11 +7,11 @@ class StringList(Converter):
 	def __init__(self, type):
 		Converter.__init__(self, type)
 
-	def changed(self):
+	def changed(self, what):
 		self.content = eListboxPythonStringContent()
 		if self.source:
 			self.content.setList(self.source.list)
-		self.downstream_elements.changed()
+		self.downstream_elements.changed(what)
 
 	def selectionChanged(self, index):
 		self.source.selectionChanged(index)
diff --git a/lib/python/Components/Element.py b/lib/python/Components/Element.py
index 12218466..019155c6 100644
--- a/lib/python/Components/Element.py
+++ b/lib/python/Components/Element.py
@@ -4,7 +4,7 @@ from Tools.CList import CList
 # Render Converter Converter Source
 
 # a bidirectional connection
-class Element:
+class Element(object):
 	CHANGED_DEFAULT = 0   # initial "pull" state
 	CHANGED_ALL = 1       # really everything changed
 	CHANGED_CLEAR = 2     # we're expecting a real update soon. don't bother polling NOW, but clear data.
@@ -15,6 +15,7 @@ class Element:
 		self.downstream_elements = CList()
 		self.master = None
 		self.source = None
+		self.__suspended = True
 		self.clearCache()
 
 	def connectDownstream(self, downstream):
@@ -61,3 +62,22 @@ class Element:
 
 	def clearCache(self):
 		self.cache = None
+
+	def setSuspend(self, suspended):
+		changed = self.__suspended != suspended
+		if not self.__suspended and suspended:
+			self.doSuspend(1)
+		elif self.__suspended and not suspended:
+			self.doSuspend(0)
+			
+		self.__suspended = suspended
+		if self.source is not None and changed:
+			self.source.checkSuspend()
+	
+	suspended = property(lambda self: self.__suspended, setSuspend)
+	
+	def checkSuspend(self):
+		self.suspended = reduce(lambda x, y: x and y.__suspended, self.downstream_elements, True)
+
+	def doSuspend(self, suspend):
+		pass
diff --git a/lib/python/Components/Renderer/Label.py b/lib/python/Components/Renderer/Label.py
index 3813ce21..e660de1b 100644
--- a/lib/python/Components/Renderer/Label.py
+++ b/lib/python/Components/Renderer/Label.py
@@ -19,3 +19,4 @@ class Label(VariableText, Renderer):
 			self.text = ""
 		else:
 			self.text = self.source.text
+
diff --git a/lib/python/Components/Renderer/Listbox.py b/lib/python/Components/Renderer/Listbox.py
index ab696c23..4ccc0a40 100644
--- a/lib/python/Components/Renderer/Listbox.py
+++ b/lib/python/Components/Renderer/Listbox.py
@@ -75,5 +75,5 @@ class Listbox(Renderer, object):
 
 	selection_enabled = property(lambda self: self.__selection_enabled, setSelectionEnabled)
 
-	def changed(self):
+	def changed(self, what):
 		self.content = self.source.content
diff --git a/lib/python/Components/Renderer/Renderer.py b/lib/python/Components/Renderer/Renderer.py
index 373aa02c..872e9c02 100644
--- a/lib/python/Components/Renderer/Renderer.py
+++ b/lib/python/Components/Renderer/Renderer.py
@@ -5,3 +5,9 @@ class Renderer(GUIComponent, Element):
 	def __init__(self):
 		Element.__init__(self)
 		GUIComponent.__init__(self)
+
+	def onShow(self):
+		self.suspended = False
+
+	def onHide(self):
+		self.suspended = True
diff --git a/lib/python/Components/Sources/Clock.py b/lib/python/Components/Sources/Clock.py
index e2d7faa7..7f1a8d7f 100644
--- a/lib/python/Components/Sources/Clock.py
+++ b/lib/python/Components/Sources/Clock.py
@@ -18,3 +18,11 @@ class Clock(Source):
 
 	def poll(self):
 		self.changed((self.CHANGED_POLL,))
+
+	def doSuspend(self, suspended):
+		if suspended:
+			self.clock_timer.stop()
+		else:
+			self.clock_timer.start(1000)
+			self.poll()
+
diff --git a/lib/python/Components/Sources/FrontendStatus.py b/lib/python/Components/Sources/FrontendStatus.py
index f1402f11..352b9fdc 100644
--- a/lib/python/Components/Sources/FrontendStatus.py
+++ b/lib/python/Components/Sources/FrontendStatus.py
@@ -37,3 +37,10 @@ class FrontendStatus(Source):
 			return service and service.frontendInfo()
 		else:
 			return None
+
+	def doSuspend(self, suspended):
+		if suspended:
+			self.poll_timer.stop()
+		else:
+			self.poll_timer.start(1000)
+