X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1f3de605b9be5751d14c39f785adc5d4af2fced7..58bb15bea1fb425c5192efe95090f6ff36b6e8d9:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 465d3de3..e421c5c9 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -55,10 +55,10 @@ class ChannelSelection(Screen):
 		## FIXME
 		self.__marked = [ ]
 		
-		self["key_red"] = Button("red")
-		self["key_green"] = Button("green")
-		self["key_yellow"] = Button("yellow")
-		self["key_blue"] = Button("blue")
+		self["key_red"] = Button("All")
+		self["key_green"] = Button("ARD")
+		self["key_yellow"] = Button("ZDF")
+		self["key_blue"] = Button("Custom")
 		
 		self["list"] = ServiceList()
 		self["list"].setRoot(eServiceReference("""1:0:1:0:0:0:0:0:0:0:(type == 1)"""))
@@ -69,7 +69,9 @@ class ChannelSelection(Screen):
 			def action(self, contexts, action):
 				if action[:7] == "bouquet":
 					print "setting root to " + action[8:]
-					self.csel["list"].setRoot(eServiceReference("1:0:1:0:0:0:0:0:0:0:" + 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)
 
@@ -78,7 +80,8 @@ class ChannelSelection(Screen):
 				"cancel": self.close,
 				"ok": self.channelSelected,
 				"mark": self.doMark,
-				"contextMenu": self.doContext
+				"contextMenu": self.doContext,
+				"showFavourites": self.showFavourites
 			})
 		self["actions"].csel = self
 
@@ -119,6 +122,7 @@ class ChannelSelection(Screen):
 	# ...
 	def channelSelected(self):
 		self.session.nav.playService(self["list"].getCurrent())
+		print "current: " + self["list"].getCurrent().toString()
 		self.close()
 
 	#called from infoBar
@@ -137,3 +141,7 @@ class ChannelSelection(Screen):
 	def setMoveMode(self, mode):
 		self.movemode = mode
 	
+	def showFavourites(self):
+		l = self["list" ]
+		l.setRoot(eServiceReference('1:0:1:0:0:0:0:0:0:0:(provider == "fav")'))
+		l.setMode(l.MODE_FAVOURITES)