properly handle tags combined with other prerequisites

[enigma2.git] / lib / python / Components / BlinkingPixmap.py

diff --git a/lib/python/Components/BlinkingPixmap.py b/lib/python/Components/BlinkingPixmap.py
index 45b8a06b483d94e4e808b194c3b4b59ea2d9bb6b..492f14e1ac725cbfe6d548ad8d11f787dd0fc60a 100644 (file)
--- a/lib/python/Components/BlinkingPixmap.py
+++ b/lib/python/Components/BlinkingPixmap.py
@@ -1,49 +1,11 @@
-from Pixmap import *
+from Pixmap import PixmapConditional
+from ConditionalWidget import BlinkingWidgetConditional, BlinkingWidget
 
-from enigma import *
-
-import time
-
-class BlinkingPixmap(Pixmap):
+class BlinkingPixmap(BlinkingWidget):
        def __init__(self):
-               Pixmap.__init__(self)
-               
-               self.blinking = False
-               
-               self.setBlinkTime(500)
-
-               self.timer = eTimer()
-               self.timer.timeout.get().append(self.blink)
-       
-       def setBlinkTime(self, time):
-               self.blinktime = time
-               
-       def blink(self):
-               if self.blinking == True:
-                       if (self.state == self.SHOWN):
-                               self.hidePixmap()
-                       elif (self.state == self.HIDDEN):
-                               self.showPixmap()
-                       
-       def startBlinking(self):
-               self.blinking = True
-               self.timer.start(self.blinktime)
+               Widget.__init__(self)
                
-       def stopBlinking(self):
-               self.blinking = False
-               if (self.state == self.SHOWN):
-                       self.hidePixmap()
-               self.timer.stop()
-               
-class BlinkingPixmapConditional(BlinkingPixmap, PixmapConditional):
+class BlinkingPixmapConditional(BlinkingWidgetConditional, PixmapConditional):
        def __init__(self):
-               BlinkingPixmap.__init__(self)
+               BlinkingWidgetConditional.__init__(self)
                PixmapConditional.__init__(self)
-               
-       def activateCondition(self, condition):
-               if (condition):
-                       if not self.blinking: # we are already blinking
-                               self.startBlinking()
-               else:
-                       if self.blinking: # we are blinking
-                               self.stopBlinking()