define movepaths for MovingPixmaps and proof of concept in the start-wizard

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

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index b64fb11620110a9dcb4a7394a5fe0a3a0918b3c0..5233da9b759eb099ab5c05e821053a82091b5a94 100644 (file)
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -16,27 +16,33 @@ class TimerEditList(Screen):
                Screen.__init__(self, session)
                
                list = [ ]
-               for timer in session.nav.RecordTimer.timer_list:
-                       list.append(TimerEntryComponent(timer, 0))
-               
-               for timer in session.nav.RecordTimer.processed_timers:
-                       list.append(TimerEntryComponent(timer, 1))
-               
+               self.list = list
+               self.fillTimerList()
+
                self["timerlist"] = TimerList(list)
                
-               self["key_red"] = Button("Delete")
-               self["key_green"] = Button("Add")
+               self["key_red"] = Button(_("Delete"))
+               self["key_green"] = Button(_("Add"))
                self["key_yellow"] = Button("")
                self["key_blue"] = Button("")
 
                self["actions"] = ActionMap(["OkCancelActions", "ShortcutActions"], 
                        {
                                "ok": self.openEdit,
-                               "cancel": self.close,
+                               "cancel": self.leave,
                                "red": self.removeTimer,
                                "green": self.addCurrentTimer
                        })
 
+       def fillTimerList(self):
+               del self.list[:]
+               
+               for timer in self.session.nav.RecordTimer.timer_list:
+                       self.list.append(TimerEntryComponent(timer, 0))
+               
+               for timer in self.session.nav.RecordTimer.processed_timers:
+                       self.list.append(TimerEntryComponent(timer, 1))
+
        def openEdit(self):
                self.session.openWithCallback(self.finishedEdit, TimerEntry, self["timerlist"].getCurrent()[0])
                #self.session.open(TimerEdit, self["timerlist"].getCurrent()[0])
@@ -44,6 +50,8 @@ class TimerEditList(Screen):
        def removeTimer(self):
                # FIXME doesn't work...
                self.session.nav.RecordTimer.removeEntry(self["timerlist"].getCurrent()[0])
+               self.fillTimerList()
+               self["timerlist"].invalidate()
        
        def addCurrentTimer(self):
                begin = time()
@@ -81,11 +89,18 @@ class TimerEditList(Screen):
        def finishedEdit(self, answer):
                if (answer[0]):
                        print "Edited timer"
+                       self.session.nav.RecordTimer.timeChanged(answer[1])
+                       self.fillTimerList()
                else:
                        print "Timeredit aborted"
-
+                       
        def finishedAdd(self, answer):
                if (answer[0]):
                        self.session.nav.RecordTimer.record(answer[1])
+                       self.fillTimerList()
                else:
-                       print "Timeredit aborted"               
\ No newline at end of file
+                       print "Timeredit aborted"               
+
+       def leave(self):
+               self.session.nav.RecordTimer.saveTimer()
+               self.close()
\ No newline at end of file