X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FTimerList.py;h=2a7405dfcc939c9cb3dae13752bf5235c9565d40;hp=f84743749e79ef2167b42a35688d70eec65b20fa;hb=28dcf6be0ee22fedd728fef11ccff484f8a851e8;hpb=44c32e4101acdeb6df3833f35e9c0719e993a2a5

diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
old mode 100644
new mode 100755
index f847437..2a7405d
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -7,7 +7,7 @@ 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
+from Tools.Directories import resolveFilename, SCOPE_CURRENT_SKIN
 
 class TimerList(HTMLComponent, GUIComponent, object):
 #
@@ -21,11 +21,11 @@ class TimerList(HTMLComponent, GUIComponent, object):
 		res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 30, width, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, timer.name))
 
 		repeatedtext = ""
-		days = [ _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun") ]
+		days = ( _("Mon"), _("Tue"), _("Wed"), _("Thu"), _("Fri"), _("Sat"), _("Sun") )
 		if timer.repeated:
 			flags = timer.repeated
 			count = 0
-			for x in range(0, 7):
+			for x in (0, 1, 2, 3, 4, 5, 6):
 					if (flags & 1 == 1):
 						if (count != 0):
 							repeatedtext += ", "
@@ -65,7 +65,7 @@ class TimerList(HTMLComponent, GUIComponent, object):
 		res.append((eListboxPythonMultiContent.TYPE_TEXT, width-150, 50, 150, 20, 1, RT_HALIGN_RIGHT|RT_VALIGN_CENTER, state))
 
 		if timer.disabled:
-			png = LoadPixmap(resolveFilename(SCOPE_SKIN_IMAGE, "skin_default/icons/redx.png"))
+			png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "skin_default/icons/redx.png"))
 			res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 490, 5, 40, 40, png))
 		return res
 
@@ -93,7 +93,7 @@ class TimerList(HTMLComponent, GUIComponent, object):
 	def getCurrentIndex(self):
 		return self.instance.getCurrentIndex()
 
-	currentIndex = property(moveToIndex, getCurrentIndex)
+	currentIndex = property(getCurrentIndex, moveToIndex)
 	currentSelection = property(getCurrent)
 
 	def moveDown(self):