add "go to standby" as timer after event

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

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 3eae8162a126f265d6b468e65af103d58f5b0aca..681d3a2580687f000788c38da340522ba10edf87 100644 (file)
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -1,16 +1,14 @@
 from Screen import Screen
 from Components.TimerList import TimerList, TimerEntryComponent
 from Screen import Screen
 from Components.TimerList import TimerList, TimerEntryComponent

-from Components.ConfigList import ConfigList

 from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.Label import Label
 from Components.Button import Button
 from Screens.MessageBox import MessageBox
 from TimerEntry import TimerEntry, TimerLog
 from Components.MenuList import MenuList
 from Components.ActionMap import ActionMap
 from Components.Label import Label
 from Components.Button import Button
 from Screens.MessageBox import MessageBox
 from TimerEntry import TimerEntry, TimerLog

-from RecordTimer import RecordTimerEntry, parseEvent
+from RecordTimer import RecordTimerEntry, parseEvent, AFTEREVENT

 from time import *
 from ServiceReference import ServiceReference
 from time import *
 from ServiceReference import ServiceReference

-from Components.config import *

 from Components.TimerSanityCheck import TimerSanityCheck
 
 class TimerEditList(Screen):
 from Components.TimerSanityCheck import TimerSanityCheck
 
 class TimerEditList(Screen):


@@ -32,7 +30,7 @@ class TimerEditList(Screen):
                        {
                                "ok": self.openEdit,
                                "cancel": self.leave,
                        {
                                "ok": self.openEdit,
                                "cancel": self.leave,

-                               "red": self.removeTimer,
+                               "red": self.removeTimerQuestion,

                                "green": self.addCurrentTimer,
                                "blue": self.cleanupQuestion,
                                "yellow": self.toggleDisabledState,
                                "green": self.addCurrentTimer,
                                "blue": self.cleanupQuestion,
                                "yellow": self.toggleDisabledState,


@@ -110,12 +108,18 @@ class TimerEditList(Screen):
                if delete:
                        self.session.nav.RecordTimer.cleanup()
                        self.refill()
                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:
                        timer = cur[0]
                list = self["timerlist"]
                cur = list.getCurrent()
                if cur:
                        timer = cur[0]

+                       timer.afterEvent = AFTEREVENT.NONE

                        self.session.nav.RecordTimer.removeEntry(timer)
                        self.refill()
        
                        self.session.nav.RecordTimer.removeEntry(timer)
                        self.refill()