X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FTimerList.py;h=8bb6a0d9c263b408c3a54932e32b5acee6d7f769;hb=7c961a72f320fb95a6a751f0a6ce7456bf9ce14a;hp=43a55fde9a776361af5453cf555582826de086cb;hpb=63fd3a60724b9c03a70ce847955f2aa9facb423f;p=vuplus_dvbapp

diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index 43a55fd..8bb6a0d 100644
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -2,6 +2,7 @@ from HTMLComponent import *
 from GUIComponent import *
 
 from Tools.FuzzyDate import FuzzyTime
+import time
 
 from enigma import eListboxPythonMultiContent, eListbox, gFont
 from timer import TimerEntry
@@ -25,16 +26,29 @@ RT_WRAP = 32
 def TimerEntryComponent(timer, processed):
 	res = [ timer ]
 	
-
-	res.append((0, 0, 400, 30, 0, RT_HALIGN_LEFT, timer.service_ref.getServiceName()))
-	res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, "%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:])))
-
-	res.append((300, 0, 200, 20, 1, RT_HALIGN_RIGHT, timer.description))
+	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 not timer.repeated:
+		flags = timer.repeated
+		count = 0
+		for x in range(0, 7):
+				if (flags & 1 == 1):
+					if (count != 0):
+						repeatedtext += ", "
+					repeatedtext += days[x]
+					count += 1
+				flags = flags >> 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((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:]))))
+
 	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..."
@@ -43,7 +57,7 @@ def TimerEntryComponent(timer, processed):
 	else:
 		state = "done!"
 	
-	res.append((300, 30, 200, 20, 1, RT_HALIGN_RIGHT, state))
+	res.append((eListboxPythonMultiContent.TYPE_TEXT, 320, 50, 240, 20, 1, RT_HALIGN_RIGHT|RT_VALIGN_CENTER, state))
 	
 	return res
 
@@ -52,8 +66,8 @@ class TimerList(HTMLComponent, GUIComponent):
 		GUIComponent.__init__(self)
 		self.l = eListboxPythonMultiContent()
 		self.l.setList(list)
-		self.l.setFont(0, gFont("Arial", 20))
-		self.l.setFont(1, gFont("Arial", 18))
+		self.l.setFont(0, gFont("Regular", 20))
+		self.l.setFont(1, gFont("Regular", 18))
 	
 	def getCurrent(self):
 		return self.l.getCurrentSelection()
@@ -61,8 +75,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