X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBar.py;h=aaa3debace3b2857b9ad629856a3a04a3292542c;hp=cee385c1a3be8332e6bc371e47383887a8124103;hb=eb47577c32b49a28eb7986b0fd86ed0d76207150;hpb=572caca1ba06dd8247724c9f5d6bcad515e2edf4

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index cee385c..aaa3deb 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -2,9 +2,10 @@ from Screen import Screen
 
 from Screens.MovieSelection import MovieSelection
 from Screens.MessageBox import MessageBox
+from ServiceReference import ServiceReference
 
 from Components.Clock import Clock
-from Components.ActionMap import ActionMap
+from Components.ActionMap import ActionMap, HelpableActionMap
 from Components.ServicePosition import ServicePosition
 
 from Tools.Notifications import AddNotificationWithCallback
@@ -13,7 +14,7 @@ from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \
 	InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
 	InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord, \
 	InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
-	InfoBarSubserviceSelection
+	InfoBarSubserviceSelection, InfoBarTuner
 
 from Screens.HelpMenu import HelpableScreen, HelpMenu
 
@@ -25,21 +26,21 @@ class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey,
 	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
 	InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
 	HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish,
-	InfoBarSubserviceSelection):
+	InfoBarSubserviceSelection, InfoBarTuner):
 
 	def __init__(self, session):
 		Screen.__init__(self, session)
 
-		self["actions"] = ActionMap( [ "InfobarActions" ],
+		self["actions"] = HelpableActionMap(self, "InfobarActions",
 			{
-				"showMovies": self.showMovies,
+				"showMovies": (self.showMovies, _("Play recorded movies..."))
 			})
 		
 		for x in HelpableScreen, \
 				InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
 				InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
 				InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
-				InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection:
+				InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, InfoBarTuner:
 			x.__init__(self)
 
 		self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))
@@ -60,9 +61,9 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey
 	def __init__(self, session, service):
 		Screen.__init__(self, session)
 		
-		self["actions"] = ActionMap( [ "MoviePlayerActions" ],
+		self["actions"] = HelpableActionMap(self, "MoviePlayerActions",
 			{
-				"leavePlayer": self.leavePlayer
+				"leavePlayer": (self.leavePlayer, _("leave movie player..."))
 			})
 		
 		for x in HelpableScreen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, InfoBarNotifications:
@@ -80,3 +81,11 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey
 		if answer == True:
 			self.session.nav.playService(self.lastservice)
 			self.close()
+			
+	def showMovies(self):
+		ref = self.session.nav.getCurrentlyPlayingServiceReference()
+		self.session.openWithCallback(self.movieSelected, MovieSelection, ref)
+
+	def movieSelected(self, service):
+		if service is not None:
+			self.session.nav.playService(service)