fix fix

[enigma2.git] / lib / python / Screens / TimerEntry.py

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index b00d16dcbb482829ba7ace8d3e0eaa02c427f294..a03435ee847013c886048c2652715a2b2d374919 100644 (file)
--- 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,18 +8,21 @@ 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):
                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,
@@ -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,6 +172,15 @@ 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)