use green to add a timer directly from the epgSelection

diff --git a/data/keymap.xml b/data/keymap.xml
index 91cd6a6..e1d99ff 100644 (file)
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -104,6 +104,9 @@
                <key id="KEY_BLUE" mapto="bouquet:(type == 1) FROM BOUQUET &quot;bouquets.tv&quot; ORDER BY bouquet" flags="m" />
                <key id="KEY_INFO" mapto="showEPGList" flags="m" />
        </map>
+       <map context="EPGSelectActions">
+               <key id="KEY_GREEN" mapto="timerAdd" flags="m" />
+       </map>
        <map context="EventViewActions">
                <key id="KEY_UP" mapto="pageUp" flags="m" />
                <key id="KEY_DOWN" mapto="pageDown" flags="m" />

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index 9ab18fb..03228f6 100644 (file)
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -5,6 +5,10 @@ from Components.ActionMap import ActionMap
 from Screens.EventView import EventView
 from enigma import eServiceReference, eServiceEventPtr
 from Screens.FixedMenu import FixedMenu
+from RecordTimer import RecordTimerEntry
+from TimerEdit import TimerEditList
+from TimerEntry import TimerEntry
+from ServiceReference import ServiceReference
 
 import xml.dom.minidom
 
@@ -22,6 +26,7 @@ class EPGSelection(Screen):
                        {
                                "cancel": self.close,
                                "ok": self.eventSelected,
+                               "timerAdd": self.timerAdd
                        })
                self["actions"].csel = self
                self.setRoot(root)
@@ -38,6 +43,33 @@ class EPGSelection(Screen):
                event = self["list"].getCurrent()
                self.session.open(EventView, event, self.eventViewCallback)
        
+       def timerAdd(self):
+               epg = self["list"].getCurrent()
+               
+               if (epg == None):
+                       description = "unknown event"
+               else:
+                       description = epg.getEventName()
+                       # FIXME we need a timestamp here:
+                       begin = epg.getBeginTime()
+                       
+                       print begin
+                       print epg.getDuration()
+                       end = begin + epg.getDuration()
+
+
+               # FIXME only works if already playing a service
+               serviceref = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference())
+               
+               newEntry = RecordTimerEntry(begin, end, serviceref, epg, description)
+               self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
+       
+       def timerEditFinished(self, answer):
+               if (answer[0]):
+                       self.session.nav.RecordTimer.record(answer[1])
+               else:
+                       print "Timeredit aborted"       
+                       
        def setRoot(self, root):
                self["list"].setRoot(root)
 

diff --git a/lib/python/Screens/TimerEdit.py b/lib/python/Screens/TimerEdit.py
index 86bd4e0..b64fb11 100644 (file)
--- a/lib/python/Screens/TimerEdit.py
+++ b/lib/python/Screens/TimerEdit.py
@@ -73,11 +73,10 @@ class TimerEditList(Screen):
                # FIXME only works if already playing a service
                serviceref = ServiceReference(self.session.nav.getCurrentlyPlayingServiceReference())
                
-               self.addTimer(begin, end, serviceref, epg, description)
+               self.addTimer(RecordTimerEntry(begin, end, serviceref, epg, description))
                
-       def addTimer(self, begin, end, serviceref, epg, description):
-               newEntry = RecordTimerEntry(begin, end, serviceref, epg, description)
-               self.session.openWithCallback(self.finishedAdd, TimerEntry, newEntry)
+       def addTimer(self, timer):
+               self.session.openWithCallback(self.finishedAdd, TimerEntry, timer)
                
        def finishedEdit(self, answer):
                if (answer[0]):