X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/45cc9a317c299b699756778a64eb3414e2b6bacb..29dda647f09e42ac3a621bbb537558c2d1bbc7b4:/lib/python/Screens/TimerEntry.py diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index f2e01703..752ace42 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -4,18 +4,26 @@ from ServiceReference import ServiceReference from Components.config import * from Components.ActionMap import NumberActionMap from Components.ConfigList import ConfigList +from Components.MenuList import MenuList +from Components.Button import Button from Components.NimManager import nimmanager from Components.Label import Label +from Components.Pixmap import Pixmap +from Screens.SubserviceSelection import SubserviceSelection +from Screens.MessageBox import MessageBox +from enigma import eEPGCache import time import datetime class TimerEntry(Screen): def __init__(self, session, timer): Screen.__init__(self, session) - self.timer = timer; + self.timer = timer - self["ok"] = Label("OK") - self["cancel"] = Label("Cancel") + self["oktext"] = Label(_("OK")) + self["canceltext"] = Label(_("Cancel")) + self["ok"] = Pixmap() + self["cancel"] = Pixmap() self.createConfig() @@ -59,13 +67,13 @@ class TimerEntry(Screen): repeated = 0 # daily else: flags = self.timer.repeated - repeated = 3 # user-defined + repeated = 3 # user defined count = 0 for x in range(0, 7): if (flags == 1): # weekly print "Set to weekday " + str(x) weekday = x - if (flags & 1 == 1): # set user-defined flags + if (flags & 1 == 1): # set user defined flags day[x] = 0 count += 1 else: @@ -76,11 +84,14 @@ class TimerEntry(Screen): else: # once type = 0 repeated = 0 + weekday = (int(strftime("%w", time.localtime(self.timer.begin))) - 1) % 7 + day[weekday] = 0 config.timerentry.type = configElement_nonSave("config.timerentry.type", configSelection, type, (_("once"), _("repeated"))) + config.timerentry.name = configElement_nonSave("config.timerentry.name", configText, self.timer.name, (configText.extendableSize, self.keyRightCallback)) config.timerentry.description = configElement_nonSave("config.timerentry.description", configText, self.timer.description, (configText.extendableSize, self.keyRightCallback)) - config.timerentry.repeated = configElement_nonSave("config.timerentry.repeated", configSelection, repeated, (_("daily"), _("weekly"), _("Mon-Fri"), _("user-defined"))) + config.timerentry.repeated = configElement_nonSave("config.timerentry.repeated", configSelection, repeated, (_("daily"), _("weekly"), _("Mon-Fri"), _("user defined"))) config.timerentry.startdate = configElement_nonSave("config.timerentry.startdate", configDateTime, self.timer.begin, (_("%d.%B %Y"), 86400)) config.timerentry.starttime = configElement_nonSave("config.timerentry.starttime", configSequence, [int(time.strftime("%H", time.localtime(self.timer.begin))), int(time.strftime("%M", time.localtime(self.timer.begin)))], configsequencearg.get("CLOCK")) @@ -126,13 +137,16 @@ class TimerEntry(Screen): def createSetup(self): self.list = [] + self.list.append(getConfigListEntry(_("Name"), config.timerentry.name)) self.list.append(getConfigListEntry(_("Description"), config.timerentry.description)) - self.list.append(getConfigListEntry(_("TimerType"), config.timerentry.type)) + self.timerTypeEntry = getConfigListEntry(_("Timer Type"), config.timerentry.type) + self.list.append(self.timerTypeEntry) if (config.timerentry.type.value == 0): # once - pass + self.frequencyEntry = None else: # repeated - self.list.append(getConfigListEntry(_("Frequency"), config.timerentry.repeated)) + self.frequencyEntry = getConfigListEntry(_("Frequency"), config.timerentry.repeated) + self.list.append(self.frequencyEntry) if (config.timerentry.repeated.value == 0): # daily pass if (config.timerentry.repeated.value == 2): # Mon-Fri @@ -140,7 +154,7 @@ class TimerEntry(Screen): if (config.timerentry.repeated.value == 1): # weekly self.list.append(getConfigListEntry(_("Weekday"), config.timerentry.weekday)) - if (config.timerentry.repeated.value == 3): # user-defined + if (config.timerentry.repeated.value == 3): # user defined self.list.append(getConfigListEntry(_("Monday"), config.timerentry.day[0])) self.list.append(getConfigListEntry(_("Tuesday"), config.timerentry.day[1])) self.list.append(getConfigListEntry(_("Wednesday"), config.timerentry.day[2])) @@ -154,29 +168,30 @@ class TimerEntry(Screen): if (config.timerentry.type.value == 0): # once self.list.append(getConfigListEntry(_("Start"), config.timerentry.startdate)) - self.list.append(getConfigListEntry("", config.timerentry.starttime)) + self.list.append(getConfigListEntry(" ", config.timerentry.starttime)) else: self.list.append(getConfigListEntry(_("StartTime"), config.timerentry.starttime)) if (config.timerentry.type.value == 0): # once self.list.append(getConfigListEntry(_("End"), config.timerentry.enddate)) - self.list.append(getConfigListEntry("", config.timerentry.endtime)) + self.list.append(getConfigListEntry(" ", config.timerentry.endtime)) else: self.list.append(getConfigListEntry(_("EndTime"), config.timerentry.endtime)) - self.list.append(getConfigListEntry(_("Channel"), config.timerentry.service)) + self.channelEntry = getConfigListEntry(_("Channel"), config.timerentry.service) + self.list.append(self.channelEntry) self["config"].list = self.list self["config"].l.setList(self.list) def newConfig(self): print self["config"].getCurrent() - if self["config"].getCurrent()[0] == _("TimerType"): + if self["config"].getCurrent() == self.timerTypeEntry: self.createSetup() - if self["config"].getCurrent()[0] == _("Frequency"): + if self["config"].getCurrent() == self.frequencyEntry: self.createSetup() def keyLeft(self): - if self["config"].getCurrent()[0] == _("Channel"): + if self["config"].getCurrent() == self.channelEntry: self.keySelect() else: self["config"].handleKey(config.key["prevElement"]) @@ -192,20 +207,27 @@ class TimerEntry(Screen): self.keyRight() def keyRight(self): - if self["config"].getCurrent()[0] == _("Channel"): + if self["config"].getCurrent() == self.channelEntry: self.keySelect() else: self["config"].handleKey(config.key["nextElement"]) self.newConfig() def keySelect(self): - if self["config"].getCurrent()[0] == _("Channel"): + if self["config"].getCurrent() == self.channelEntry: self.session.openWithCallback(self.finishedChannelSelection, ChannelSelection.SimpleChannelSelection, _("Select channel to record from")) + else: + self.keyGo() def finishedChannelSelection(self, args): - self.timer.service_ref = ServiceReference(args) - config.timerentry.service.vals = (str(self.timer.service_ref.getServiceName()),) - self["config"].invalidate(config.timerentry.service) + oldref = self.timer.service_ref + try: + self.timer.service_ref = ServiceReference(args) + config.timerentry.service.vals = (str(self.timer.service_ref.getServiceName()),) + self["config"].invalidate(config.timerentry.service) + except: + print "you pressed cancel" + self.timer.service_ref = oldref def keyNumberGlobal(self, number): print "You pressed number " + str(number) @@ -219,6 +241,8 @@ class TimerEntry(Screen): return int(mktime(dt.timetuple())) def keyGo(self): + self.timer.name = config.timerentry.name.value + self.timer.description = config.timerentry.description.value self.timer.resetRepeated() if (config.timerentry.type.value == 0): # once @@ -236,14 +260,101 @@ class TimerEntry(Screen): for x in range(0,5): self.timer.setRepeated(x) - if (config.timerentry.repeated.value == 3): # user-defined + if (config.timerentry.repeated.value == 3): # user defined for x in range(0,7): if (config.timerentry.day[x].value == 0): self.timer.setRepeated(x) self.timer.begin = self.getTimestamp(time.time(), config.timerentry.starttime.value) - self.timer.end = self.getTimestamp(time.time(), config.timerentry.endtime.value) + self.timer.end = self.getTimestamp(time.time(), config.timerentry.endtime.value) + + if self.timer.eit is not None: + event = eEPGCache.getInstance().lookupEventId(self.timer.service_ref.ref, self.timer.eit) + if event is not None: + if event.getNumOfLinkageServices() > 0: + self.session.openWithCallback(self.subserviceSelected, SubserviceSelection, event, self.timer.service_ref.ref) + return + self.close((True, self.timer)) + def subserviceSelected(self, service): + if not service is None: + self.timer.service_ref = ServiceReference(service) self.close((True, self.timer)) def keyCancel(self): self.close((False,)) + +class TimerLog(Screen): + def __init__(self, session, timer): + Screen.__init__(self, session) + self.timer = timer; + self.log_entries = self.timer.log_entries[:] + + self.fillLogList() + + self["loglist"] = MenuList(self.list) + self["logentry"] = Label() + + self["key_red"] = Button(_("Delete entry")) + self["key_green"] = Button() + self["key_yellow"] = Button("") + self["key_blue"] = Button(_("Clear log")) + + self.onShown.append(self.updateText) + + self["actions"] = NumberActionMap(["OkCancelActions", "DirectionActions", "ColorActions"], + { + "ok": self.keyClose, + "cancel": self.keyClose, + "up": self.up, + "down": self.down, + "left": self.left, + "right": self.right, + "red": self.deleteEntry, + "blue": self.clearLog + }, -1) + + def deleteEntry(self): + self.log_entries.remove(self["loglist"].getCurrent()[1]) + self.fillLogList() + self["loglist"].l.setList(self.list) + self.updateText() + + def fillLogList(self): + self.list = [ ] + for x in self.log_entries: + self.list.append((str(strftime("%Y-%m-%d %H-%M", localtime(x[0])) + " - " + x[2]), x)) + + def clearLog(self): + self.log_entries = [] + self.fillLogList() + self["loglist"].l.setList(self.list) + self.updateText() + + def keyClose(self): + if self.timer.log_entries != self.log_entries: + self.timer.log_entries = self.log_entries + self.close((True, self.timer)) + else: + self.close((False,)) + + def up(self): + self["loglist"].instance.moveSelection(self["loglist"].instance.moveUp) + self.updateText() + + def down(self): + self["loglist"].instance.moveSelection(self["loglist"].instance.moveDown) + self.updateText() + + def left(self): + self["loglist"].instance.moveSelection(self["loglist"].instance.pageUp) + self.updateText() + + def right(self): + self["loglist"].instance.moveSelection(self["loglist"].instance.pageDown) + self.updateText() + + def updateText(self): + if len(self.list) > 0: + self["logentry"].setText(str(self["loglist"].getCurrent()[1][2])) + else: + self["logentry"].setText("")