From 97a9b81eac4b871c65ff24097565194e0b024ee3 Mon Sep 17 00:00:00 2001 From: Felix Domke Date: Sun, 15 Jan 2006 12:11:14 +0000 Subject: [PATCH] follow timer changes --- lib/python/Components/TimerList.py | 6 +++--- lib/python/Screens/EpgSelection.py | 2 +- lib/python/Screens/TimerEdit.py | 15 +++++++++------ 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py index 47c49d3..d79187d 100644 --- a/lib/python/Components/TimerList.py +++ b/lib/python/Components/TimerList.py @@ -31,7 +31,7 @@ def TimerEntryComponent(timer, processed): repeatedtext = "" days = [ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" ] - if (timer.repeated != 0): + if not timer.repeated: flags = timer.repeated count = 0 for x in range(0, 7): @@ -46,9 +46,9 @@ def TimerEntryComponent(timer, processed): res.append((eListboxPythonMultiContent.TYPE_TEXT, 0, 50, 300, 20, 1, RT_HALIGN_LEFT|RT_VALIGN_CENTER, repeatedtext + ("%s, %s ... %s" % (FuzzyTime(timer.begin) + FuzzyTime(timer.end)[1:])))) if not processed: - if timer.state == TimerEntry.StateWait: + if timer.state == TimerEntry.StateWaiting: state = "waiting" - elif timer.state == TimerEntry.StatePrepare: + elif timer.state == TimerEntry.StatePrepared: state = "about to start" elif timer.state == TimerEntry.StateRunning: state = "recording..." diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py index ec461e2..d6fee56 100644 --- a/lib/python/Screens/EpgSelection.py +++ b/lib/python/Screens/EpgSelection.py @@ -121,7 +121,7 @@ class EPGSelection(Screen): self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry) def timerEditFinished(self, answer): - if (answer[0]): + if answer[0]: self.session.nav.RecordTimer.record(answer[1]) else: print "Timeredit aborted" diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index 7373391..6df05c6 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -38,10 +38,10 @@ class TimerEditList(Screen): del self.list[:] for timer in self.session.nav.RecordTimer.timer_list: - self.list.append(TimerEntryComponent(timer, 0)) + self.list.append(TimerEntryComponent(timer, processed=False)) for timer in self.session.nav.RecordTimer.processed_timers: - self.list.append(TimerEntryComponent(timer, 1)) + self.list.append(TimerEntryComponent(timer, processed=True)) def openEdit(self): self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timerlist"].getCurrent()[0]) @@ -75,16 +75,19 @@ class TimerEditList(Screen): self.session.openWithCallback(self.finishedAdd, TimerEntry, timer) def finishedEdit(self, answer): - if (answer[0]): + print "finished edit" + if answer[0]: print "Edited timer" self.session.nav.RecordTimer.timeChanged(answer[1]) self.fillTimerList() else: print "Timeredit aborted" - + def finishedAdd(self, answer): - if (answer[0]): - self.session.nav.RecordTimer.record(answer[1]) + print "finished add" + if answer[0]: + entry = answer[1] + self.session.nav.RecordTimer.record(entry) self.fillTimerList() else: print "Timeredit aborted" -- 2.7.4