png cleanup by nemesis, source changes.

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

diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index 53442f5022822de0a87e5d3a96075ce83f1b8146..0912a4d0db0e6d36db79a1c2efa223a850b895ba 100644 (file)
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -3,8 +3,9 @@ from GUIComponent import GUIComponent
 
 from Tools.FuzzyDate import FuzzyTime
 
-from enigma import eListboxPythonMultiContent, eListbox, gFont, loadPNG, \
+from enigma import eListboxPythonMultiContent, eListbox, gFont, \
        RT_HALIGN_LEFT, RT_HALIGN_RIGHT, RT_VALIGN_CENTER
+from Tools.LoadPixmap import LoadPixmap
 from timer import TimerEntry
 from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
 
@@ -56,10 +57,13 @@ class TimerList(HTMLComponent, GUIComponent, object):
                else:
                        state = _("done!")
 
+               if timer.disabled:
+                       state = _("disabled")
+
                res.append((eListboxPythonMultiContent.TYPE_TEXT, width-240, 50, 240, 20, 1, RT_HALIGN_RIGHT|RT_VALIGN_CENTER, state))
 
                if timer.disabled:
-                       png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "redx.png"))
+                       png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/redx.png"))
                        res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 490, 5, 40, 40, png))
                return res
 
@@ -95,3 +99,7 @@ class TimerList(HTMLComponent, GUIComponent, object):
 
        def invalidate(self):
                self.l.invalidate()
+
+       def entryRemoved(self, idx):
+               self.l.entryRemoved(idx)
+