X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f43943087f01dca40b5bda702340bed885bcc891..e8511cf9fc1d7456ca040a792c60f78b098c5cba:/lib/python/Screens/TimerEntry.py diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index 467f851f..a9a79d12 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -1,30 +1,37 @@ from Screen import Screen +import ChannelSelection +from ServiceReference import ServiceReference from Components.config import * from Components.ActionMap import NumberActionMap from Components.ConfigList import ConfigList from Components.NimManager import nimmanager from Components.Label import Label +from Components.Pixmap import Pixmap +from Screens.SubserviceSelection import SubserviceSelection +from enigma import eEPGCache import time import datetime -from math import log class TimerEntry(Screen): def __init__(self, session, timer): Screen.__init__(self, session) 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() - self["actions"] = NumberActionMap(["SetupActions"], + self["actions"] = NumberActionMap(["SetupActions", "TextEntryActions"], { "ok": self.keySelect, "save": self.keyGo, "cancel": self.keyCancel, "left": self.keyLeft, "right": self.keyRight, + "delete": self.keyDelete, "1": self.keyNumberGlobal, "2": self.keyNumberGlobal, "3": self.keyNumberGlobal, @@ -57,13 +64,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: @@ -74,27 +81,35 @@ 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.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.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")) - config.timerentry.enddate = configElement_nonSave("config.timerentry.enddate", configDateTime, self.timer.end, ("%d.%B %Y", 86400)) + config.timerentry.enddate = configElement_nonSave("config.timerentry.enddate", configDateTime, self.timer.end, (_("%d.%B %Y"), 86400)) config.timerentry.endtime = configElement_nonSave("config.timerentry.endtime", configSequence, [int(time.strftime("%H", time.localtime(self.timer.end))), int(time.strftime("%M", time.localtime(self.timer.end)))], configsequencearg.get("CLOCK")) - config.timerentry.weekday = configElement_nonSave("config.timerentry.weekday", configSelection, weekday, ("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday")) + config.timerentry.weekday = configElement_nonSave("config.timerentry.weekday", configSelection, weekday, (_("Monday"), _("Tuesday"), _("Wednesday"), _("Thursday"), _("Friday"), _("Saturday"), _("Sunday"))) config.timerentry.day = [] for x in range(0,7): - config.timerentry.day.append(configElement_nonSave("config.timerentry.day[" + str(x) + "]", configSelection, day[x], ("yes", "no"))) + config.timerentry.day.append(configElement_nonSave("config.timerentry.day[" + str(x) + "]", configSelection, day[x], (_("yes"), _("no")))) # FIXME some service-chooser needed here - config.timerentry.service = configElement_nonSave("config.timerentry.service", configSelection, 0, ((str(self.timer.service_ref.getServiceName())),)) + servicename = "N/A" + try: # no current service available? + servicename = str(self.timer.service_ref.getServiceName()) + except: + pass + config.timerentry.service = configElement_nonSave("config.timerentry.service", configSelection, 0, ((servicename),)) config.timerentry.startdate.addNotifier(self.checkDate) config.timerentry.enddate.addNotifier(self.checkDate) @@ -104,64 +119,84 @@ class TimerEntry(Screen): if (config.timerentry.enddate.value < config.timerentry.startdate.value): config.timerentry.enddate.value = config.timerentry.startdate.value config.timerentry.enddate.change() - self["config"].invalidate(config.timerentry.enddate) + try: + self["config"].invalidate(config.timerentry.enddate) + except: + pass if (configElement.getConfigPath() == "config.timerentry.enddate"): if (config.timerentry.enddate.value < config.timerentry.startdate.value): config.timerentry.startdate.value = config.timerentry.enddate.value config.timerentry.startdate.change() - self["config"].invalidate(config.timerentry.startdate) + try: + self["config"].invalidate(config.timerentry.startdate) + except: + pass def createSetup(self): self.list = [] - self.list.append(getConfigListEntry("Description", config.timerentry.description)) - self.list.append(getConfigListEntry("TimerType", config.timerentry.type)) + self.list.append(getConfigListEntry(_("Name"), config.timerentry.name)) + self.list.append(getConfigListEntry(_("Description"), config.timerentry.description)) + 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 pass if (config.timerentry.repeated.value == 1): # weekly - self.list.append(getConfigListEntry("Weekday", config.timerentry.weekday)) + self.list.append(getConfigListEntry(_("Weekday"), config.timerentry.weekday)) - 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])) - self.list.append(getConfigListEntry("Thursday", config.timerentry.day[3])) - self.list.append(getConfigListEntry("Friday", config.timerentry.day[4])) - self.list.append(getConfigListEntry("Saturday", config.timerentry.day[5])) - self.list.append(getConfigListEntry("Sunday", config.timerentry.day[6])) + 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])) + self.list.append(getConfigListEntry(_("Thursday"), config.timerentry.day[3])) + self.list.append(getConfigListEntry(_("Friday"), config.timerentry.day[4])) + self.list.append(getConfigListEntry(_("Saturday"), config.timerentry.day[5])) + self.list.append(getConfigListEntry(_("Sunday"), config.timerentry.day[6])) #self.list.append(getConfigListEntry("StartDate", config.timerentry.startdate)) # self.list.append(getConfigListEntry("Weekday", config.timerentry.weekday)) if (config.timerentry.type.value == 0): # once - self.list.append(getConfigListEntry("StartDate", config.timerentry.startdate)) - self.list.append(getConfigListEntry("StartTime", config.timerentry.starttime)) + self.list.append(getConfigListEntry(_("Start"), config.timerentry.startdate)) + 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("EndDate", config.timerentry.enddate)) - self.list.append(getConfigListEntry("EndTime", config.timerentry.endtime)) + self.list.append(getConfigListEntry(_("End"), config.timerentry.enddate)) + 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): - self["config"].handleKey(config.key["prevElement"]) - self.newConfig() + if self["config"].getCurrent() == self.channelEntry: + self.keySelect() + else: + self["config"].handleKey(config.key["prevElement"]) + self.newConfig() + def keyDelete(self): + self["config"].handleKey(config.key["delete"]) + def keyRightCallback(self, configPath): currentConfigPath = self["config"].getCurrent()[1].parent.getConfigPath() # check if we are still on the same config entry @@ -169,11 +204,27 @@ class TimerEntry(Screen): self.keyRight() def keyRight(self): - self["config"].handleKey(config.key["nextElement"]) - self.newConfig() + if self["config"].getCurrent() == self.channelEntry: + self.keySelect() + else: + self["config"].handleKey(config.key["nextElement"]) + self.newConfig() def keySelect(self): - pass + 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): + 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) @@ -187,6 +238,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 @@ -204,13 +257,24 @@ 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):