- follow changes regarding timers

 - allow description to be edited (won't be saved yet)

diff --git a/lib/python/Components/TimerList.py b/lib/python/Components/TimerList.py
index da005b018a724290d308cf20de04666d3e2e0c1f..9ef7cc4b400e91924173154ed156e4d8026acbe6 100644 (file)
--- a/lib/python/Components/TimerList.py
+++ b/lib/python/Components/TimerList.py
@@ -23,7 +23,7 @@ RT_WRAP = 32
 #  | <start>                     <end>  |
 #
 def TimerEntry(timer, processed):
-       res = [ ]
+       res = [ timer ]
        
        res.append((0, 0, 400, 30, 0, RT_HALIGN_LEFT, timer.service_ref.getServiceName()))
        res.append((0, 30, 200, 20, 1, RT_HALIGN_LEFT, "%s, %s" % FuzzyTime(timer.begin)))

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 2fe389eee387849ed990936d19bae5ccac48fa05..f8c9f20797c5df37132841347368a3ac955e4c55 100644 (file)
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -4,6 +4,7 @@ from Components.ActionMap import ActionMap
 from Components.TimeInput import TimeInput
 from Components.Label import Label
 from Components.Button import Button
+from Components.TextInput import TextInput
 
 class TimerEdit(Screen):
        def __init__(self, session, entry):
@@ -18,7 +19,8 @@ class TimerEdit(Screen):
                self["shortcuts"] = ActionMap(["ShortcutActions"],
                        {
                                "red": self.beginFocus,
-                               "yellow": self.endFocus
+                               "yellow": self.endFocus,
+                               "green": self.descFocus
                        })
                
                self.entry = entry
@@ -29,10 +31,11 @@ class TimerEdit(Screen):
                self["lbegin"] = Label("Begin")
                self["lend"] = Label("End")
                
-               self["description"] = Label("bla")
-# TextInput()
+               self["description"] = TextInput()
                self["apply"] = Button("Apply")
                self["service"] = Button()
+               
+               self["description"].setText(entry.description);
        
        def beginFocus(self):
                self.setFocus(self["begin"])
@@ -40,6 +43,9 @@ class TimerEdit(Screen):
        def endFocus(self):
                self.setFocus(self["end"])
        
+       def descFocus(self):
+               self.setFocus(self["description"])
+       
        def apply(self):
                print "applied!"
        
@@ -63,4 +69,4 @@ class TimerEditList(Screen):
                        })
 
        def openEdit(self):
-               self.session.open(TimerEdit, self["timerlist"].getCurrent())
+               self.session.open(TimerEdit, self["timerlist"].getCurrent()[0])