X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FTimerEdit.py;h=bdf3527dbbff0fd3f9592f935f07be79f810cf9b;hp=5532dc83833f8480be3b491c18e523d69ddbcbc9;hb=04f4636324ab06c5a3a4f618100048e159eaf6f9;hpb=ba1b105a176e5f62faf9d6d1f4c1a4c19764a2e4 diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index 5532dc8..bdf3527 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -1,15 +1,17 @@ -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.config import config +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 +64,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 +108,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,24 +131,33 @@ 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() def refill(self): + oldsize = len(self.list) self.fillTimerList() - self["timerlist"].invalidate() + lst = self["timerlist"] + newsize = len(self.list) + if oldsize and oldsize != newsize: + idx = lst.getCurrentIndex() + lst.entryRemoved(idx) + else: + lst.invalidate() def addCurrentTimer(self): event = None @@ -143,7 +175,7 @@ class TimerEditList(Screen): else: data = parseEvent(event, description = False) - self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True, *data)) + self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True, dirname = config.movielist.last_timer_videodir.value, *data)) def addTimer(self, timer): self.session.openWithCallback(self.finishedAdd, TimerEntry, timer) @@ -182,13 +214,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) @@ -231,10 +262,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 +276,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()))