implement proper 'destroy' functions in Converter

[enigma2.git] / lib / python / Components / Converter / ConditionalShowHide.py

diff --git a/lib/python/Components/Converter/ConditionalShowHide.py b/lib/python/Components/Converter/ConditionalShowHide.py
index 8d9baf7d567ca5a149de7c76415588e4fb3ec292..50e8b1a8dee879f905e60354b1b96db0de071a1c 100644 (file)
--- a/lib/python/Components/Converter/ConditionalShowHide.py
+++ b/lib/python/Components/Converter/ConditionalShowHide.py
@@ -1,14 +1,64 @@
+from enigma import eTimer
 from Converter import Converter
 
 class ConditionalShowHide(Converter, object):
-       def __init__(self, type):
+       def __init__(self, argstr):
                Converter.__init__(self, type)
-               self.invert = type == "Invert"
+               args = argstr.split(',')
+               self.invert = "Invert" in args
+               self.blink = "Blink" in args
+               if self.blink:
+                       self.blinktime = 500
+                       self.timer = eTimer()
+                       self.timer.timeout.get().append(self.blinkFunc)
+               else:
+                       self.timer = None
 
-       def changed(self, what):
+       def blinkFunc(self):
+               if self.blinking == True:
+                       for x in self.downstream_elements:
+                               x.visible = not x.visible
+
+       def startBlinking(self):
+               self.blinking = True
+               self.timer.start(self.blinktime)
+
+       def stopBlinking(self):
+               self.blinking = False
                for x in self.downstream_elements:
-                       x.visible = self.source.boolean ^ self.invert
+                       if x.visible:
+                               x.hide()
+               self.timer.stop()
+
+       def calcVisibility(self):
+               b = self.source.boolean
+               if b is None:
+                       return True
+               b ^= self.invert
+               return b
+
+       def changed(self, what):
+               vis = self.calcVisibility()
+               if self.blink:
+                       if vis:
+                               self.startBlinking()
+                       else:
+                               self.stopBlinking()
+               else:
+                       for x in self.downstream_elements:
+                               x.visible = vis
 
        def connectDownstream(self, downstream):
                Converter.connectDownstream(self, downstream)
-               downstream.visible = self.source.boolean ^ self.invert
+               vis = self.calcVisibility()
+               if self.blink:
+                       if vis:
+                               self.startBlinking()
+                       else:
+                               self.stopBlinking()
+               else:
+                       downstream.visible = self.calcVisibility()
+
+       def destroy(self):
+               if self.timer:
+                       self.timer.timeout.get().remove(self.blinkFunc)