X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c0c3ad376851ef7b62fe65fe725f655ba1ae5598..18469e4dedcfe75e8128b489774f79fb790a23da:/lib/python/Screens/InfoBar.py diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index ff8e73d2..a15c7ac1 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -1,45 +1,45 @@ -from Screen import Screen +from Tools.Profile import profile +# workaround for required config entry dependencies. from Screens.MovieSelection import MovieSelection -from Screens.ChannelSelection import ChannelSelectionRadio -from Screens.MessageBox import MessageBox -from Screens.Ci import CiHandler -from ServiceReference import ServiceReference -from Components.Sources.Clock import Clock -from Components.ActionMap import ActionMap, HelpableActionMap -from Components.config import currentConfigSelectionElement, config +from Screen import Screen -from Tools.Notifications import AddNotificationWithCallback +profile("LOAD:enigma") +from enigma import iPlayableService +profile("LOAD:InfoBarGenerics") from Screens.InfoBarGenerics import InfoBarShowHide, \ - InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \ - InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \ + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \ + InfoBarEPG, InfoBarSeek, InfoBarInstantRecord, \ InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \ - InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift, \ + InfoBarSubserviceSelection, InfoBarShowMovies, InfoBarTimeshift, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \ - InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ - InfoBarSubtitleSupport - -from Screens.HelpMenu import HelpableScreen, HelpMenu + InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ + InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarServiceErrorPopupSupport, InfoBarJobman -from enigma import * +profile("LOAD:InitBar_Components") +from Components.ActionMap import HelpableActionMap +from Components.config import config +from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase -import time +profile("LOAD:HelpableScreen") +from Screens.HelpMenu import HelpableScreen -class InfoBar(InfoBarShowHide, - InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, - InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, +class InfoBar(InfoBarBase, InfoBarShowHide, + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, + InfoBarInstantRecord, InfoBarAudioSelection, HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, - InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek, - InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, - InfoBarSubtitleSupport, Screen): + InfoBarSubserviceSelection, InfoBarTimeshift, InfoBarSeek, + InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, + InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarServiceErrorPopupSupport, InfoBarJobman, + Screen): + + ALLOW_SUSPEND = True + instance = None def __init__(self, session): Screen.__init__(self, session) - - CiHandler.setSession(session) - self["actions"] = HelpableActionMap(self, "InfobarActions", { "showMovies": (self.showMovies, _("Play recorded movies...")), @@ -47,75 +47,197 @@ class InfoBar(InfoBarShowHide, "showTv": (self.showTv, _("Show the tv player...")), }, prio=2) + self.allowPiP = True + for x in HelpableScreen, \ - InfoBarShowHide, \ - InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \ - InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \ + InfoBarBase, InfoBarShowHide, \ + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \ + InfoBarInstantRecord, InfoBarAudioSelection, \ InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \ - InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \ - InfoBarTeletextPlugin, InfoBarExtensions, InfoBarSubtitleSupport: + InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \ + InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarJobman, \ + 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"] = Clock() + 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: + service = self.session.nav.getCurrentService() + old_begin_time = self.current_begin_time + info = service and service.info() + ptr = info and info.getEvent(0) + self.current_begin_time = ptr and ptr.getBeginTime() or 0 + if config.usage.show_infobar_on_event_change.value: + if old_begin_time and old_begin_time != self.current_begin_time: + self.doShow() + + def __checkServiceStarted(self): + self.__serviceStarted(True) + self.onExecBegin.remove(self.__checkServiceStarted) + + def serviceStarted(self): #override from InfoBarShowHide + new = self.servicelist.newServicePlayed() + if self.execing: + InfoBarShowHide.serviceStarted(self) + self.current_begin_time=0 + elif not self.__checkServiceStarted in self.onShown and new: + self.onShown.append(self.__checkServiceStarted) + + def __checkServiceStarted(self): + self.serviceStarted() + self.onShown.remove(self.__checkServiceStarted) def showTv(self): self.showTvChannelList(True) def showRadio(self): - if currentConfigSelectionElement(config.usage.e1like_radio_mode) == "yes": + if config.usage.e1like_radio_mode.value: self.showRadioChannelList(True) else: - self.session.open(ChannelSelectionRadio) + 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, - InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport, Screen): + InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin, + InfoBarServiceErrorPopupSupport, InfoBarExtensions, InfoBarPlugins, InfoBarPiP): + + ENABLE_RESUME_SUPPORT = True + ALLOW_SUSPEND = True def __init__(self, session, service): Screen.__init__(self, session) - self.is_closing = False - self["actions"] = HelpableActionMap(self, "MoviePlayerActions", { "leavePlayer": (self.leavePlayer, _("leave movie player...")) }) + self.allowPiP = False + for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \ - InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \ + InfoBarBase, InfoBarSeek, InfoBarShowMovies, \ InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \ - InfoBarSummarySupport, InfoBarTeletextPlugin, InfoBarSubtitleSupport: + InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \ + 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 leavePlayer(self): + def __onClose(self): + self.session.nav.playService(self.lastservice) + + def handleLeave(self, how): self.is_closing = True - self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?")) - + 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, 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): - if answer == True: - self.session.nav.playService(self.lastservice) + answer = answer and answer[1] + + 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) + + def doEofInternal(self, playing): + if not self.execing: + return + if not playing : + return + 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): if service is not None: + self.is_closing = False self.session.nav.playService(service) + self.returning = False + elif self.returning: + self.close()