X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/be8b337beb4b8ee4bd23f5d54b6072c20ffbb842..0bc5a15f2b9a7e90ee0c5babec93c7b9ba66b16f:/lib/python/Screens/TimerEdit.py

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index c424417f..681d3a25 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -1,17 +1,14 @@
 from Screen import Screen
 from Components.TimerList import TimerList, TimerEntryComponent
-from Components.ConfigList import ConfigList
 from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
-from Components.TimeInput import TimeInput
 from Components.Label import Label
 from Components.Button import Button
 from Screens.MessageBox import MessageBox
 from TimerEntry import TimerEntry, TimerLog
-from RecordTimer import RecordTimerEntry, parseEvent
+from RecordTimer import RecordTimerEntry, parseEvent, AFTEREVENT
 from time import *
 from ServiceReference import ServiceReference
-from Components.config import *
 from Components.TimerSanityCheck import TimerSanityCheck
 
 class TimerEditList(Screen):
@@ -33,7 +30,7 @@ class TimerEditList(Screen):
 			{
 				"ok": self.openEdit,
 				"cancel": self.leave,
-				"red": self.removeTimer,
+				"red": self.removeTimerQuestion,
 				"green": self.addCurrentTimer,
 				"blue": self.cleanupQuestion,
 				"yellow": self.toggleDisabledState,
@@ -63,10 +60,18 @@ class TimerEditList(Screen):
 		self.updateState()
 		
 	def toggleDisabledState(self):
-		self["timerlist"].getCurrent()[0].disabled = not self["timerlist"].getCurrent()[0].disabled
-		self.session.nav.RecordTimer.timeChanged(self["timerlist"].getCurrent()[0])
-		self.updateState()
-		self.refill()
+		cur=self["timerlist"].getCurrent()
+		if cur:
+			t = cur[0]
+		
+			if t.disabled:
+				t.enable()
+			else:
+				t.disable()
+
+			self.session.nav.RecordTimer.timeChanged(t)
+			self.updateState()
+			self.refill()
 		
 	def updateState(self):
 		if len(self.list) > 0:
@@ -84,14 +89,18 @@ class TimerEditList(Screen):
 		
 		for timer in self.session.nav.RecordTimer.processed_timers:
 			self.list.append(TimerEntryComponent(timer, processed=True))
+		self.list.sort(cmp = lambda x, y: x[0].begin < y[0].begin)
 
 	def showLog(self):
-		self.session.openWithCallback(self.finishedEdit, TimerLog, self["timerlist"].getCurrent()[0])
+		cur=self["timerlist"].getCurrent()
+		if cur:
+			self.session.openWithCallback(self.finishedEdit, TimerLog, cur[0])
 
 	def openEdit(self):
-		self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timerlist"].getCurrent()[0])
-		#self.session.open(TimerEdit, self["timerlist"].getCurrent()[0])
-		
+		cur=self["timerlist"].getCurrent()
+		if cur:
+			self.session.openWithCallback(self.finishedEdit, TimerEntry, cur[0])
+
 	def cleanupQuestion(self):
 		self.session.openWithCallback(self.cleanupTimer, MessageBox, _("Really delete done timers?"))
 	
@@ -99,17 +108,20 @@ class TimerEditList(Screen):
 		if delete:
 			self.session.nav.RecordTimer.cleanup()
 			self.refill()
+	
+	def removeTimerQuestion(self):
+		self.session.openWithCallback(self.removeTimer, MessageBox, _("Really delete this timer?"))
 		
-	def removeTimer(self):
+	def removeTimer(self, result):
+		if not result:
+			return
 		list = self["timerlist"]
-		timer = list.getCurrent()[0]
-		currentIndex = list.getCurrentIndex()
-		self.session.nav.RecordTimer.removeEntry(timer)
-		list.moveDown()
-		if list.getCurrentIndex() == currentIndex:
-			currentIndex -= 1
-		self.refill()
-		list.moveToIndex(currentIndex)
+		cur = list.getCurrent()
+		if cur:
+			timer = cur[0]
+			timer.afterEvent = AFTEREVENT.NONE
+			self.session.nav.RecordTimer.removeEntry(timer)
+			self.refill()
 	
 	def refill(self):
 		self.fillTimerList()
@@ -131,7 +143,7 @@ class TimerEditList(Screen):
 		else:
 			data = parseEvent(event)
 
-		self.addTimer(RecordTimerEntry(serviceref, *data))
+		self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True, *data))
 		
 	def addTimer(self, timer):
 		self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)
@@ -181,7 +193,7 @@ class TimerSanityConflict(Screen):
 	def __init__(self, session, timer):
 		Screen.__init__(self, session)
 		self.timer = timer
-		print timer
+		print "TimerSanityConflict", timer
 			
 		self["timer1"] = TimerList(self.getTimerList(timer[0]))
 		if len(timer) > 1: