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

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index ece9dc4c..681d3a25 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -1,16 +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.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):
@@ -32,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,
@@ -110,12 +108,18 @@ 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"]
 		cur = list.getCurrent()
 		if cur:
 			timer = cur[0]
+			timer.afterEvent = AFTEREVENT.NONE
 			self.session.nav.RecordTimer.removeEntry(timer)
 			self.refill()
 	
@@ -139,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)