factorize the conditionalPixmap

[enigma2.git] / lib / python / Components / Pixmap.py

diff --git a/lib/python/Components/Pixmap.py b/lib/python/Components/Pixmap.py
index c97c0ab1645b2104d9b9265326b78a794e335c16..790261188785eef1ad8103eb50648090220136c4 100644 (file)
--- a/lib/python/Components/Pixmap.py
+++ b/lib/python/Components/Pixmap.py
@@ -1,25 +1,23 @@
-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)
+