X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7abf1d06a7a051f55708af14aef49ad7fea093ac..7c531362f5e50a36fa2ca8026f87b95d04807673:/lib/python/Screens/TimerEntry.py diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index 7b9ec85e..a03435ee 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -1,23 +1,28 @@ 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 time import * -from datetime import * -from math import log +import time +import datetime class TimerEntry(Screen): def __init__(self, session, timer): Screen.__init__(self, session) self.timer = timer; + + self["ok"] = Label("OK") + self["cancel"] = Label("Cancel") self.createConfig() self["actions"] = NumberActionMap(["SetupActions"], { - "ok": self.keyGo, + "ok": self.keySelect, + "save": self.keyGo, "cancel": self.keyCancel, "left": self.keyLeft, "right": self.keyRight, @@ -55,7 +60,7 @@ class TimerEntry(Screen): flags = self.timer.repeated repeated = 3 # user-defined count = 0 - for x in range(0, 6): + for x in range(0, 7): if (flags == 1): # weekly print "Set to weekday " + str(x) weekday = x @@ -77,10 +82,10 @@ class TimerEntry(Screen): 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(strftime("%H", localtime(self.timer.begin))), int(strftime("%M", localtime(self.timer.begin)))], configsequencearg.get("CLOCK")) + 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.endtime = configElement_nonSave("config.timerentry.endtime", configSequence, [int(strftime("%H", localtime(self.timer.end))), int(strftime("%M", localtime(self.timer.end)))], configsequencearg.get("CLOCK")) + 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")) @@ -142,7 +147,7 @@ class TimerEntry(Screen): self.list.append(getConfigListEntry("EndDate", config.timerentry.enddate)) self.list.append(getConfigListEntry("EndTime", config.timerentry.endtime)) - self.list.append(getConfigListEntry("Channel", config.timerentry.service)) + self.list.append(getConfigListEntry(_("Channel"), config.timerentry.service)) self["config"].list = self.list self["config"].l.setList(self.list) @@ -167,15 +172,24 @@ class TimerEntry(Screen): def keyRight(self): self["config"].handleKey(config.key["nextElement"]) self.newConfig() + + def keySelect(self): + if self["config"].getCurrent()[0] == _("Channel"): + self.session.openWithCallback(self.finishedChannelSelection, ChannelSelection.SimpleChannelSelection, _("Select channel to record from")) + + 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) def keyNumberGlobal(self, number): print "You pressed number " + str(number) if (self["config"].getCurrent()[1].parent.enabled == True): self["config"].handleKey(config.key[str(number)]) - def getTimestamp(self, date, time): - d = localtime(date) # for gettin indexes 0(year), 1(month) and 2(day) - dt = datetime(d.tm_year, d.tm_mon, d.tm_mday, time[0], time[1]) + def getTimestamp(self, date, mytime): + d = time.localtime(date) + dt = datetime.datetime(d.tm_year, d.tm_mon, d.tm_mday, mytime[0], mytime[1]) print dt return int(mktime(dt.timetuple())) @@ -187,29 +201,22 @@ class TimerEntry(Screen): self.timer.end = self.getTimestamp(config.timerentry.enddate.value, config.timerentry.endtime.value) if (config.timerentry.type.value == 1): # repeated if (config.timerentry.repeated.value == 0): # daily - self.timer.setRepeated(0) # Mon - self.timer.setRepeated(1) # Tue - self.timer.setRepeated(2) # Wed - self.timer.setRepeated(3) # Thu - self.timer.setRepeated(4) # Fri - self.timer.setRepeated(5) # Sat - self.timer.setRepeated(6) # Sun + for x in range(0,7): + self.timer.setRepeated(x) if (config.timerentry.repeated.value == 1): # weekly self.timer.setRepeated(config.timerentry.weekday.value) if (config.timerentry.repeated.value == 2): # Mon-Fri - self.timer.setRepeated(0) # Mon - self.timer.setRepeated(1) # Tue - self.timer.setRepeated(2) # Wed - self.timer.setRepeated(3) # Thu - self.timer.setRepeated(4) # Fri + for x in range(0,5): + self.timer.setRepeated(x) 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.close((True, self.timer))