X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/942f9e8554c495e6782d93524c8e820ec548a8a9..c767434380ce3dc9fed8c55e69cda5c4e1544005:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 96a6947d..85801861 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -116,7 +116,8 @@ class ChannelSelection(Screen):
 		self.entry_marked = False
 		self.movemode = False
 		self.bouquet_mark_edit = False
-		self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
+		#self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "bouquets.tv" ORDER BY bouquet')
+		self.bouquet_root = eServiceReference('1:7:1:0:0:0:0:0:0:0:(type == 1) FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet')
 		self.mutableList = None
 
 		self.__marked = [ ]
@@ -157,7 +158,7 @@ class ChannelSelection(Screen):
 
 		self["actions"] = ChannelActionMap(["ChannelSelectActions", "OkCancelActions", "ContextMenuActions"],
 			{
-				"cancel": self.close,
+				"cancel": self.cancel,
 				"ok": self.channelSelected,
 				"mark": self.doMark,
 				"contextMenu": self.doContext,
@@ -373,3 +374,27 @@ class ChannelSelection(Screen):
 			refstr = ""
 		config.tv.lastservice.value = refstr
 		config.tv.lastservice.save()
+		
+	def cancel(self):
+		self.close()
+
+class SimpleChannelSelection(ChannelSelection):
+	def __init__(self, session, title):
+		ChannelSelection.__init__(self, session)
+		self.title = title
+		self.onShown.append(self.onExecCallback)
+
+	def onExecCallback(self):
+		print "onExecCallback"
+		self.session.currentDialog.instance.setTitle(self.title)
+		
+	def channelSelected(self): # just return selected service
+		ref = self.servicelist.getCurrent()
+		self.close(ref)
+		
+	def doContext(self): # don't show context menu
+		pass
+	
+	def cancel(self):
+		self.close(None)
+		
\ No newline at end of file