X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4ac58077ff42ee1befee313fe2e185694d8b01b4..64fdc7815a0b07777d9c9706f02317d325f8f773:/lib/python/Screens/EpgSelection.py

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index 4391409a..efdd0f1b 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -2,10 +2,13 @@ from Screen import Screen
 from Components.Button import Button
 from Components.EpgList import EPGList
 from Components.ActionMap import ActionMap
-
-from enigma import eServiceReference
-
+from Screens.EventView import EventView
+from enigma import eServiceReference, eServiceEventPtr
 from Screens.FixedMenu import FixedMenu
+from RecordTimer import RecordTimerEntry, parseEvent
+from TimerEdit import TimerEditList
+from TimerEntry import TimerEntry
+from ServiceReference import ServiceReference
 
 import xml.dom.minidom
 
@@ -14,26 +17,54 @@ class EPGSelection(Screen):
 		Screen.__init__(self, session)
 
 		self["list"] = EPGList()
-#		self["list"].setRoot(root)
 
 		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(["ChannelSelectActions", "OkCancelActions"], 
+		self["actions"] = ChannelActionMap(["EPGSelectActions", "OkCancelActions"], 
 			{
 				"cancel": self.close,
 				"ok": self.eventSelected,
+				"timerAdd": self.timerAdd
 			})
 		self["actions"].csel = self
-		setRoot(root)
+		self.setRoot(root)
+
+	def eventViewCallback(self, setEvent, val):
+		if val == -1:
+			self.moveUp()
+			setEvent(self["list"].getCurrent())
+		elif val == +1:
+			self.moveDown()
+			setEvent(self["list"].getCurrent())
 
 	def eventSelected(self):
-		ref = self["list"].getCurrent()
-# open eventdetail view... not finished yet
-		self.close()
+		event = self["list"].getCurrent()
+		self.session.open(EventView, event, self.currentService, self.eventViewCallback)
 	
+	def timerAdd(self):
+		event = self["list"].getCurrent()
+		
+		if event is None:
+			return
+		
+		newEntry = RecordTimerEntry(self.currentService, *parseEvent(event))
+		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.currentService=ServiceReference(root)
 		self["list"].setRoot(root)
 
 	def moveUp(self):