X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/226fbe8eb2c31d925dcefa44420fbd03764ad34f..1a878183819985dbe84735e6102b9596ea803e50:/lib/python/Screens/InfoBarGenerics.py

diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py
index 4d4bd7aa..af8f0a91 100644
--- a/lib/python/Screens/InfoBarGenerics.py
+++ b/lib/python/Screens/InfoBarGenerics.py
@@ -12,6 +12,7 @@ from Components.ProgressBar import *
 from Components.ServiceEventTracker import ServiceEventTracker
 from Components.Sources.CurrentService import CurrentService
 from Components.Sources.EventInfo import EventInfo
+from Components.Sources.RadioText import RadioText
 from Components.Sources.FrontendStatus import FrontendStatus
 from Components.Sources.Boolean import Boolean
 from Components.Sources.Clock import Clock
@@ -246,7 +247,6 @@ class InfoBarChannelSelection:
 		#instantiate forever
 		self.servicelist = self.session.instantiateDialog(ChannelSelection)
 		
-		print "__init__: servicelist is", self.servicelist
 		if config.misc.initialchannelselection.value:
 			self.onShown.append(self.firstRun)
 
@@ -277,7 +277,6 @@ class InfoBarChannelSelection:
 		self.onShown.remove(self.firstRun)
 		config.misc.initialchannelselection.value = False
 		config.misc.initialchannelselection.save()
-		print "servicelist is", self.servicelist
 		self.switchChannelDown()
 
 	def historyBack(self):
@@ -527,6 +526,11 @@ class InfoBarEvent:
 		self["Event_Now"] = EventInfo(self.session.nav, EventInfo.NOW)
 		self["Event_Next"] = EventInfo(self.session.nav, EventInfo.NEXT)
 
+class InfoBarRadioText:
+	"""provides radio (RDS) text info display"""
+	def __init__(self):
+		self["RadioText"] = RadioText(self.session.nav)
+
 class InfoBarServiceName:
 	def __init__(self):
 		self["CurrentService"] = CurrentService(self.session.nav)
@@ -1150,11 +1154,10 @@ class InfoBarSubtitles:
 class InfoBarPiP:
 	def __init__(self):
 		self.session.pipshown = False
-		
-		self.addExtension((self.getShowHideName, self.showPiP, self.available), "1")
-		self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "2")
-		self.addExtension((self.getSwapName, self.swapPiP, self.pipShown), "3")
 
+		self.addExtension((self.getShowHideName, self.showPiP, self.available), "red")
+		self.addExtension((self.getMoveName, self.movePiP, self.pipShown), "green")
+		self.addExtension((self.getSwapName, self.swapPiP, self.pipShown), "yellow")
 	
 	def available(self):
 		return True
@@ -1403,7 +1406,6 @@ class InfoBarAudioSelection:
 			self.audioChannel.selectChannel(mode[1])
 		del self.audioChannel
 
-		
 class InfoBarSubserviceSelection:
 	def __init__(self):
 		self["SubserviceSelectionAction"] = HelpableActionMap(self, "InfobarSubserviceSelectionActions",