X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1c046496d9b60774adb3bfec72851b82c3b85167..5274c69abf4cb2b99ab9d92ac0081c0ec49bd2e4:/lib/python/Screens/InfoBar.py diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index f084c767..228ca4ef 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -1,33 +1,46 @@ +from Tools.Profile import profile, profile_final + from Screen import Screen +profile("LOAD:MovieSelection") from Screens.MovieSelection import MovieSelection +profile("LOAD:ChannelSelectionRadio") from Screens.ChannelSelection import ChannelSelectionRadio -from Screens.MessageBox import MessageBox -from ServiceReference import ServiceReference - -from Components.Clock import Clock -from Components.ActionMap import ActionMap, HelpableActionMap -from Components.ServicePosition import ServicePosition - -from Tools.Notifications import AddNotificationWithCallback - -from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \ - InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \ +profile("LOAD:ChoiceBox") +from Screens.ChoiceBox import ChoiceBox + +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 + +profile("LOAD:InfoBarGenerics") +from Screens.InfoBarGenerics import InfoBarShowHide, \ + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \ InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \ InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \ - InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift - -from Screens.HelpMenu import HelpableScreen, HelpMenu + InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift, \ + InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \ + InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ + InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport -from enigma import * +profile("LOAD:HelpableScreen") +from Screens.HelpMenu import HelpableScreen -import time +profile("LOAD:enigma") +from enigma import iPlayableService -class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, - InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, +class InfoBar(InfoBarShowHide, + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, - InfoBarSubserviceSelection, InfoBarTuner): + InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek, + InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, + InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport, + Screen): + + ALLOW_SUSPEND = True def __init__(self, session): Screen.__init__(self, session) @@ -35,24 +48,71 @@ class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, self["actions"] = HelpableActionMap(self, "InfobarActions", { "showMovies": (self.showMovies, _("Play recorded movies...")), - "showRadio": (self.showRadio, _("Show the radio player...")) - }) + "showRadio": (self.showRadio, _("Show the radio player...")), + "showTv": (self.showTv, _("Show the tv player...")), + }, prio=2) for x in HelpableScreen, \ - InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \ - InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \ + InfoBarShowHide, \ + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \ InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \ InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \ - InfoBarTuner: + InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \ + InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, InfoBarSleepTimer, \ + InfoBarPlugins, InfoBarServiceErrorPopupSupport: 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"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01") + + self.__event_tracker = ServiceEventTracker(screen=self, eventmap= + { + iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged + }) - self["CurrentTime"] = Clock() + self.current_begin_time=0 + + 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): - self.session.open(ChannelSelectionRadio) + if config.usage.e1like_radio_mode.value: + self.showRadioChannelList(True) + else: + self.rds_display.hide() # in InfoBarRdsDecoder + self.session.openWithCallback(self.ChannelSelectionRadioClosed, ChannelSelectionRadio, self) + + def ChannelSelectionRadioClosed(self, *arg): + self.rds_display.show() # in InfoBarRdsDecoder def showMovies(self): self.session.openWithCallback(self.movieSelected, MovieSelection) @@ -61,9 +121,15 @@ class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, if service is not None: self.session.open(MoviePlayer, service) -class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \ +class MoviePlayer(InfoBarShowHide, \ InfoBarMenu, \ - InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications): + InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, + InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, + InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin, + InfoBarServiceErrorPopupSupport): + + ENABLE_RESUME_SUPPORT = True + ALLOW_SUSPEND = True def __init__(self, session, service): Screen.__init__(self, session) @@ -73,22 +139,35 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey "leavePlayer": (self.leavePlayer, _("leave movie player...")) }) - for x in HelpableScreen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, InfoBarNotifications: + for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \ + InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \ + InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \ + InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \ + InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \ + InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport: x.__init__(self) - self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING) - self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference() self.session.nav.playService(service) def leavePlayer(self): - self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?")) - + self.is_closing = True + + 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)