X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2601ee77efe1f10be7cbeb8af94e2fb229cc1ec1..738adbb747be92f19cd7864490c982cac558358c:/lib/python/Screens/TimerEdit.py

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 73733913..36502ca0 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -4,12 +4,13 @@ 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
 from Components.config import *
+from Components.TimerSanityCheck import TimerSanityCheck
 
 class TimerEditList(Screen):
 	def __init__(self, session):
@@ -24,32 +25,89 @@ 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 len(self.list) > 0:
+			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[:]
 		
 		for timer in self.session.nav.RecordTimer.timer_list:
-			self.list.append(TimerEntryComponent(timer, 0))
+			self.list.append(TimerEntryComponent(timer, processed=False))
 		
 		for timer in self.session.nav.RecordTimer.processed_timers:
-			self.list.append(TimerEntryComponent(timer, 1))
+			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):
 		self.fillTimerList()
 		self["timerlist"].invalidate()
 	
@@ -75,20 +133,36 @@ class TimerEditList(Screen):
 		self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)
 		
 	def finishedEdit(self, answer):
-		if (answer[0]):
+		print "finished edit"
+		
+		if answer[0]:
 			print "Edited timer"
+			if not TimerSanityCheck(self.session.nav.RecordTimer.timer_list, answer[1]).check():
+				print "Sanity check failed"
+			else:
+				print "Sanity check passed"
 			self.session.nav.RecordTimer.timeChanged(answer[1])
 			self.fillTimerList()
 		else:
 			print "Timeredit aborted"
-			
+
 	def finishedAdd(self, answer):
-		if (answer[0]):
-			self.session.nav.RecordTimer.record(answer[1])
+		print "finished add"
+		if answer[0]:
+			if not TimerSanityCheck(self.session.nav.RecordTimer.timer_list, answer[1]).check():
+				print "Sanity check failed"
+			else:
+				print "Sanity check passed"
+			entry = answer[1]
+			self.session.nav.RecordTimer.record(entry)
 			self.fillTimerList()
 		else:
 			print "Timeredit aborted"		
 
 	def leave(self):
 		self.session.nav.RecordTimer.saveTimer()
+		self.session.nav.RecordTimer.on_state_change.remove(self.onStateChange)
 		self.close()
+
+	def onStateChange(self, entry):
+		self.refill()