remove frequency input range check in manual scan (was 10000-14000)..

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

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index 643726256806586853197c43d9eb1e58bc3b53c0..a9a79d12dc4bf9dcf580320bc525840a2fdb0ba1 100644 (file)
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -6,6 +6,9 @@ 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
 
@@ -14,8 +17,10 @@ class TimerEntry(Screen):
                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()
 
@@ -76,8 +81,11 @@ 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.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")))
@@ -126,13 +134,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(_("Timer Type"), config.timerentry.type))
+               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
@@ -163,20 +174,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] == _("Timer Type"):
+               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,15 +204,17 @@ 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"))
+               else:
+                       self.keyGo()
 
        def finishedChannelSelection(self, args):
                oldref = self.timer.service_ref
@@ -224,6 +238,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()
                
@@ -247,8 +262,19 @@ class TimerEntry(Screen):
                                        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):