X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/f973710dc6bcfc13f8db4e5720dd2aeb1518b012..8b353d9dd3ae6fd5915dff698ef670cf023d2214:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index a7752274..67b09510 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -12,8 +12,8 @@ from Components.NimManager import nimmanager
 import xml.dom.minidom
 
 class BouquetSelector(FixedMenu):
-	def __init__(self, session, bouquets, parent):
-		self.parent=parent
+	def __init__(self, session, bouquets, selectedFunc):
+		self.selectedFunc=selectedFunc
 		entrys = [ ]
 		for x in bouquets:
 			entrys.append((x[0], self.bouquetSelected, x[1]))
@@ -21,8 +21,7 @@ class BouquetSelector(FixedMenu):
 		self.skinName = "Menu"
 
 	def bouquetSelected(self):
-		self.parent.addCurrentServiceToBouquet(self["menu"].getCurrent()[2])
-		self.close()
+		self.selectedFunc(self["menu"].getCurrent()[2])
 
 class ChannelContextMenu(FixedMenu):
 	def __init__(self, session, csel):
@@ -68,23 +67,15 @@ class ChannelContextMenu(FixedMenu):
 		self.skinName = "Menu"
 
 	def addServiceToBouquetSelected(self):
-		bouquets = [ ]
-		serviceHandler = eServiceCenter.getInstance()
-		list = serviceHandler.list(self.csel.bouquet_root)
-		if not list is None:
-			while True:
-				s = list.getNext()
-				if not s.valid():
-					break
-				if ((s.flags & eServiceReference.flagDirectory) == eServiceReference.flagDirectory):
-					info = serviceHandler.info(s)
-					if not info is None:
-						bouquets.append((info.getName(s), s))
-		cnt = len(bouquets)
+		bouquets = self.csel.getBouquetList()
+		if bouquets is None:
+			cnt = 0
+		else:
+			cnt = len(bouquets)
 		if cnt > 1: # show bouquet list
-			self.session.open(BouquetSelector, bouquets, self)
+			self.session.open(BouquetSelector, bouquets, self.addCurrentServiceToBouquet)
 		elif cnt == 1: # add to only one existing bouquet
-			self.addCurrentServiceToBouquet(bouquet[0][1])
+			self.addCurrentServiceToBouquet(bouquets[0][1])
 		else: #no bouquets in root.. so assume only one favourite list is used
 			self.addCurrentServiceToBouquet(self.csel.bouquet_root)
 
@@ -252,8 +243,8 @@ class ChannelSelectionBase(Screen):
 
 		self.service_types = self.service_types_tv
 
-		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('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
+		#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('%s FROM BOUQUET "userbouquet.favourites.tv" ORDER BY bouquet'%(self.service_types))
 
 		self["key_red"] = Button(_("All"))
 		self["key_green"] = Button(_("Satellites"))
@@ -326,13 +317,13 @@ class ChannelSelectionBase(Screen):
 				else:
 					service_name = _("Services")
 				try:
-					service_name += ' - %s'%(nimmanager.getSatDescription(orbpos))
-					service.setName(str(service_name)) # why we need this cast?
+					service_name += str(' - %s'%(nimmanager.getSatDescription(orbpos)))
+					service.setName(service_name) # why we need this cast?
 				except:
 					if orbpos > 1800: # west
-						service.setName("%s (%3.1fW)"%(str, (0 - (orbpos - 3600)) / 10.0))
+						service.setName("%s (%3.1f" + _("W") + ")" %(str, (0 - (orbpos - 3600)) / 10.0))
 					else:
-						service.setName("%s (%3.1fE)"%(str, orbpos / 10.0))
+						service.setName("%s (%3.1f" + _("E") + ")" % (str, orbpos / 10.0))
 				self.servicelist.addService(service)
 		self.servicelist.finishFill()
 
@@ -370,6 +361,29 @@ class ChannelSelectionBase(Screen):
 	def cancel(self):
 		self.close(None)
 
+	def getBouquetList(self):
+		serviceCount=0
+		bouquets = [ ]
+		serviceHandler = eServiceCenter.getInstance()
+		list = serviceHandler.list(self.bouquet_root)
+		if not list is None:
+			while True:
+				s = list.getNext()
+				if not s.valid():
+					break
+				if ((s.flags & eServiceReference.flagDirectory) == eServiceReference.flagDirectory):
+					info = serviceHandler.info(s)
+					if not info is None:
+						bouquets.append((info.getName(s), s))
+				else:
+					serviceCount += 1
+			if len(bouquets) == 0 and serviceCount > 0:
+				info = serviceHandler.info(self.bouquet_root)
+				if not info is None:
+					bouquets.append((info.getName(self.bouquet_root), self.bouquet_root))
+			return bouquets
+		return None
+
 class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit):
 	def __init__(self, session):
 		ChannelSelectionBase.__init__(self,session)