X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e33169b42fa0e0aafa995ca2ec0abd605f9768f2..8dfa670adff5299752bcb5a42aff4ae91179ee22:/lib/python/Components/BlinkingPixmap.py

diff --git a/lib/python/Components/BlinkingPixmap.py b/lib/python/Components/BlinkingPixmap.py
index e564eb1e..c1b4262f 100644
--- a/lib/python/Components/BlinkingPixmap.py
+++ b/lib/python/Components/BlinkingPixmap.py
@@ -1,54 +1,29 @@
-from HTMLComponent import *
-from GUIComponent import *
-
 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.blinking = True
 		
 		self.setBlinkTime(500)
 
 		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
 		
 	def blink(self):
 		if self.blinking == True:
 			if (self.state == self.SHOWN):
-				self.hidePixmap()
+				self.hideWidget()
 			elif (self.state == self.HIDDEN):
-				self.showPixmap()
+				self.showWidget()
 			
 	def startBlinking(self):
 		self.blinking = True
@@ -57,7 +32,7 @@ class BlinkingPixmap(GUIComponent, Pixmap):
 	def stopBlinking(self):
 		self.blinking = False
 		if (self.state == self.SHOWN):
-			self.hidePixmap()
+			self.hideWidget()
 		self.timer.stop()
 		
 class BlinkingPixmapConditional(BlinkingPixmap, PixmapConditional):
@@ -67,12 +42,8 @@ class BlinkingPixmapConditional(BlinkingPixmap, PixmapConditional):
 		
 	def activateCondition(self, condition):
 		if (condition):
-			if self.blinking: # we are already blinking
-				pass
-			else: # we don't blink
+			if not self.blinking: # we are already blinking
 				self.startBlinking()
 		else:
 			if self.blinking: # we are blinking
 				self.stopBlinking()
-			else: # we don't blink
-				pass