X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/4739f2d47dc8e6aee519f90e00e011659adf47ed..cfa6562f66863d56a9f767c21a8b84f0c9317f7a:/lib/python/Screens/EpgSelection.py

diff --git a/lib/python/Screens/EpgSelection.py b/lib/python/Screens/EpgSelection.py
index aeab4f03..440df528 100644
--- a/lib/python/Screens/EpgSelection.py
+++ b/lib/python/Screens/EpgSelection.py
@@ -2,35 +2,42 @@ 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
 
 import xml.dom.minidom
 
 class EPGSelection(Screen):
-	def __init__(self, session):
+	def __init__(self, session, root):
 		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["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions"], 
+		self["actions"] = ChannelActionMap(["EPGSelectActions", "OkCancelActions"], 
 			{
 				"cancel": self.close,
 				"ok": self.eventSelected,
 			})
 		self["actions"].csel = self
+		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.eventViewCallback)
+#		self.close()
 	
 	def setRoot(self, root):
 		self["list"].setRoot(root)