update ok and cancel in the timer editor

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

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index e649666f5acf083bccde6f23f8e89c38460caafd..5c18c419470fea275fe65eab8895459eebee20d3 100644 (file)
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -14,18 +14,21 @@ 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()
 
-               self["actions"] = NumberActionMap(["SetupActions"],
+               self["actions"] = NumberActionMap(["SetupActions", "TextEntryActions"],
                {
                        "ok": self.keySelect,
                        "save": self.keyGo,
                        "cancel": self.keyCancel,
                        "left": self.keyLeft,
                        "right": self.keyRight,
+                       "delete": self.keyDelete,
                        "1": self.keyNumberGlobal,
                        "2": self.keyNumberGlobal,
                        "3": self.keyNumberGlobal,
@@ -58,13 +61,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:
@@ -77,9 +80,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"))
@@ -95,7 +99,12 @@ class TimerEntry(Screen):
 
 
                        # FIXME some service-chooser needed here
-                       config.timerentry.service = configElement_nonSave("config.timerentry.service", configSelection, 0, ((str(self.timer.service_ref.getServiceName())),))
+                       servicename = "N/A"
+                       try: # no current service available?
+                               servicename = str(self.timer.service_ref.getServiceName())
+                       except:
+                               pass
+                       config.timerentry.service = configElement_nonSave("config.timerentry.service", configSelection, 0, ((servicename),))
                        
                        config.timerentry.startdate.addNotifier(self.checkDate)
                        config.timerentry.enddate.addNotifier(self.checkDate)
@@ -105,22 +114,31 @@ class TimerEntry(Screen):
                        if (config.timerentry.enddate.value < config.timerentry.startdate.value):
                                config.timerentry.enddate.value = config.timerentry.startdate.value
                                config.timerentry.enddate.change()
-                               self["config"].invalidate(config.timerentry.enddate)
+                               try:
+                                       self["config"].invalidate(config.timerentry.enddate)
+                               except:
+                                       pass
                if (configElement.getConfigPath() == "config.timerentry.enddate"):
                        if (config.timerentry.enddate.value < config.timerentry.startdate.value):
                                config.timerentry.startdate.value = config.timerentry.enddate.value
                                config.timerentry.startdate.change()
-                               self["config"].invalidate(config.timerentry.startdate)
+                               try:
+                                       self["config"].invalidate(config.timerentry.startdate)
+                               except:
+                                       pass
 
        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
@@ -128,7 +146,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]))
@@ -151,22 +169,29 @@ 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):
-               self["config"].handleKey(config.key["prevElement"])
-               self.newConfig()
+               if self["config"].getCurrent() == self.channelEntry:
+                       self.keySelect()
+               else:
+                       self["config"].handleKey(config.key["prevElement"])
+                       self.newConfig()
 
+       def keyDelete(self):
+               self["config"].handleKey(config.key["delete"])
+                       
        def keyRightCallback(self, configPath):
                currentConfigPath = self["config"].getCurrent()[1].parent.getConfigPath()
                # check if we are still on the same config entry
@@ -174,17 +199,25 @@ class TimerEntry(Screen):
                        self.keyRight()
 
        def keyRight(self):
-               self["config"].handleKey(config.key["nextElement"])
-               self.newConfig()
+               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)
@@ -198,6 +231,8 @@ 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()
                
                if (config.timerentry.type.value == 0): # once
@@ -215,7 +250,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)