X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/995e780505185fe55afe98b322fa91b55fe7c7a2..c520b7a4598416098eadc08b903f757a02b7fe73:/lib/python/Screens/InfoBar.py diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index a6f4fb19..01b77f3f 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -1,50 +1,45 @@ -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, \ - InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \ + InfoBarEPG, InfoBarSeek, InfoBarInstantRecord, \ InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \ - InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift, \ + InfoBarSubserviceSelection, InfoBarShowMovies, InfoBarTimeshift, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \ InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ - InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport + InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport, InfoBarJobman profile("LOAD:InitBar_Components") -from Components.Sources.Source import ObsoleteSource from Components.ActionMap import HelpableActionMap from Components.config import config -from Components.ServiceEventTracker import ServiceEventTracker +from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase profile("LOAD:HelpableScreen") from Screens.HelpMenu import HelpableScreen -class InfoBar(InfoBarShowHide, +class InfoBar(InfoBarBase, InfoBarShowHide, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, - InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, + InfoBarInstantRecord, InfoBarAudioSelection, HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, - InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek, + InfoBarSubserviceSelection, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, - InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport, + InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport, InfoBarJobman, Screen): ALLOW_SUSPEND = True + instance = None def __init__(self, session): Screen.__init__(self, session) - self["actions"] = HelpableActionMap(self, "InfobarActions", { "showMovies": (self.showMovies, _("Play recorded movies...")), @@ -53,26 +48,29 @@ class InfoBar(InfoBarShowHide, }, prio=2) for x in HelpableScreen, \ - InfoBarShowHide, \ + InfoBarBase, InfoBarShowHide, \ InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \ - InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \ + InfoBarInstantRecord, InfoBarAudioSelection, \ InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \ - InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \ - InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarSleepTimer, \ - InfoBarPlugins, InfoBarServiceErrorPopupSupport: + InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \ + InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarJobman, \ + InfoBarSleepTimer, InfoBarPlugins, InfoBarServiceErrorPopupSupport: x.__init__(self) self.helpList.append((self["actions"], "InfobarActions", [("showMovies", _("view recordings..."))])) self.helpList.append((self["actions"], "InfobarActions", [("showRadio", _("hear radio..."))])) - self["CurrentTime"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01") - self.__event_tracker = ServiceEventTracker(screen=self, eventmap= { iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged }) self.current_begin_time=0 + assert InfoBar.instance is None, "class InfoBar is a singleton class and just one instance of this class is allowed!" + InfoBar.instance = self + + def __onClose(self): + InfoBar.instance = None def __eventInfoChanged(self): if self.execing: @@ -109,21 +107,23 @@ class InfoBar(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): if service is not None: self.session.open(MoviePlayer, service) -class MoviePlayer(InfoBarShowHide, \ +class MoviePlayer(InfoBarBase, InfoBarShowHide, \ InfoBarMenu, \ - InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, + InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport): @@ -140,7 +140,7 @@ class MoviePlayer(InfoBarShowHide, \ }) for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \ - InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \ + InfoBarBase, InfoBarSeek, InfoBarShowMovies, \ InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \ InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \ @@ -150,33 +150,67 @@ class MoviePlayer(InfoBarShowHide, \ self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference() self.session.nav.playService(service) self.returning = False + self.onClose.append(self.__onClose) - def leavePlayer(self): - self.is_closing = True + def __onClose(self): + self.session.nav.playService(self.lastservice) - if config.usage.on_movie_stop.value == "ask": + def handleLeave(self, how): + self.is_closing = True + if how == "ask": list = [] list.append((_("Yes"), "quit")) if config.usage.setup_level.index >= 2: # expert+ list.append((_("Yes, returning to movie list"), "movielist")) + if config.usage.setup_level.index >= 2: # expert+ + list.append((_("Yes, and delete this movie"), "quitanddelete")) list.append((_("No"), "continue")) if config.usage.setup_level.index >= 2: # expert+ list.append((_("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": - self.session.nav.playService(self.lastservice) + + 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 + + if 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"]: config.movielist.last_videodir.cancel() 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.playService(self.lastservice) + self.session.nav.stopService() elif answer == "restart": self.doSeek(0) @@ -185,21 +219,11 @@ class MoviePlayer(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):