X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FTimerList.py;h=2750c7a7da5ba6629be78ccd7314dd0a312855f5;hp=da2ff9491b16c083f30b304fa525f25d5adb5b07;hb=6f09a61cf36eb3918574a74588bbeec6a829b084;hpb=bb4448ebb7cb6a4f9fdcd52cd4db29e1ce9d35fa;ds=sidebyside

diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index da2ff94..2750c7a 100644
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -4,8 +4,9 @@ from GUIComponent import *
 from Tools.FuzzyDate import FuzzyTime
 import time
 
-from enigma import eListboxPythonMultiContent, eListbox, gFont
+from enigma import eListboxPythonMultiContent, eListbox, gFont, loadPNG
 from timer import TimerEntry
+from Tools.Directories import resolveFilename, SCOPE_SKIN_IMAGE
 
 RT_HALIGN_LEFT = 0
 RT_HALIGN_RIGHT = 1
@@ -26,10 +27,12 @@ RT_WRAP = 32
 def TimerEntryComponent(timer, processed):
 	res = [ timer ]
 	
-	res.append((0, 0, 220, 30, 0, RT_HALIGN_LEFT, timer.service_ref.getServiceName()))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 0, 560, 30, 0, RT_HALIGN_LEFT|RT_VALIGN_CENTER, timer.service_ref.getServiceName()))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 30, 560, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, timer.name))
+	
 	repeatedtext = ""
 	days = [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" ]
-	if (timer.repeated != 0):
+	if not timer.repeated:
 		flags = timer.repeated
 		count = 0
 		for x in range(0, 7):
@@ -39,16 +42,14 @@ def TimerEntryComponent(timer, processed):
 					repeatedtext += days[x]
 					count += 1
 				flags = flags >> 1
-		res.append((0, 30, 300, 20, 1, RT_HALIGN_LEFT, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1]))))
+		res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 300, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + (" %s ... %s" % (FuzzyTime(timer.begin)[1], FuzzyTime(timer.end)[1]))))
 	else:
-		res.append((0, 30, 300, 20, 1, RT_HALIGN_LEFT, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:]))))
+		res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 300, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:]))))
 
-	res.append((240, 0, 320, 20, 1, RT_HALIGN_RIGHT, timer.name))
-	
 	if not processed:
-		if timer.state == TimerEntry.StateWait:
+		if timer.state == TimerEntry.StateWaiting:
 			state = "waiting"
-		elif timer.state == TimerEntry.StatePrepare:
+		elif timer.state == TimerEntry.StatePrepared:
 			state = "about to start"
 		elif timer.state == TimerEntry.StateRunning:
 			state = "recording..."
@@ -57,7 +58,11 @@ def TimerEntryComponent(timer, processed):
 	else:
 		state = "done!"
 	
-	res.append((320, 30, 240, 20, 1, RT_HALIGN_RIGHT, state))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 320, 50, 240, 20, 1, RT_HALIGN_RIGHT|RT_VALIGN_CENTER, state))
+
+	if timer.disabled:
+		png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/redx.png"))
+		res.append((eListboxPythonMultiContent.TYPE_PIXMAP, 490, 5, 40, 40, png))
 	
 	return res
 
@@ -75,8 +80,17 @@ class TimerList(HTMLComponent, GUIComponent):
 	def GUIcreate(self, parent):
 		self.instance = eListbox(parent)
 		self.instance.setContent(self.l)
-		self.instance.setItemHeight(50)
-	
+		self.instance.setItemHeight(70)
+
+	def moveToIndex(self, index):
+		self.instance.moveSelectionTo(index)
+
+	def getCurrentIndex(self):
+		return self.instance.getCurrentIndex()
+
+	def moveDown(self):
+		self.instance.moveSelection(self.instance.moveDown)
+
 	def GUIdelete(self):
 		self.instance.setContent(None)
 		self.instance = None