X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/b8b871a579e8f9fc52dbd53bb451fac212775867..b9bda8a0d43be892f2e5d96ea45ba8d4b2fdae20:/lib/python/Screens/TimerEdit.py

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index e6f1edd4..babf28fe 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -1,18 +1,17 @@
-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 Components.Label import Label
+from Components.MenuList import MenuList
+from Components.TimerList import TimerList, TimerEntryComponent
+from Components.TimerSanityCheck import TimerSanityCheck
+from RecordTimer import RecordTimerEntry, parseEvent, AFTEREVENT
+from Screen import Screen
+from Screens.ChoiceBox import ChoiceBox
 from Screens.MessageBox import MessageBox
+from ServiceReference import ServiceReference
 from TimerEntry import TimerEntry, TimerLog
-from RecordTimer import RecordTimerEntry, parseEvent
+from Tools.BoundFunction import boundFunction
 from time import *
-from ServiceReference import ServiceReference
-from Components.config import *
-from Components.TimerSanityCheck import TimerSanityCheck
 
 class TimerEditList(Screen):
 	def __init__(self, session):
@@ -33,7 +32,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,
@@ -69,10 +68,31 @@ class TimerEditList(Screen):
 		
 			if t.disabled:
 				t.enable()
+				self.session.nav.RecordTimer.timeChanged(t)
+
 			else:
-				t.disable()
+				if t.isRunning() and t.repeated:
+					list = []
+					list.append((_("Stop current event but not coming events"), "stoponlycurrent"))
+					list.append((_("Stop current event and disable coming events"), "stopall"))
+					list.append((_("Don't stop current event but disable coming events"), "stoponlycoming"))
+					self.session.openWithCallback(boundFunction(self.runningEventCallback, t), ChoiceBox, title=_("Repeating event currently recording... What do you want to do?"), list = list)
+				else:
+					t.disable()
+					self.session.nav.RecordTimer.timeChanged(t)
+			self.updateState()
+			self.refill()
 
+	def runningEventCallback(self, t, result):
+		if result is not None:
+			if result[1] == "stoponlycurrent" or result[1] == "stopall":
+				t.enable()
+				t.processRepeated(findRunningEvent = False)
+				self.session.nav.RecordTimer.doActivate(t)
+			if result[1] == "stoponlycoming" or result[1] == "stopall":
+				t.disable()
 			self.session.nav.RecordTimer.timeChanged(t)
+
 			self.updateState()
 			self.refill()
 		
@@ -111,12 +131,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()
 	
@@ -136,11 +162,11 @@ class TimerEditList(Screen):
 		serviceref = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference())
 		
 		if event is None:	
-			data = (int(time()), int(time() + 60), "unknown event", "", None)
+			data = (int(time()), int(time() + 60), "", "", None)
 		else:
-			data = parseEvent(event)
+			data = parseEvent(event, description = False)
 
-		self.addTimer(RecordTimerEntry(serviceref, *data))
+		self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True, *data))
 		
 	def addTimer(self, timer):
 		self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)
@@ -196,7 +222,7 @@ class TimerSanityConflict(Screen):
 		if len(timer) > 1:
 			self["timer2"] = TimerList(self.getTimerList(timer[1]))
 		else:
-			self["timer2"] = Button("No conflict")
+			self["timer2"] = TimerList([])
 		
 		self.list = []
 		count = 0