X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/8138d67d47307c7e438166b9c9cac5992e4929a5..00e833f8ab8c769cc802a050810f4976c99f9a5f:/lib/python/Components/Pixmap.py

diff --git a/lib/python/Components/Pixmap.py b/lib/python/Components/Pixmap.py
index 48eec237..2a54ea98 100644
--- a/lib/python/Components/Pixmap.py
+++ b/lib/python/Components/Pixmap.py
@@ -1,26 +1,11 @@
-import skin
-from GUIComponent import *
+from ConditionalWidget import *
 
 from enigma import *
 
-class Pixmap(GUIComponent):
-	"""Pixmap can be used for components which diplay a pixmap"""
-	
-	SHOWN = 0
-	HIDDEN = 1
-	
+class Pixmap(Widget):
 	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
-	
+		Widget.__init__(self)
+
 	def getePixmap(self, parent):
 		#pixmap = ePixmap(parent)
 		#pixmap.setPixmapFromFile(self.filename)
@@ -31,48 +16,9 @@ class Pixmap(GUIComponent):
 
 	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 removeWidget(self, instance):
-		pass
 
-class PixmapConditional(Pixmap):
+class PixmapConditional(ConditionalWidget, Pixmap):
 	def __init__(self, withTimer = True):
+		ConditionalWidget.__init__(self)
 		Pixmap.__init__(self)
-		
-		self.setConnect(None)
-		
-		if (withTimer):
-			self.conditionCheckTimer = eTimer()
-			self.conditionCheckTimer.timeout.get().append(self.update)
-			self.conditionCheckTimer.start(1000)
-		
-	def setConnect(self, conditionalFunction):
-		self.conditionalFunction = conditionalFunction
-		
-	def activateCondition(self, condition):
-		if (condition):
-			if (self.state == self.HIDDEN):
-				self.showPixmap()
-		else:
-			if (self.state == self.SHOWN):
-				self.hidePixmap()
 
-	def update(self):
-		if (self.conditionalFunction != None):
-			try:
-				self.conditionalFunction() # check, if the conditionalfunction is still valid
-			except:
-				self.conditionalFunction = None
-				self.activateCondition(False)
-			
-			self.activateCondition(self.conditionalFunction())