use steps in startwizard

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

diff --git a/lib/python/Components/Pixmap.py b/lib/python/Components/Pixmap.py
index 8f59880b2b27dd721ff096510bf9fd1862d41255..5f4b96915d5e1c5b449c5298dc09efadff1228ac 100644 (file)
--- 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,46 +16,12 @@ class Pixmap(GUIComponent):
 
        def removeWidget(self, w):
                pass
-       
-       def showPixmap(self):
-               self.state = self.SHOWN
-               self.instance.show()
 
-       def hidePixmap(self):
-               self.state = self.HIDDEN
-               self.instance.hide()
-       
-       def removeWidget(self, instance):
-               pass
+       def move(self, x, y):
+               self.instance.move(ePoint(int(x), int(y)))
 
-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())