use PixmapConditional for BlinkingPixmap

diff --git a/lib/python/Components/BlinkingPixmap.py b/lib/python/Components/BlinkingPixmap.py
index 1f2f42257c620cb63de4ec90d978759ce15bfefe..e564eb1e3c1c8d2a12810415916ad5fbb160f498 100644 (file)
--- a/lib/python/Components/BlinkingPixmap.py
+++ b/lib/python/Components/BlinkingPixmap.py
@@ -1,7 +1,7 @@
 from HTMLComponent import *
 from GUIComponent import *
 
-from Pixmap import Pixmap
+from Pixmap import *
 
 from enigma import *
 
@@ -60,34 +60,19 @@ class BlinkingPixmap(GUIComponent, Pixmap):
                        self.hidePixmap()
                self.timer.stop()
                
-class BlinkingPixmapConditional(BlinkingPixmap):
+class BlinkingPixmapConditional(BlinkingPixmap, PixmapConditional):
        def __init__(self):
                BlinkingPixmap.__init__(self)
+               PixmapConditional.__init__(self)
                
-               self.setConnect(None)
-               
-               self.conditionCheckTimer = eTimer()
-               self.conditionCheckTimer.timeout.get().append(self.conditionallyBlink)
-               self.conditionCheckTimer.start(1000)
-               
-       def setConnect(self, conditionalFunction):
-               self.conditionalFunction = conditionalFunction
-               
-       def conditionallyBlink(self):
-               try:
-                       self.conditionalFunction() # check, if the conditionalfunction is still valid
-               except:
-                       self.conditionalFunction = None
-                       self.stopBlinking()
-                       
-               if self.conditionalFunction != None:
-                       if self.conditionalFunction(): # we shall blink
-                               if self.blinking: # we are already blinking
-                                       pass
-                               else: # we don't blink
-                                       self.startBlinking()
-                       else: # we shall not blink
-                               if self.blinking: # we are blinking
-                                       self.stopBlinking()
-                               else: # we don't blink
-                                       pass
\ No newline at end of file
+       def activateCondition(self, condition):
+               if (condition):
+                       if self.blinking: # we are already blinking
+                               pass
+                       else: # we don't blink
+                               self.startBlinking()
+               else:
+                       if self.blinking: # we are blinking
+                               self.stopBlinking()
+                       else: # we don't blink
+                               pass

diff --git a/lib/python/Components/Pixmap.py b/lib/python/Components/Pixmap.py
index a98fef14f0163a0b98a9275c9b2a4c9b8b12634a..264ffe29df6942a3ce2e5a924c19b29f0ce91277 100644 (file)
--- a/lib/python/Components/Pixmap.py
+++ b/lib/python/Components/Pixmap.py
@@ -27,6 +27,8 @@ class PixmapConditional(Pixmap):
        def __init__(self, withTimer = True):
                Pixmap.__init__(self)
                
+               self.setConnect(None)
+               
                if (withTimer):
                        self.conditionCheckTimer = eTimer()
                        self.conditionCheckTimer.timeout.get().append(self.update)
@@ -37,15 +39,16 @@ class PixmapConditional(Pixmap):
                
        def activateCondition(self, condition):
                if (condition):
-                       self.instance.hide()
-               else:
                        self.instance.show()
+               else:
+                       self.instance.hide()
 
        def update(self):
-               try:
-                       self.conditionalFunction() # check, if the conditionalfunction is still valid
-               except:
-                       self.conditionalFunction = None
-                       self.activateCondition(False)
+               if (self.setConnect != None):
+                       try:
+                               self.conditionalFunction() # check, if the conditionalfunction is still valid
+                       except:
+                               self.conditionalFunction = None
+                               self.activateCondition(False)
                        
-               self.activateCondition(self.conditionalFunction())
+                       self.activateCondition(self.conditionalFunction())