TimerList - SCOPE_CURRENT_SKIN instead SCOPE_SKIN_IMAGE
authorims <ims21@users.sourceforge.net>
Sat, 21 Feb 2015 23:49:43 +0000 (00:49 +0100)
committerlittlesat <littlesat99@yahoo.com>
Sun, 22 Feb 2015 08:43:03 +0000 (09:43 +0100)
Signed-off-by: littlesat <littlesat99@yahoo.com>

lib/python/Components/TimerList.py

index 635713e..48065f8 100644 (file)
@@ -10,7 +10,7 @@ from Tools.Alternatives import GetWithAlternative
 from Tools.LoadPixmap import LoadPixmap
 from Tools.TextBoundary import getTextBoundarySize
 from timer import TimerEntry
 from Tools.LoadPixmap import LoadPixmap
 from Tools.TextBoundary import getTextBoundarySize
 from timer import TimerEntry
-from Tools.Directories import resolveFilename, SCOPE_CURRENT_SKIN, SCOPE_SKIN_IMAGE
+from Tools.Directories import resolveFilename, SCOPE_CURRENT_SKIN
 
 class TimerList(HTMLComponent, GUIComponent, object):
 #
 
 class TimerList(HTMLComponent, GUIComponent, object):
 #
@@ -95,16 +95,16 @@ class TimerList(HTMLComponent, GUIComponent, object):
                self.rowSplit = 25
                self.iconMargin = 4
                self.satPosLeft = 160
                self.rowSplit = 25
                self.iconMargin = 4
                self.satPosLeft = 160
-               self.iconWait = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/timer_wait.png"))
+               self.iconWait = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/timer_wait.png"))
                #currently intended that all icons have the same size
                self.iconWidth = self.iconWait.size().width()
                self.iconHeight = self.iconWait.size().height()
                #currently intended that all icons have the same size
                self.iconWidth = self.iconWait.size().width()
                self.iconHeight = self.iconWait.size().height()
-               self.iconRecording = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/timer_rec.png"))
-               self.iconPrepared = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/timer_prep.png"))
-               self.iconDone = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/timer_done.png"))
-               self.iconRepeat = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/timer_rep.png"))
-               self.iconZapped = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/timer_zap.png"))
-               self.iconDisabled = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/timer_off.png"))
+               self.iconRecording = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/timer_rec.png"))
+               self.iconPrepared = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/timer_prep.png"))
+               self.iconDone = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/timer_done.png"))
+               self.iconRepeat = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/timer_rep.png"))
+               self.iconZapped = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/timer_zap.png"))
+               self.iconDisabled = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/timer_off.png"))
 
        def applySkin(self, desktop, parent):
                def itemHeight(value):
 
        def applySkin(self, desktop, parent):
                def itemHeight(value):