X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/ff84dc4ee5f57e24a0777930d5482ee4ff53da0e..cae001777c7b32bdb4f6f4199e9f49058946fe9f:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 43b4cd92..c31b7949 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -2,8 +2,8 @@ from Screen import Screen
 from Components.Button import Button
 from Components.ServiceList import ServiceList
 from Components.ActionMap import ActionMap
-
-from enigma import eServiceReference
+from EpgSelection import EPGSelection
+from enigma import eServiceReference, eEPGCache, eEPGCachePtr
 
 from Screens.FixedMenu import FixedMenu
 
@@ -69,25 +69,32 @@ class ChannelSelection(Screen):
 		class ChannelActionMap(ActionMap):
 			def action(self, contexts, action):
 				if action[:7] == "bouquet":
-					print "setting root to " + action[8:]
 					l = self.csel["list"]
 					l.setMode(l.MODE_NORMAL)
 					l.setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + action[8:]))
 				else:
 					ActionMap.action(self, contexts, action)
 
-		self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions"], 
+		self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"], 
 			{
 				"cancel": self.close,
 				"ok": self.channelSelected,
 				"mark": self.doMark,
 				"contextMenu": self.doContext,
-				"showFavourites": self.showFavourites
+				"showFavourites": self.showFavourites,
+				"showEPGList": self.showEPGList
 			})
 		self["actions"].csel = self
 
+	def showEPGList(self):
+		ref=self["list"].getCurrent()
+		ptr=eEPGCache.getInstance()
+		if ptr.startTimeQuery(ref) != -1:
+			self.session.open(EPGSelection, ref)
+		else:
+			print 'no epg for service', ref.toString()
+
 	#  marked edit mode
-	
 	def startMarkedEdit(self):
 		self.bouquet_mark_edit = True
 		self.clearMarks()
@@ -97,7 +104,6 @@ class ChannelSelection(Screen):
 		
 		l = self["list"]
 		for x in marked:
-			print "mark: " + str(x)
 			l.addMarked(x)
 		
 	def endMarkedEdit(self, abort):
@@ -136,7 +142,6 @@ class ChannelSelection(Screen):
 			l.setRoot(ref)
 		else:
 			self.session.nav.playService(ref)
-			print "current: " + ref.toString()
 			self.close()
 
 	#called from infoBar
@@ -157,7 +162,7 @@ class ChannelSelection(Screen):
 			self.movemode = False
 		else:
 			self.movemode = True
-	
+
 	def showFavourites(self):
 		l = self["list" ]
 		l.setRoot(eServiceReference('1:0:1:0:0:0:0:0:0:0:(provider == "fav")'))