X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/85b4fbf32765dd03809defca101cb359ea35cc5c..2ba80311aa9598a775b163f20ca7aff3df1e4d47:/lib/python/Components/Pixmap.py

diff --git a/lib/python/Components/Pixmap.py b/lib/python/Components/Pixmap.py
index a98fef14..2a54ea98 100644
--- a/lib/python/Components/Pixmap.py
+++ b/lib/python/Components/Pixmap.py
@@ -1,51 +1,24 @@
-import skin
+from ConditionalWidget import *
 
 from enigma import *
 
-class Pixmap:
-	"""Pixmap can be used for components which diplay a pixmap"""
-	
+class Pixmap(Widget):
 	def __init__(self):
-		self.instance = None
-	
-	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)
 		return ePixmap(parent)
 	
-	def removeWidget(self, instance):
+	def createWidget(self, parent):
+		return self.getePixmap(parent)
+
+	def removeWidget(self, w):
 		pass
 
-class PixmapConditional(Pixmap):
+class PixmapConditional(ConditionalWidget, Pixmap):
 	def __init__(self, withTimer = True):
+		ConditionalWidget.__init__(self)
 		Pixmap.__init__(self)
-		
-		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):
-			self.instance.hide()
-		else:
-			self.instance.show()
 
-	def update(self):
-		try:
-			self.conditionalFunction() # check, if the conditionalfunction is still valid
-		except:
-			self.conditionalFunction = None
-			self.activateCondition(False)
-			
-		self.activateCondition(self.conditionalFunction())