X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBar.py;h=80b4239e93d7d1865130deb2ee01cce6b69c24d5;hp=2d651dc19716ef80058914a0b4de14843c038d3e;hb=6f73e6abddf4170357c490966d0e1c622eb376f5;hpb=d5dbdb94223dad7deac17ff66759980911cae6b2 diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index 2d651dc..80b4239 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -1,47 +1,50 @@ -from Screen import Screen +from Tools.Profile import profile, profile_final -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 Screen import Screen -from Components.Sources.Clock import Clock -from Components.ActionMap import ActionMap, HelpableActionMap -from Components.config import config +profile("LOAD:enigma") +from enigma import iPlayableService -from Tools.Notifications import AddNotificationWithCallback +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, InfoBarRadioText, \ + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \ InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \ InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \ InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \ - InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ - InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins - -from Screens.HelpMenu import HelpableScreen, HelpMenu + InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ + InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport -from enigma import * +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 -import time +profile("LOAD:HelpableScreen") +from Screens.HelpMenu import HelpableScreen class InfoBar(InfoBarShowHide, - InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRadioText, + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, - InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, Screen): + 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...")), @@ -51,18 +54,52 @@ class InfoBar(InfoBarShowHide, for x in HelpableScreen, \ InfoBarShowHide, \ - InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRadioText, \ + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \ InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \ InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \ InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \ - InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, \ - InfoBarPlugins: + InfoBarTeletextPlugin, InfoBarExtensions, InfoBarPiP, InfoBarSubtitleSupport, 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"] = Clock() + 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 + + 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) @@ -71,7 +108,11 @@ class InfoBar(InfoBarShowHide, if config.usage.e1like_radio_mode.value: self.showRadioChannelList(True) else: - self.session.open(ChannelSelectionRadio) + 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) @@ -84,7 +125,8 @@ class MoviePlayer(InfoBarShowHide, \ InfoBarMenu, \ InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, - InfoBarSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarExtensions, InfoBarTeletextPlugin): + InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin, + InfoBarServiceErrorPopupSupport): ENABLE_RESUME_SUPPORT = True ALLOW_SUSPEND = True @@ -101,8 +143,8 @@ class MoviePlayer(InfoBarShowHide, \ InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \ InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \ InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \ - InfoBarSummarySupport, InfoBarSubtitleSupport, InfoBarExtensions, \ - InfoBarTeletextPlugin: + InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \ + InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport: x.__init__(self) self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference() @@ -110,13 +152,22 @@ class MoviePlayer(InfoBarShowHide, \ def leavePlayer(self): self.is_closing = True - self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?")) - + + 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)