X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/cb52eb273bed4c28716b501fbbf128d2c7046d57..518491f6f2c7d437f00d82d9d06fda023a6fa064:/lib/python/Components/BlinkingPixmap.py

diff --git a/lib/python/Components/BlinkingPixmap.py b/lib/python/Components/BlinkingPixmap.py
index e34e9165..45b8a06b 100644
--- a/lib/python/Components/BlinkingPixmap.py
+++ b/lib/python/Components/BlinkingPixmap.py
@@ -1,23 +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
-	
-	def __init__(self, filename):
+class BlinkingPixmap(Pixmap):
+	def __init__(self):
 		Pixmap.__init__(self)
-		GUIComponent.__init__(self)
 		
-		self.filename = filename
-		
-		self.state = self.SHOWN
 		self.blinking = False
 		
 		self.setBlinkTime(500)
@@ -25,32 +15,15 @@ class BlinkingPixmap(GUIComponent, Pixmap):
 		self.timer = eTimer()
 		self.timer.timeout.get().append(self.blink)
 	
-		
-	def createWidget(self, parent):
-		return self.getePixmap(parent, self.filename)
-
-	def removeWidget(self, w):
-		pass
-	
-	def showPoint(self):
-		print "Show point"
-		self.state = self.SHOWN
-		self.instance.show()
-
-	def hidePoint(self):
-		print "Hide point"
-		self.state = self.HIDDEN
-		self.instance.hide()
-		
 	def setBlinkTime(self, time):
 		self.blinktime = time
 		
 	def blink(self):
 		if self.blinking == True:
 			if (self.state == self.SHOWN):
-				self.hidePoint()
+				self.hidePixmap()
 			elif (self.state == self.HIDDEN):
-				self.showPoint()
+				self.showPixmap()
 			
 	def startBlinking(self):
 		self.blinking = True
@@ -59,37 +32,18 @@ class BlinkingPixmap(GUIComponent, Pixmap):
 	def stopBlinking(self):
 		self.blinking = False
 		if (self.state == self.SHOWN):
-			self.hidePoint()
+			self.hidePixmap()
 		self.timer.stop()
 		
-class BlinkingPixmapConditional(BlinkingPixmap):
-	def __init__(self, filename):
-		BlinkingPixmap.__init__(self, filename)
-		
-		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
+class BlinkingPixmapConditional(BlinkingPixmap, PixmapConditional):
+	def __init__(self):
+		BlinkingPixmap.__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()