X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FConditionalWidget.py;h=192813f527654d1976d61531a224bd0f362b6ce2;hp=7e4304aec7d463eb08c100bc0da3fdd545565a85;hb=6f73e6abddf4170357c490966d0e1c622eb376f5;hpb=768ef462f697f1f108ea1604344439193c968cfc

diff --git a/lib/python/Components/ConditionalWidget.py b/lib/python/Components/ConditionalWidget.py
index 7e4304a..192813f 100644
--- a/lib/python/Components/ConditionalWidget.py
+++ b/lib/python/Components/ConditionalWidget.py
@@ -1,7 +1,5 @@
-import skin
-from GUIComponent import *
-
-from enigma import *
+from GUIComponent import GUIComponent
+from enigma import eTimer
 
 class ConditionalWidget(GUIComponent):
 	def __init__(self, withTimer = True):
@@ -11,49 +9,43 @@ class ConditionalWidget(GUIComponent):
 		
 		if (withTimer):
 			self.conditionCheckTimer = eTimer()
-			self.conditionCheckTimer.timeout.get().append(self.update)
+			self.conditionCheckTimer.callback.append(self.update)
 			self.conditionCheckTimer.start(1000)
-		
+
+	def postWidgetCreate(self, instance):
+		self.visible = 0
+
 	def setConnect(self, conditionalFunction):
 		self.conditionalFunction = conditionalFunction
 		
 	def activateCondition(self, condition):
 		if condition:
-			self.state = self.SHOWN
+			self.visible = 1
 		else:
-			self.state = self.HIDDEN
+			self.visible = 0
 
 	def update(self):
 		if (self.conditionalFunction != None):
 			try:
-				self.conditionalFunction() # check, if the conditionalfunction is still valid
 				self.activateCondition(self.conditionalFunction())
 			except:
 				self.conditionalFunction = None
 				self.activateCondition(False)
-			
-import time
 
 class BlinkingWidget(GUIComponent):
 	def __init__(self):
 		GUIComponent.__init__(self)
-		
-		self.blinking = True
-		
+		self.blinking = False
 		self.setBlinkTime(500)
-
 		self.timer = eTimer()
-		self.timer.timeout.get().append(self.blink)
+		self.timer.callback.append(self.blink)
 	
 	def setBlinkTime(self, time):
 		self.blinktime = time
 		
 	def blink(self):
 		if self.blinking == True:
-			if self.state == self.SHOWN:
-				self.hide()
-			elif self.state == self.HIDDEN:
-				self.show()
+			self.visible = not self.visible
 			
 	def startBlinking(self):
 		self.blinking = True
@@ -61,10 +53,10 @@ class BlinkingWidget(GUIComponent):
 		
 	def stopBlinking(self):
 		self.blinking = False
-		if self.state == self.SHOWN:
+		if self.visible:
 			self.hide()
 		self.timer.stop()
-		
+
 class BlinkingWidgetConditional(BlinkingWidget, ConditionalWidget):
 	def __init__(self):
 		BlinkingWidget.__init__(self)