diff options
| author | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2005-11-22 14:07:27 +0000 |
|---|---|---|
| committer | Stefan Pluecken <stefan.pluecken@multimedia-labs.de> | 2005-11-22 14:07:27 +0000 |
| commit | 2884810419e8c4d220c91a0bba1e40e67a2fe158 (patch) | |
| tree | c37340a7b58ae6bbce8a69b61af4b0fdeff028c3 /lib/python | |
| parent | f43943087f01dca40b5bda702340bed885bcc891 (diff) | |
| download | enigma2-2884810419e8c4d220c91a0bba1e40e67a2fe158.tar.gz enigma2-2884810419e8c4d220c91a0bba1e40e67a2fe158.zip | |
changing service in timer edit is now possible
Diffstat (limited to 'lib/python')
| -rw-r--r-- | lib/python/Screens/ChannelSelection.py | 4 | ||||
| -rw-r--r-- | lib/python/Screens/InfoBarGenerics.py | 1 | ||||
| -rw-r--r-- | lib/python/Screens/TimerEntry.py | 13 |
3 files changed, 12 insertions, 6 deletions
diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py index 1c1e4503..37f594dc 100644 --- a/lib/python/Screens/ChannelSelection.py +++ b/lib/python/Screens/ChannelSelection.py @@ -376,9 +376,9 @@ class ChannelSelection(Screen): config.tv.lastservice.save() class SimpleChannelSelection(ChannelSelection): - def __init__(self, session, args): + def __init__(self, session, title): ChannelSelection.__init__(self, session) - self.args = args + self.title = title def channelSelected(self): # just return selected service ref = self.servicelist.getCurrent() diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index f63e9b15..a9f7754b 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -90,7 +90,6 @@ class InfoBarShowHide: STATE_SHOWN = 3 def __init__(self): - print "INFOBARSHOWHIDE init" self["ShowHideActions"] = ActionMap( ["InfobarShowHideActions"] , { "toggleShow": self.toggleShow, diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py index 467f851f..a03435ee 100644 --- a/lib/python/Screens/TimerEntry.py +++ b/lib/python/Screens/TimerEntry.py @@ -1,4 +1,6 @@ from Screen import Screen +import ChannelSelection +from ServiceReference import ServiceReference from Components.config import * from Components.ActionMap import NumberActionMap from Components.ConfigList import ConfigList @@ -6,7 +8,6 @@ from Components.NimManager import nimmanager from Components.Label import Label import time import datetime -from math import log class TimerEntry(Screen): def __init__(self, session, timer): @@ -146,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) @@ -173,7 +174,13 @@ class TimerEntry(Screen): self.newConfig() def keySelect(self): - pass + 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) |