X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/66f8c8df75cc229671bd86a2ebbb2b0924bc6d3e..f412f2579647e5b4b9857acaa4a1b29ff191533e:/lib/python/Screens/ChannelSelection.py

diff --git a/lib/python/Screens/ChannelSelection.py b/lib/python/Screens/ChannelSelection.py
index 60742c47..eb6f9059 100644
--- a/lib/python/Screens/ChannelSelection.py
+++ b/lib/python/Screens/ChannelSelection.py
@@ -14,7 +14,7 @@ from Components.Sources.Clock import Clock
 from Components.Sources.RdsDecoder import RdsDecoder
 from Components.Input import Input
 from Components.ParentalControl import parentalControl
-from Components.Pixmap import PixmapConditional
+from Components.Pixmap import Pixmap
 from Screens.InputBox import InputBox, PinInput
 from Screens.MessageBox import MessageBox
 from Screens.ServiceInfo import ServiceInfo
@@ -854,27 +854,27 @@ class ChannelSelectionBase(Screen):
 								break
 							orbpos = service.getUnsignedData(4) >> 16
 							if service.getPath().find("FROM PROVIDER") != -1:
-								service_name = _("Providers")
+								service_type = _("Providers")
 							elif service.getPath().find("flags == %d" %(FLAG_SERVICE_NEW_FOUND)) != -1:
-								service_name = _("New")
+								service_type = _("New")
 							else:
-								service_name = _("Services")
+								service_type = _("Services")
 							try:
-								service_name += str(' - %s'%(nimmanager.getSatDescription(orbpos)))
-								service.setName(service_name) # why we need this cast?
+								# why we need this cast?
+								service_name = str(nimmanager.getSatDescription(orbpos))
 							except:
 								if orbpos == 0xFFFF: #Cable
-									n = ("%s (%s)") % (service_name, _("Cable"))
+									service_name = _("Cable")
 								elif orbpos == 0xEEEE: #Terrestrial
-									n = ("%s (%s)") % (service_name, _("Terrestrial"))
+									service_name = _("Terrestrial")
 								else:
 									if orbpos > 1800: # west
 										orbpos = 3600 - orbpos
 										h = _("W")
 									else:
 										h = _("E")
-									n = ("%s (%d.%d" + h + ")") % (service_name, orbpos / 10, orbpos % 10)
-								service.setName(n)
+									service_name = ("%d.%d" + h) % (orbpos / 10, orbpos % 10)
+							service.setName("%s - %s" % (service_name, service_type))
 							self.servicelist.addService(service)
 						self.servicelist.finishFill()
 						if prev is not None:
@@ -910,7 +910,9 @@ class ChannelSelectionBase(Screen):
 				self.enterPath(ref)
 
 	def inBouquet(self):
-		return self.isBasePathEqual(self.bouquet_root)
+		if len(self.servicePath) > 0 and self.servicePath[0] == self.bouquet_root:
+			return True
+		return False
 
 	def atBegin(self):
 		return self.servicelist.atBegin()
@@ -1052,6 +1054,7 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 		self.lastroot = config.tv.lastroot
 		self.revertMode = None
 		config.usage.multibouquet.addNotifier(self.multibouquet_config_changed)
+		self.new_service_played = False
 
 	def multibouquet_config_changed(self, val):
 		self.recallBouquetMode()
@@ -1127,12 +1130,18 @@ class ChannelSelection(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelect
 		ref = self.session.nav.getCurrentlyPlayingServiceReference()
 		nref = self.getCurrentSelection()
 		if ref is None or ref != nref:
+			self.new_service_played = True
 			self.session.nav.playService(nref)
 			self.saveRoot()
 			self.saveChannel(nref)
 			config.servicelist.lastmode.save()
 			self.addToHistory(nref)
 
+	def newServicePlayed(self):
+		ret = self.new_service_played
+		self.new_service_played = False
+		return ret
+
 	def addToHistory(self, ref):
 		if self.servicePath is not None:
 			tmp=self.servicePath[:]
@@ -1268,7 +1277,7 @@ class RadioInfoBar(Screen, InfoBarEvent, InfoBarServiceName):
 		InfoBarServiceName.__init__(self)
 		self["CurrentTime"] = Clock()
 		self["RdsDecoder"] = RdsDecoder(self.session.nav)
-		self["BlinkingPoint"] = PixmapConditional(False)
+		self["BlinkingPoint"] = Pixmap()
 		self["BlinkingPoint"].hide()
 
 class ChannelSelectionRadio(ChannelSelectionBase, ChannelSelectionEdit, ChannelSelectionEPG):