X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2bc720f79ea42168572ba458fec5b2cffb175a04..cffee89d7b3567ee92901f6963108c33ea3ac469:/lib/python/Screens/InfoBar.py

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 98a0f7cd..0a297fbf 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -6,11 +6,8 @@ from Screens.MessageBox import MessageBox
 from Screens.Ci import CiHandler
 from ServiceReference import ServiceReference
 
-from Components.Clock import Clock
-from Components.Date import DateLabel
-from Components.ProviderName import ProviderName
+from Components.Sources.Clock import Clock
 from Components.ActionMap import ActionMap, HelpableActionMap
-from Components.ServicePosition import ServicePosition, ServicePositionGauge
 from Components.config import currentConfigSelectionElement, config
 
 from Tools.Notifications import AddNotificationWithCallback
@@ -37,6 +34,8 @@ class InfoBar(InfoBarShowHide,
 	InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek,
 	InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, 
 	InfoBarSubtitleSupport, Screen):
+	
+	ALLOW_SUSPEND = True
 
 	def __init__(self, session):
 		Screen.__init__(self, session)
@@ -48,7 +47,7 @@ class InfoBar(InfoBarShowHide,
 				"showMovies": (self.showMovies, _("Play recorded movies...")),
 				"showRadio": (self.showRadio, _("Show the radio player...")),
 				"showTv": (self.showTv, _("Show the tv player...")),
-			})
+			}, prio=2)
 		
 		for x in HelpableScreen, \
 				InfoBarShowHide, \
@@ -59,13 +58,10 @@ class InfoBar(InfoBarShowHide,
 				InfoBarTeletextPlugin, InfoBarExtensions, InfoBarSubtitleSupport:
 			x.__init__(self)
 
-		self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")]))
-		self.helpList.append((self["actions"], "InfobarActions", [("showRadio", "Hear Radio...")]))
+		self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))]))
+		self.helpList.append((self["actions"], "InfobarActions", [("showRadio", _("hear radio..."))]))
 
 		self["CurrentTime"] = Clock()
-		# ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
-		self["CurrentDate"] = DateLabel()
-		self["CurrentProvider"] = ProviderName(self.session.nav)
 
 	def showTv(self):
 		self.showTvChannelList(True)
@@ -88,6 +84,9 @@ class MoviePlayer(InfoBarShowHide, \
 		InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
 		InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
 		InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport, Screen):
+
+	ENABLE_RESUME_SUPPORT = True
+	ALLOW_SUSPEND = True
 		
 	def __init__(self, session, service):
 		Screen.__init__(self, session)
@@ -104,16 +103,11 @@ class MoviePlayer(InfoBarShowHide, \
 				InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport:
 			x.__init__(self)
 
-		self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING)
-		self["ElapsedTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_POSITION)
-		self["PositionGauge"] = ServicePositionGauge(self.session.nav)
-		
-		# TYPE_LENGTH?
-		
 		self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference()
 		self.session.nav.playService(service)
 
 	def leavePlayer(self):
+		self.is_closing = True
 		self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?"))
 	
 	def leavePlayerConfirmed(self, answer):