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

diff --git a/lib/python/Components/Pixmap.py b/lib/python/Components/Pixmap.py
index c97c0ab1..2a54ea98 100644
--- a/lib/python/Components/Pixmap.py
+++ b/lib/python/Components/Pixmap.py
@@ -1,25 +1,24 @@
-import skin
+from ConditionalWidget import *
 
 from enigma import *
 
-class Pixmap:
-	"""Pixmap can be used for components which use a pixmap"""
-	
+class Pixmap(Widget):
 	def __init__(self):
-		self.instance = None
-	
-	def GUIcreate(self, parent):
-		self.instance = self.createWidget(parent)
-		#self.instance.setText(self.message)
-	
-	def GUIdelete(self):
-		self.removeWidget(self.instance)
-		self.instance = None
-	
-	def getePixmap(self, parent, filename):
-		pixmap = ePixmap(parent)
-		pixmap.setPixmapFromFile(filename)
-		return pixmap
+		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(ConditionalWidget, Pixmap):
+	def __init__(self, withTimer = True):
+		ConditionalWidget.__init__(self)
+		Pixmap.__init__(self)
+