X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBar.py;h=27f75388e2405667a721407708a2078bdf740d98;hp=2b96f1e54f1c4ee5148d23f400305d835394341d;hb=7cdca2a2cfb44ad34a3b36fb589f02b861c411c3;hpb=f604d2c7c5b6d8c004017007028415fe3560208a diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index 2b96f1e..27f7538 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -3,56 +3,110 @@ from Screen import Screen from Screens.MovieSelection import MovieSelection from Screens.ChannelSelection import ChannelSelectionRadio from Screens.MessageBox import MessageBox -from ServiceReference import ServiceReference +from Screens.Ci import CiHandler -from Components.Clock import Clock -from Components.ActionMap import ActionMap, HelpableActionMap -from Components.ServicePosition import ServicePosition - -from Tools.Notifications import AddNotificationWithCallback +from Components.Sources.Source import ObsoleteSource +from Components.ActionMap import HelpableActionMap +from Components.config import config +from Components.ServiceEventTracker import ServiceEventTracker from Screens.InfoBarGenerics import InfoBarShowHide, \ - InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \ + 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 * +from Screens.HelpMenu import HelpableScreen -import time +from enigma import iPlayableService -class InfoBar(Screen, 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) + CiHandler.setSession(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) for x in HelpableScreen, \ - 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["CurrentTime"] = Clock() + self.__event_tracker = ServiceEventTracker(screen=self, eventmap= + { + iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged + }) + + 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 +115,15 @@ class InfoBar(Screen, InfoBarShowHide, InfoBarPowerKey, if service is not None: self.session.open(MoviePlayer, service) -class MoviePlayer(Screen, 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,15 +133,19 @@ class MoviePlayer(Screen, InfoBarShowHide, InfoBarPowerKey, \ "leavePlayer": (self.leavePlayer, _("leave movie player...")) }) - for x in HelpableScreen, 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.is_closing = True self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?")) def leavePlayerConfirmed(self, answer):