add Event detail viewer

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

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 41b6a12e86151fd0d490b24e2aa677b4fe06e908..1bc734a638e8e314e029bdde8b87e95d6919cf39 100644 (file)
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -1,9 +1,11 @@
 from Screen import Screen
-from Components.TimerList import TimerList, TimerEntry
+from Components.TimerList import TimerList, TimerEntryComponent
 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
+from TimerEntry import TimerEntry
 
 class TimerEdit(Screen):
        def __init__(self, session, entry):
@@ -15,6 +17,13 @@ class TimerEdit(Screen):
                                "cancel": self.close
                        })
                
+               self["shortcuts"] = ActionMap(["ShortcutActions"],
+                       {
+                               "red": self.beginFocus,
+                               "yellow": self.endFocus,
+                               "green": self.descFocus
+                       })
+               
                self.entry = entry
                # begin, end, description, service
                self["begin"] = TimeInput()
@@ -23,10 +32,20 @@ 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"])
+       
+       def endFocus(self):
+               self.setFocus(self["end"])
+       
+       def descFocus(self):
+               self.setFocus(self["description"])
        
        def apply(self):
                print "applied!"
@@ -37,10 +56,10 @@ class TimerEditList(Screen):
                
                list = [ ]
                for timer in session.nav.RecordTimer.timer_list:
-                       list.append(TimerEntry(timer, 0))
+                       list.append(TimerEntryComponent(timer, 0))
                
                for timer in session.nav.RecordTimer.processed_timers:
-                       list.append(TimerEntry(timer, 1))
+                       list.append(TimerEntryComponent(timer, 1))
                
                self["timerlist"] = TimerList(list)
 
@@ -51,4 +70,5 @@ class TimerEditList(Screen):
                        })
 
        def openEdit(self):
-               self.session.open(TimerEdit, self["timerlist"].getCurrent())
+               self.session.open(TimerEntry, self["timerlist"].getCurrent()[0])
+               #self.session.open(TimerEdit, self["timerlist"].getCurrent()[0])