X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/7f088b2e0ec5051c3b9b9a1942198f0be28f315b..18469e4dedcfe75e8128b489774f79fb790a23da:/lib/python/Screens/InfoBar.py diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index 05c5c98a..a15c7ac1 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -1,17 +1,13 @@ -from Tools.Profile import profile, profile_final +from Tools.Profile import profile + +# workaround for required config entry dependencies. +from Screens.MovieSelection import MovieSelection from Screen import Screen profile("LOAD:enigma") from enigma import iPlayableService -profile("LOAD:ChannelSelectionRadio") -from Screens.ChannelSelection import ChannelSelectionRadio -profile("LOAD:MovieSelection") -from Screens.MovieSelection import MovieSelection -profile("LOAD:ChoiceBox") -from Screens.ChoiceBox import ChoiceBox - profile("LOAD:InfoBarGenerics") from Screens.InfoBarGenerics import InfoBarShowHide, \ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \ @@ -20,7 +16,7 @@ from Screens.InfoBarGenerics import InfoBarShowHide, \ InfoBarSubserviceSelection, InfoBarShowMovies, InfoBarTimeshift, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \ InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ - InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport + InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarServiceErrorPopupSupport, InfoBarJobman profile("LOAD:InitBar_Components") from Components.ActionMap import HelpableActionMap @@ -36,7 +32,7 @@ class InfoBar(InfoBarBase, InfoBarShowHide, HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, - InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport, + InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarServiceErrorPopupSupport, InfoBarJobman, Screen): ALLOW_SUSPEND = True @@ -51,13 +47,15 @@ class InfoBar(InfoBarBase, InfoBarShowHide, "showTv": (self.showTv, _("Show the tv player...")), }, prio=2) + self.allowPiP = True + for x in HelpableScreen, \ InfoBarBase, InfoBarShowHide, \ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \ InfoBarInstantRecord, InfoBarAudioSelection, \ InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \ InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \ - InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarSleepTimer, \ + InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarJobman, \ InfoBarPlugins, InfoBarServiceErrorPopupSupport: x.__init__(self) @@ -111,12 +109,14 @@ class InfoBar(InfoBarBase, InfoBarShowHide, self.showRadioChannelList(True) else: self.rds_display.hide() # in InfoBarRdsDecoder + from Screens.ChannelSelection import ChannelSelectionRadio self.session.openWithCallback(self.ChannelSelectionRadioClosed, ChannelSelectionRadio, self) def ChannelSelectionRadioClosed(self, *arg): self.rds_display.show() # in InfoBarRdsDecoder def showMovies(self): + from Screens.MovieSelection import MovieSelection self.session.openWithCallback(self.movieSelected, MovieSelection) def movieSelected(self, service): @@ -128,7 +128,7 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \ InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin, - InfoBarServiceErrorPopupSupport): + InfoBarServiceErrorPopupSupport, InfoBarExtensions, InfoBarPlugins, InfoBarPiP): ENABLE_RESUME_SUPPORT = True ALLOW_SUSPEND = True @@ -141,46 +141,84 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \ "leavePlayer": (self.leavePlayer, _("leave movie player...")) }) + self.allowPiP = False + for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \ InfoBarBase, InfoBarSeek, InfoBarShowMovies, \ InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \ InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \ - InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport: + InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport, InfoBarExtensions, \ + InfoBarPlugins, InfoBarPiP: x.__init__(self) - self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference() - self.session.nav.playService(service) + self.lastservice = session.nav.getCurrentlyPlayingServiceReference() + session.nav.playService(service) self.returning = False self.onClose.append(self.__onClose) def __onClose(self): self.session.nav.playService(self.lastservice) - def leavePlayer(self): + def handleLeave(self, how): self.is_closing = True - - if config.usage.on_movie_stop.value == "ask": - list = [] - list.append((_("Yes"), "quit")) - if config.usage.setup_level.index >= 2: # expert+ - list.append((_("Yes, returning to movie list"), "movielist")) - list.append((_("No"), "continue")) - if config.usage.setup_level.index >= 2: # expert+ - list.append((_("No, but restart from begin"), "restart")) + if how == "ask": + if config.usage.setup_level.index < 2: # -expert + list = ( + (_("Yes"), "quit"), + (_("No"), "continue") + ) + else: + list = ( + (_("Yes"), "quit"), + (_("Yes, returning to movie list"), "movielist"), + (_("Yes, and delete this movie"), "quitanddelete"), + (_("No"), "continue"), + (_("No, but restart from begin"), "restart") + ) + + from Screens.ChoiceBox import ChoiceBox self.session.openWithCallback(self.leavePlayerConfirmed, ChoiceBox, title=_("Stop playing this movie?"), list = list) else: - self.leavePlayerConfirmed([True, config.usage.on_movie_stop.value]) + self.leavePlayerConfirmed([True, how]) + + def leavePlayer(self): + self.handleLeave(config.usage.on_movie_stop.value) + + def deleteConfirmed(self, answer): + if answer: + self.leavePlayerConfirmed((True, "quitanddeleteconfirmed")) def leavePlayerConfirmed(self, answer): answer = answer and answer[1] - if answer == "quit": - config.movielist.last_videodir.cancel() + + if answer in ("quitanddelete", "quitanddeleteconfirmed"): + ref = self.session.nav.getCurrentlyPlayingServiceReference() + from enigma import eServiceCenter + serviceHandler = eServiceCenter.getInstance() + info = serviceHandler.info(ref) + name = info and info.getName(ref) or _("this recording") + + if answer == "quitanddelete": + from Screens.MessageBox import MessageBox + self.session.openWithCallback(self.deleteConfirmed, MessageBox, _("Do you really want to delete %s?") % name) + return + + elif answer == "quitanddeleteconfirmed": + offline = serviceHandler.offlineOperations(ref) + if offline.deleteFromDisk(0): + from Screens.MessageBox import MessageBox + self.session.openWithCallback(self.close, MessageBox, _("You cannot delete this!"), MessageBox.TYPE_ERROR) + return + + if answer in ("quit", "quitanddeleteconfirmed"): self.close() elif answer == "movielist": ref = self.session.nav.getCurrentlyPlayingServiceReference() self.returning = True + from Screens.MovieSelection import MovieSelection self.session.openWithCallback(self.movieSelected, MovieSelection, ref) + self.session.nav.stopService() elif answer == "restart": self.doSeek(0) @@ -189,21 +227,11 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, \ return if not playing : return - self.is_closing = True - if config.usage.on_movie_eof.value == "ask": - list = [] - list.append((_("Yes"), "quit")) - if config.usage.setup_level.index >= 2: # expert+ - list.append((_("Yes, returning to movie list"), "movielist")) - 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) - else: - self.leavePlayerConfirmed([True, config.usage.on_movie_eof.value]) + self.handleLeave(config.usage.on_movie_eof.value) def showMovies(self): ref = self.session.nav.getCurrentlyPlayingServiceReference() + from Screens.MovieSelection import MovieSelection self.session.openWithCallback(self.movieSelected, MovieSelection, ref) def movieSelected(self, service):