X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/364dcf5cdfa9f39414074a48501f25d714117729..1b7c72ab3e418455c7da93b16e07f690328e3362:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 2dcef59f..62e4fcd2 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -10,15 +10,18 @@ from Components.ServicePosition import ServicePosition
 from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \
 	InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \
 	InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord, \
-	InfoBarAudioSelection
+	InfoBarAudioSelection, InfoBarAdditionalInfo
+
+from Screens.HelpMenu import HelpableScreen, HelpMenu
 
 from enigma import *
 
 import time
 
-class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
-	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
-	InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection):
+class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey,
+	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG,
+	InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, 
+	HelpableScreen, InfoBarAdditionalInfo):
 
 	def __init__(self, session):
 		Screen.__init__(self, session)
@@ -28,23 +31,27 @@ class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
 				"showMovies": self.showMovies,
 			})
 		
-		for x in InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
-			InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
-			InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection:
+		for x in HelpableScreen, \
+				InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
+				InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \
+				InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \
+				InfoBarAdditionalInfo:
 			x.__init__(self)
 
+		self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))
+
 		self["CurrentTime"] = Clock()
 
 	def showMovies(self):
 		self.session.openWithCallback(self.movieSelected, MovieSelection)
-	
+
 	def movieSelected(self, service):
 		if service is not None:
 			self.session.open(MoviePlayer, service)
 
 class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \
 		InfoBarMenu, \
-		InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection):
+		InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, HelpableScreen):
 		
 	def __init__(self, session, service):
 		Screen.__init__(self, session)
@@ -54,17 +61,16 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey
 				"leavePlayer": self.leavePlayer
 			})
 		
-		for x in InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection:
+		for x in HelpableScreen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection:
 			x.__init__(self)
 
-		self["CurrentTime"] = Clock()
-		# ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
+		self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
 		
 		self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
 		self.session.nav.playService(service)
 
 	def leavePlayer(self):
-		self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, "Stop playing this movie?")
+		self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?"))
 	
 	def leavePlayerConfirmed(self, answer):
 		if answer == True: