dont crash when asked for wrong slotID - as done in ScanSetup

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

diff --git a/lib/python/Components/BlinkingPixmap.py b/lib/python/Components/BlinkingPixmap.py
index 1f2f42257c620cb63de4ec90d978759ce15bfefe..45b8a06b483d94e4e808b194c3b4b59ea2d9bb6b 100644 (file)
--- a/lib/python/Components/BlinkingPixmap.py
+++ b/lib/python/Components/BlinkingPixmap.py
@@ -1,21 +1,13 @@
-from HTMLComponent import *
-from GUIComponent import *
-
-from Pixmap import Pixmap
+from Pixmap import *
 
 from enigma import *
 
 import time
 
-class BlinkingPixmap(GUIComponent, Pixmap):
-       SHOWN = 0
-       HIDDEN = 1
-       
+class BlinkingPixmap(Pixmap):
        def __init__(self):
                Pixmap.__init__(self)
-               GUIComponent.__init__(self)
                
-               self.state = self.SHOWN
                self.blinking = False
                
                self.setBlinkTime(500)
@@ -23,23 +15,6 @@ class BlinkingPixmap(GUIComponent, Pixmap):
                self.timer = eTimer()
                self.timer.timeout.get().append(self.blink)
        
-               
-       def createWidget(self, parent):
-               return self.getePixmap(parent)
-
-       def removeWidget(self, w):
-               pass
-       
-       def showPixmap(self):
-               print "Show pixmap"
-               self.state = self.SHOWN
-               self.instance.show()
-
-       def hidePixmap(self):
-               print "Hide pixmap"
-               self.state = self.HIDDEN
-               self.instance.hide()
-               
        def setBlinkTime(self, time):
                self.blinktime = time
                
@@ -60,34 +35,15 @@ class BlinkingPixmap(GUIComponent, Pixmap):
                        self.hidePixmap()
                self.timer.stop()
                
-class BlinkingPixmapConditional(BlinkingPixmap):
+class BlinkingPixmapConditional(BlinkingPixmap, PixmapConditional):
        def __init__(self):
                BlinkingPixmap.__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
+               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()