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

diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py
index 37c38691..1e8f761f 100644
--- a/lib/python/Screens/InfoBar.py
+++ b/lib/python/Screens/InfoBar.py
@@ -2,26 +2,23 @@ from Screen import Screen
 
 from Screens.MovieSelection import MovieSelection
 from Screens.ChannelSelection import ChannelSelectionRadio
-from Screens.MessageBox import MessageBox
-from Screens.Ci import CiHandler
+from Screens.ChoiceBox import ChoiceBox
 
-from Components.Sources.Clock import Clock
+from Components.Sources.Source import ObsoleteSource
 from Components.ActionMap import HelpableActionMap
 from Components.config import config
 from Components.ServiceEventTracker import ServiceEventTracker
 
-from Tools.Notifications import AddNotificationWithCallback
-
 from Screens.InfoBarGenerics import InfoBarShowHide, \
 	InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \
 	InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \
 	InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \
 	InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift,  \
 	InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \
-	InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
+	InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \
 	InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport
 
-from Screens.HelpMenu import HelpableScreen, HelpMenu
+from Screens.HelpMenu import HelpableScreen
 
 from enigma import iPlayableService
 
@@ -39,8 +36,6 @@ class InfoBar(InfoBarShowHide,
 	def __init__(self, session):
 		Screen.__init__(self, session)
 
-		CiHandler.setSession(session)
-
 		self["actions"] = HelpableActionMap(self, "InfobarActions",
 			{
 				"showMovies": (self.showMovies, _("Play recorded movies...")),
@@ -61,7 +56,7 @@ class InfoBar(InfoBarShowHide,
 		self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))]))
 		self.helpList.append((self["actions"], "InfobarActions", [("showRadio", _("hear radio..."))]))
 
-		self["CurrentTime"] = Clock()
+		self["CurrentTime"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01")
 
 		self.__event_tracker = ServiceEventTracker(screen=self, eventmap=
 			{
@@ -121,7 +116,7 @@ class MoviePlayer(InfoBarShowHide, \
 		InfoBarMenu, \
 		InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications,
 		InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView,
-		InfoBarSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarExtensions, InfoBarTeletextPlugin,
+		InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin,
 		InfoBarServiceErrorPopupSupport):
 
 	ENABLE_RESUME_SUPPORT = True
@@ -139,7 +134,7 @@ class MoviePlayer(InfoBarShowHide, \
 				InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \
 				InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \
 				InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \
-				InfoBarSummarySupport, InfoBarSubtitleSupport, InfoBarExtensions, \
+				InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \
 				InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport:
 			x.__init__(self)
 
@@ -148,13 +143,22 @@ class MoviePlayer(InfoBarShowHide, \
 
 	def leavePlayer(self):
 		self.is_closing = True
-		self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?"))
-	
+
+		list = []
+		list.append((_("Yes"), "quit"))
+		list.append((_("No"), "continue"))
+		if config.usage.setup_level.index >= 2: # expert+
+			list.append((_("No, but restart from begin"), "restart"))
+		self.session.openWithCallback(self.leavePlayerConfirmed, ChoiceBox, title=_("Stop playing this movie?"), list = list)
+
 	def leavePlayerConfirmed(self, answer):
-		if answer == True:
+		answer = answer and answer[1]
+		if answer == "quit":
 			self.session.nav.playService(self.lastservice)
 			self.close()
-			
+		elif answer == "restart":
+			self.doSeek(0)
+
 	def showMovies(self):
 		ref = self.session.nav.getCurrentlyPlayingServiceReference()
 		self.session.openWithCallback(self.movieSelected, MovieSelection, ref)