when adding a manual timer, don't propose the original name/description.

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

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index ed11874e6a0999d32fbfd34f6b43702d42de6787..dbf3f1b5ce64d93c5d63b0cd1c99252380e97fd5 100644 (file)
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -30,7 +30,7 @@ class TimerEditList(Screen):
                        {
                                "ok": self.openEdit,
                                "cancel": self.leave,
-                               "red": self.removeTimer,
+                               "red": self.removeTimerQuestion,
                                "green": self.addCurrentTimer,
                                "blue": self.cleanupQuestion,
                                "yellow": self.toggleDisabledState,
@@ -108,8 +108,13 @@ class TimerEditList(Screen):
                if delete:
                        self.session.nav.RecordTimer.cleanup()
                        self.refill()
+       
+       def removeTimerQuestion(self):
+               self.session.openWithCallback(self.removeTimer, MessageBox, _("Really delete this timer?"))
                
-       def removeTimer(self):
+       def removeTimer(self, result):
+               if not result:
+                       return
                list = self["timerlist"]
                cur = list.getCurrent()
                if cur:
@@ -134,9 +139,9 @@ class TimerEditList(Screen):
                serviceref = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference())
                
                if event is None:       
-                       data = (int(time()), int(time() + 60), "unknown event", "", None)
+                       data = (int(time()), int(time() + 60), "", "", None)
                else:
-                       data = parseEvent(event)
+                       data = parseEvent(event, description = False)
 
                self.addTimer(RecordTimerEntry(serviceref, checkOldTimers = True, *data))