X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBar.py;h=a15c7ac1b89b5597b0b314d6cf6f5fc55935d5e7;hp=c2616dab0355e9507dc3b3b9212570b8add90a20;hb=18469e4dedcfe75e8128b489774f79fb790a23da;hpb=a7bc9fd319677465f0561773401ff0390ae3af9c diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index c2616da..a15c7ac 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -1,69 +1,137 @@ -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 ServiceReference import ServiceReference -from Components.Clock import Clock -from Components.ActionMap import ActionMap, HelpableActionMap -from Components.ServicePosition import ServicePosition +from Screen import Screen -from Tools.Notifications import AddNotificationWithCallback +profile("LOAD:enigma") +from enigma import iPlayableService -from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \ - InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \ - InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord, \ +profile("LOAD:InfoBarGenerics") +from Screens.InfoBarGenerics import InfoBarShowHide, \ + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \ + InfoBarEPG, InfoBarSeek, InfoBarInstantRecord, \ InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \ - InfoBarSubserviceSelection, InfoBarTuner - -from Screens.HelpMenu import HelpableScreen, HelpMenu - -from enigma import * - -import time - -class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, - InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, - InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, + InfoBarSubserviceSelection, InfoBarShowMovies, InfoBarTimeshift, \ + InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \ + InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ + InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarServiceErrorPopupSupport, InfoBarJobman + +profile("LOAD:InitBar_Components") +from Components.ActionMap import HelpableActionMap +from Components.config import config +from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase + +profile("LOAD:HelpableScreen") +from Screens.HelpMenu import HelpableScreen + +class InfoBar(InfoBarBase, InfoBarShowHide, + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, + InfoBarInstantRecord, InfoBarAudioSelection, HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, - InfoBarSubserviceSelection, InfoBarTuner): + 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) - 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) + + self.allowPiP = True for x in HelpableScreen, \ - InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \ - 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, InfoBarPiP, InfoBarSubtitleSupport, InfoBarJobman, \ + 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.__event_tracker = ServiceEventTracker(screen=self, eventmap= + { + iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged + }) - self["CurrentTime"] = Clock() + 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): - self.session.open(ChannelSelectionRadio) + if config.usage.e1like_radio_mode.value: + 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(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \ +class MoviePlayer(InfoBarBase, InfoBarShowHide, \ InfoBarMenu, \ - InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications): + InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, + InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, + InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin, + InfoBarServiceErrorPopupSupport, InfoBarExtensions, InfoBarPlugins, InfoBarPiP): + + ENABLE_RESUME_SUPPORT = True + ALLOW_SUSPEND = True def __init__(self, session, service): Screen.__init__(self, session) @@ -73,26 +141,103 @@ class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey "leavePlayer": (self.leavePlayer, _("leave movie player...")) }) - for x in HelpableScreen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, InfoBarNotifications: + self.allowPiP = False + + for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \ + InfoBarBase, InfoBarSeek, InfoBarShowMovies, \ + InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \ + InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \ + InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \ + InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport, InfoBarExtensions, \ + InfoBarPlugins, InfoBarPiP: x.__init__(self) - self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING) - - 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 handleLeave(self, how): + self.is_closing = True + 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.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?")) - + 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()