X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/11027439f74d586f8c70abe86adbbf2e04ee53a1..d570ce4a7202de8b265fc2420d5219d13e105f95:/lib/python/Screens/TimerEntry.py diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index 6636af7c..966bbab4 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -59,13 +59,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: @@ -78,9 +78,10 @@ class TimerEntry(Screen): repeated = 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 +127,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 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 +144,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])) @@ -163,20 +167,21 @@ class TimerEntry(Screen): 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 +197,25 @@ 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")) 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 +229,7 @@ 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() @@ -237,7 +248,7 @@ 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)