activate language when used in standalone screen

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

diff --git a/lib/python/Screens/TimerEntry.py b/lib/python/Screens/TimerEntry.py
index b73b7c0dfcad9c2af9005a1a6a7f31f3c1dc2910..781e8bf18ddaa0f3fe7c645e67799282fce6e137 100644 (file)
--- a/lib/python/Screens/TimerEntry.py
+++ b/lib/python/Screens/TimerEntry.py
@@ -19,13 +19,14 @@ class TimerEntry(Screen):
 
                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,
@@ -110,12 +111,18 @@ 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 = []
@@ -175,6 +182,9 @@ class TimerEntry(Screen):
                        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
@@ -193,9 +203,14 @@ class TimerEntry(Screen):
                        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)
@@ -209,6 +224,7 @@ class TimerEntry(Screen):
                return int(mktime(dt.timetuple()))
 
        def keyGo(self):
+               self.timer.description = config.timerentry.description.value
                self.timer.resetRepeated()
                
                if (config.timerentry.type.value == 0): # once