X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/07052ad2c1f86a67bbdfb5f15a8611af927d5b4a..07e04b36083c6946d864b1a0c8b074fab641c5af:/lib/python/Screens/TimerEdit.py

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index dbf3f1b5..8d8d9ac1 100644
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -1,15 +1,16 @@
-from Screen import Screen
-from Components.TimerList import TimerList, TimerEntryComponent
-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 Components.MenuList import MenuList
+from Components.TimerList import TimerList
+from Components.TimerSanityCheck import TimerSanityCheck
 from RecordTimer import RecordTimerEntry, parseEvent, AFTEREVENT
-from time import *
+from Screen import Screen
+from Screens.ChoiceBox import ChoiceBox
+from Screens.MessageBox import MessageBox
 from ServiceReference import ServiceReference
-from Components.TimerSanityCheck import TimerSanityCheck
+from TimerEntry import TimerEntry, TimerLog
+from Tools.BoundFunction import boundFunction
+from time import time
 
 class TimerEditList(Screen):
 	def __init__(self, session):
@@ -62,20 +63,41 @@ class TimerEditList(Screen):
 	def toggleDisabledState(self):
 		cur=self["timerlist"].getCurrent()
 		if cur:
-			t = cur[0]
+			t = cur
 		
 			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()
 		
 	def updateState(self):
 		if len(self.list) > 0:
-			if self["timerlist"].getCurrent()[0].disabled:
+			if self["timerlist"].getCurrent().disabled:
 				self["key_yellow"].setText(_("Enable"))
 			else:
 				self["key_yellow"].setText(_("Disable"))
@@ -85,21 +107,21 @@ class TimerEditList(Screen):
 		del self.list[:]
 		
 		for timer in self.session.nav.RecordTimer.timer_list:
-			self.list.append(TimerEntryComponent(timer, processed=False))
+			self.list.append((timer, False))
 		
 		for timer in self.session.nav.RecordTimer.processed_timers:
-			self.list.append(TimerEntryComponent(timer, processed=True))
+			self.list.append((timer, True))
 		self.list.sort(cmp = lambda x, y: x[0].begin < y[0].begin)
 
 	def showLog(self):
 		cur=self["timerlist"].getCurrent()
 		if cur:
-			self.session.openWithCallback(self.finishedEdit, TimerLog, cur[0])
+			self.session.openWithCallback(self.finishedEdit, TimerLog, cur)
 
 	def openEdit(self):
 		cur=self["timerlist"].getCurrent()
 		if cur:
-			self.session.openWithCallback(self.finishedEdit, TimerEntry, cur[0])
+			self.session.openWithCallback(self.finishedEdit, TimerEntry, cur)
 
 	def cleanupQuestion(self):
 		self.session.openWithCallback(self.cleanupTimer, MessageBox, _("Really delete done timers?"))
@@ -108,17 +130,19 @@ class TimerEditList(Screen):
 		if delete:
 			self.session.nav.RecordTimer.cleanup()
 			self.refill()
-	
+
 	def removeTimerQuestion(self):
+		if not self["timerlist"].getCurrent():
+			return
 		self.session.openWithCallback(self.removeTimer, MessageBox, _("Really delete this timer?"))
-		
+
 	def removeTimer(self, result):
 		if not result:
 			return
 		list = self["timerlist"]
 		cur = list.getCurrent()
 		if cur:
-			timer = cur[0]
+			timer = cur
 			timer.afterEvent = AFTEREVENT.NONE
 			self.session.nav.RecordTimer.removeEntry(timer)
 			self.refill()
@@ -182,13 +206,12 @@ class TimerEditList(Screen):
 		self.finishedAdd(answer)
 
 	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()
-		
+
 class TimerSanityConflict(Screen):
 	def __init__(self, session, timer):
 		Screen.__init__(self, session)
@@ -199,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
@@ -231,10 +254,10 @@ class TimerSanityConflict(Screen):
 			}, -1)
 
 	def getTimerList(self, timer):
-		return [TimerEntryComponent(timer, processed=False)]
+		return [(timer, False)]
 
 	def editTimer1(self):
-		self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timer1"].getCurrent()[0])
+		self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timer1"].getCurrent())
 
 	def disableTimer1(self):
 		self.timer[0].disabled = True
@@ -245,10 +268,8 @@ class TimerSanityConflict(Screen):
 
 	def up(self):
 		self["list"].instance.moveSelection(self["list"].instance.moveUp)
-		self["timer2"].l.setList(self.getTimerList(self["list"].getCurrent()[1]))
+		self["timer2"].l.setList(self.getTimerList(self["list"].getCurrent()))
 		
 	def down(self):
 		self["list"].instance.moveSelection(self["list"].instance.moveDown)
-		self["timer2"].l.setList(self.getTimerList(self["list"].getCurrent()[1]))
-			
-		
\ No newline at end of file
+		self["timer2"].l.setList(self.getTimerList(self["list"].getCurrent()))