X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FTimerEdit.py;h=e12e29ae00b835835f6e79eaafcf131d815bea2c;hb=ffa400414c1c279d72179942b8ebc544803549ea;hp=ff2a017ffb6c014c0ec9a61404ebdcb77dcd087e;hpb=2d5b15f3ca1f7f92f949906d0199f9266d845e31;p=vuplus_dvbapp

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index ff2a017..e12e29a 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -4,8 +4,8 @@ from Components.ActionMap import ActionMap
 from Components.TimeInput import TimeInput
 from Components.Label import Label
 from Components.Button import Button
-from Components.TextInput import TextInput
-from TimerEntry import TimerEntry
+from Screens.MessageBox import MessageBox
+from TimerEntry import TimerEntry, TimerLog
 from RecordTimer import RecordTimerEntry, parseEvent
 from time import *
 from ServiceReference import ServiceReference
@@ -24,16 +24,52 @@ class TimerEditList(Screen):
 		self["key_red"] = Button(_("Delete"))
 		self["key_green"] = Button(_("Add"))
 		self["key_yellow"] = Button("")
-		self["key_blue"] = Button("")
+		self["key_blue"] = Button(_("Cleanup"))
 
-		self["actions"] = ActionMap(["OkCancelActions", "ShortcutActions"], 
+		self["actions"] = ActionMap(["OkCancelActions", "DirectionActions", "ShortcutActions", "TimerEditActions"], 
 			{
 				"ok": self.openEdit,
 				"cancel": self.leave,
 				"red": self.removeTimer,
-				"green": self.addCurrentTimer
-			})
+				"green": self.addCurrentTimer,
+				"blue": self.cleanupQuestion,
+				"yellow": self.toggleDisabledState,
+				"log": self.showLog,
+				"left": self.left,
+				"right": self.right,
+				"up": self.up,
+				"down": self.down
+			}, -1)
 		self.session.nav.RecordTimer.on_state_change.append(self.onStateChange)
+		self.onShown.append(self.updateState)
+
+	def up(self):
+		self["timerlist"].instance.moveSelection(self["timerlist"].instance.moveUp)
+		self.updateState()
+		
+	def down(self):
+		self["timerlist"].instance.moveSelection(self["timerlist"].instance.moveDown)
+		self.updateState()
+
+	def left(self):
+		self["timerlist"].instance.moveSelection(self["timerlist"].instance.pageUp)
+		self.updateState()
+		
+	def right(self):
+		self["timerlist"].instance.moveSelection(self["timerlist"].instance.pageDown)
+		self.updateState()
+		
+	def toggleDisabledState(self):
+		self["timerlist"].getCurrent()[0].disabled = not self["timerlist"].getCurrent()[0].disabled
+		self.updateState()
+		self.refill()
+		
+	def updateState(self):
+		if self["timerlist"].getCurrent()[0].disabled:
+			self["key_yellow"].setText(_("enable"))
+		else:
+			self["key_yellow"].setText(_("disable"))
+		self["key_yellow"].instance.invalidate()
 
 	def fillTimerList(self):
 		del self.list[:]
@@ -44,13 +80,29 @@ class TimerEditList(Screen):
 		for timer in self.session.nav.RecordTimer.processed_timers:
 			self.list.append(TimerEntryComponent(timer, processed=True))
 
+	def showLog(self):
+		self.session.openWithCallback(self.finishedEdit, TimerLog, self["timerlist"].getCurrent()[0])
+
 	def openEdit(self):
 		self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timerlist"].getCurrent()[0])
 		#self.session.open(TimerEdit, self["timerlist"].getCurrent()[0])
 		
+	def cleanupQuestion(self):
+		self.session.openWithCallback(self.cleanupTimer, MessageBox, _("Really delete done timers?"))
+	
+	def cleanupTimer(self, delete):
+		if delete:
+			self.session.nav.RecordTimer.cleanup()
+			self.refill()
+		
 	def removeTimer(self):
-		# FIXME doesn't work...
-		self.session.nav.RecordTimer.removeEntry(self["timerlist"].getCurrent()[0])
+		list = self["timerlist"]
+		currentIndex = list.getCurrentIndex()
+		list.moveDown()
+		if list.getCurrentIndex() == currentIndex:
+			currentIndex -= 1
+			list.moveToIndex(currentIndex)
+		self.session.nav.RecordTimer.removeEntry(list.getCurrent()[0])
 		self.refill()
 	
 	def refill(self):