fix bluescreen in some conditions

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

diff --git a/lib/python/Components/ConditionalWidget.py b/lib/python/Components/ConditionalWidget.py
index 52dcb20c84fc778cd18c1b44a470c26f0379e0df..7d35d9565ca2eb5556217cb47d26012ba2e31afe 100644 (file)
--- a/lib/python/Components/ConditionalWidget.py
+++ b/lib/python/Components/ConditionalWidget.py
@@ -1,60 +1,25 @@
-import skin
 from GUIComponent import *
+from enigma import eTimer
 
-from enigma import *
-
-class Widget(GUIComponent):
-       
-       SHOWN = 0
-       HIDDEN = 1
-       
-       def __init__(self):
-               GUIComponent.__init__(self)
-               self.instance = None
-               self.state = self.SHOWN
-       
-       def GUIcreate(self, parent):
-               self.instance = self.createWidget(parent)
-       
-       def GUIdelete(self):
-               self.removeWidget(self.instance)
-               self.instance = None
-       
-       def removeWidget(self, w):
-               pass
-       
-       def showWidget(self):
-               self.state = self.SHOWN
-               self.instance.show()
-
-       def hideWidget(self):
-               self.state = self.HIDDEN
-               self.instance.hide()
-               
-       def move(self, x, y):
-               self.instance.move(ePoint(int(x), int(y)))
-       
-class ConditionalWidget(Widget):
+class ConditionalWidget(GUIComponent):
        def __init__(self, withTimer = True):
-               Widget.__init__(self)
+               GUIComponent.__init__(self)
                
                self.setConnect(None)
                
                if (withTimer):
                        self.conditionCheckTimer = eTimer()
                        self.conditionCheckTimer.timeout.get().append(self.update)
-                       self.conditionCheckTimer.start(500)
+                       self.conditionCheckTimer.start(1000)
                
        def setConnect(self, conditionalFunction):
                self.conditionalFunction = conditionalFunction
                
        def activateCondition(self, condition):
-               if (condition):
-                       if (self.state == self.HIDDEN):
-                               self.showWidget()
+               if condition:
+                       self.visible = 1
                else:
-                       if (self.state == self.SHOWN):
-                               self.hideWidget()
+                       self.visible = 0
 
        def update(self):
                if (self.conditionalFunction != None):
@@ -65,15 +30,11 @@ class ConditionalWidget(Widget):
                                self.conditionalFunction = None
                                self.activateCondition(False)
                        
-
-
-                       
-                       
 import time
 
-class BlinkingWidget(Widget):
+class BlinkingWidget(GUIComponent):
        def __init__(self):
-               Widget.__init__(self)
+               GUIComponent.__init__(self)
                
                self.blinking = True
                
@@ -87,10 +48,7 @@ class BlinkingWidget(Widget):
                
        def blink(self):
                if self.blinking == True:
-                       if (self.state == self.SHOWN):
-                               self.hideWidget()
-                       elif (self.state == self.HIDDEN):
-                               self.showWidget()
+                       self.visible = not self.visible
                        
        def startBlinking(self):
                self.blinking = True
@@ -98,10 +56,10 @@ class BlinkingWidget(Widget):
                
        def stopBlinking(self):
                self.blinking = False
-               if (self.state == self.SHOWN):
-                       self.hideWidget()
+               if self.visible:
+                       self.hide()
                self.timer.stop()
-               
+
 class BlinkingWidgetConditional(BlinkingWidget, ConditionalWidget):
        def __init__(self):
                BlinkingWidget.__init__(self)
@@ -113,4 +71,4 @@ class BlinkingWidgetConditional(BlinkingWidget, ConditionalWidget):
                                self.startBlinking()
                else:
                        if self.blinking: # we are blinking
-                               self.stopBlinking()                     
\ No newline at end of file
+                               self.stopBlinking()