X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5561f5ec4f0a55d9256c3eab0ce121ae82ee5c90..fdd708fdeb5ddbb23b471a4a309d7f107a3c67b3:/lib/python/Screens/TimerEdit.py diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py index 2fe389ee..ec8b11cb 100644 --- a/lib/python/Screens/TimerEdit.py +++ b/lib/python/Screens/TimerEdit.py @@ -1,66 +1,92 @@ from Screen import Screen -from Components.TimerList import TimerList, TimerEntry +from Components.TimerList import TimerList, TimerEntryComponent from Components.ActionMap import ActionMap from Components.TimeInput import TimeInput from Components.Label import Label from Components.Button import Button +from Components.TextInput import TextInput +from TimerEntry import TimerEntry +from RecordTimer import RecordTimerEntry +from time import * +from ServiceReference import ServiceReference +from Components.config import * -class TimerEdit(Screen): - def __init__(self, session, entry): - Screen.__init__(self, session) - - self["actions"] = ActionMap(["OkCancelActions"], - { - "ok": self.apply, - "cancel": self.close - }) - - self["shortcuts"] = ActionMap(["ShortcutActions"], - { - "red": self.beginFocus, - "yellow": self.endFocus - }) - - self.entry = entry - # begin, end, description, service - self["begin"] = TimeInput() - self["end"] = TimeInput() - - self["lbegin"] = Label("Begin") - self["lend"] = Label("End") - - self["description"] = Label("bla") -# TextInput() - self["apply"] = Button("Apply") - self["service"] = Button() - - def beginFocus(self): - self.setFocus(self["begin"]) - - def endFocus(self): - self.setFocus(self["end"]) - - def apply(self): - print "applied!" - class TimerEditList(Screen): def __init__(self, session): Screen.__init__(self, session) list = [ ] for timer in session.nav.RecordTimer.timer_list: - list.append(TimerEntry(timer, 0)) + list.append(TimerEntryComponent(timer, 0)) for timer in session.nav.RecordTimer.processed_timers: - list.append(TimerEntry(timer, 1)) + list.append(TimerEntryComponent(timer, 1)) self["timerlist"] = TimerList(list) + + self["key_red"] = Button("Delete") + self["key_green"] = Button("Add") + self["key_yellow"] = Button("") + self["key_blue"] = Button("") - self["actions"] = ActionMap(["OkCancelActions"], + self["actions"] = ActionMap(["OkCancelActions", "ShortcutActions"], { "ok": self.openEdit, - "cancel": self.close + "cancel": self.close, + "red": self.removeTimer, + "green": self.addCurrentTimer }) def openEdit(self): - self.session.open(TimerEdit, self["timerlist"].getCurrent()) + self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timerlist"].getCurrent()[0]) + #self.session.open(TimerEdit, self["timerlist"].getCurrent()[0]) + + def removeTimer(self): + # FIXME doesn't work... + self.session.nav.RecordTimer.removeEntry(self["timerlist"].getCurrent()[0]) + + def addCurrentTimer(self): + begin = time() + end = time() + 60 + + epg = None + try: + service = self.session.nav.getCurrentService() + info = service.info() + ev = info.getEvent(0) + epg = ev + except: + pass + + if (epg == None): + description = "unknown event" + else: + description = ev.getEventName() + # FIXME we need a timestamp here: + begin = ev.getBeginTime() + + print begin + print ev.getDuration() + end = begin + ev.getDuration() + + + # FIXME only works if already playing a service + serviceref = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference()) + + self.addTimer(begin, end, serviceref, epg, description) + + def addTimer(self, begin, end, serviceref, epg, description): + newEntry = RecordTimerEntry(begin, end, serviceref, epg, description) + self.session.openWithCallback(self.finishedAdd, TimerEntry, newEntry) + + def finishedEdit(self, answer): + if (answer[0]): + print "Edited timer" + else: + print "Timeredit aborted" + + def finishedAdd(self, answer): + if (answer[0]): + print "Added timer" + else: + print "Timeredit aborted" \ No newline at end of file