X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/223c807af74a9a402fa5a649c3e7acafb8caa8e3..828d14b327774be99e3d411399907e5141d60814:/lib/python/Screens/EpgSelection.py

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index 03228f60..4d288b00 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -5,7 +5,7 @@ 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 RecordTimer import RecordTimerEntry, parseEvent
 from TimerEdit import TimerEditList
 from TimerEntry import TimerEntry
 from ServiceReference import ServiceReference
@@ -21,6 +21,11 @@ class EPGSelection(Screen):
 		class ChannelActionMap(ActionMap):
 			def action(self, contexts, action):
 					ActionMap.action(self, contexts, action)
+					
+		self["key_red"] = Button("")
+		self["key_green"] = Button(_("Add timer"))
+		self["key_yellow"] = Button("")
+		self["key_blue"] = Button("")
 
 		self["actions"] = ChannelActionMap(["EPGSelectActions", "OkCancelActions"], 
 			{
@@ -41,27 +46,18 @@ class EPGSelection(Screen):
 
 	def eventSelected(self):
 		event = self["list"].getCurrent()
-		self.session.open(EventView, event, self.eventViewCallback)
+		self.session.open(EventView, event, self.currentService, self.eventViewCallback)
 	
 	def timerAdd(self):
-		epg = self["list"].getCurrent()
+		event = self["list"].getCurrent()
+		
+		if event is None:
+			return
 		
-		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)
+		newEntry = RecordTimerEntry(serviceref, *parseEvent(event))
 		self.session.openWithCallback(self.timerEditFinished, TimerEntry, newEntry)
 	
 	def timerEditFinished(self, answer):
@@ -69,8 +65,9 @@ class EPGSelection(Screen):
 			self.session.nav.RecordTimer.record(answer[1])
 		else:
 			print "Timeredit aborted"	
-			
+
 	def setRoot(self, root):
+		self.currentService=ServiceReference(root)
 		self["list"].setRoot(root)
 
 	def moveUp(self):