X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1f5b1a20e4de369c197de1dae8fcb368e3e10b26..d007f7c3fe25146548e8050757756aa5375de9e9:/lib/python/Screens/InfoBar.py?ds=sidebyside diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index 0ead7221..ba31a83a 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -1,133 +1,164 @@ from Screen import Screen -from ChannelSelection import ChannelSelection -from Components.Clock import Clock -from Components.VolumeBar import VolumeBar -from Components.ActionMap import ActionMap -from Components.Button import Button -from Components.ServiceName import ServiceName -from Components.EventInfo import EventInfo -from Components.ServicePosition import ServicePosition -from Screens.MessageBox import MessageBox from Screens.MovieSelection import MovieSelection +from Screens.ChannelSelection import ChannelSelectionRadio +from Screens.MessageBox import MessageBox +from Screens.Ci import CiHandler + +from Components.Sources.Clock import Clock +from Components.ActionMap import HelpableActionMap +from Components.config import config +from Components.ServiceEventTracker import ServiceEventTracker + +from Tools.Notifications import AddNotificationWithCallback + +from Screens.InfoBarGenerics import InfoBarShowHide, \ + 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, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport + +from Screens.HelpMenu import HelpableScreen, HelpMenu + +from enigma import iPlayableService + +class InfoBar(InfoBarShowHide, + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, + InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, + HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, + InfoBarSubserviceSelection, InfoBarTuner, InfoBarTimeshift, InfoBarSeek, + InfoBarSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, + InfoBarPiP, InfoBarPlugins, InfoBarSubtitleSupport, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport, + Screen): + + ALLOW_SUSPEND = True -from enigma import * - -import time - -# hack alert! -from Menu import MainMenu, mdom - -class InfoBar(Screen): def __init__(self, session): Screen.__init__(self, session) - #instantiate forever - self.servicelist = self.session.instantiateDialog(ChannelSelection) - self.volumeBar = VolumeBar() + CiHandler.setSession(session) - self["actions"] = ActionMap( [ "InfobarActions" ], + self["actions"] = HelpableActionMap(self, "InfobarActions", { - "switchChannelUp": self.switchChannelUp, - "switchChannelDown": self.switchChannelDown, - "mainMenu": self.mainMenu, - "zapUp": self.zapUp, - "zapDown": self.zapDown, - "volumeUp": self.volUp, - "volumeDown": self.volDown, - "volumeMute": self.volMute, - "instantRecord": self.instantRecord, - "hide": self.hide, - "toggleShow": self.toggleShow, - "showMovies": self.showMovies, - "quit": self.quit - }) -# self["okbutton"] = Button("mainMenu", [self.mainMenu]) + "showMovies": (self.showMovies, _("Play recorded movies...")), + "showRadio": (self.showRadio, _("Show the radio player...")), + "showTv": (self.showTv, _("Show the tv player...")), + }, prio=2) - self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING) - # Clock() + for x in HelpableScreen, \ + InfoBarShowHide, \ + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, InfoBarRdsDecoder, \ + InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \ + InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, \ + InfoBarTuner, InfoBarTimeshift, InfoBarSeek, InfoBarSummarySupport, InfoBarTimeshiftState, \ + 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.__event_tracker = ServiceEventTracker(screen=self, eventmap= + { + iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged + }) - self["Volume"] = self.volumeBar - - self["ServiceName"] = ServiceName(self.session.nav) - - self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now) - self["Event_Next"] = EventInfo(self.session.nav, EventInfo.Next) + self.current_begin_time=0 - self["Event_Now_Duration"] = EventInfo(self.session.nav, EventInfo.Now_Duration) - self["Event_Next_Duration"] = EventInfo(self.session.nav, EventInfo.Next_Duration) - - self.recording = None - - def mainMenu(self): - print "loading mainmenu XML..." - menu = mdom.childNodes[0] - assert menu.tagName == "menu", "root element in menu must be 'menu'!" - self.session.open(MainMenu, menu, menu.childNodes) - - def switchChannelUp(self): - self.servicelist.moveUp() - self.session.execDialog(self.servicelist) - - def switchChannelDown(self): - self.servicelist.moveDown() - self.session.execDialog(self.servicelist) - - def hide(self): - self.instance.hide() - - def toggleShow(self): - if self.instance.isVisible(): - self.instance.hide() + 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 config.usage.e1like_radio_mode.value: + self.showRadioChannelList(True) else: - self.instance.show() - - def zapUp(self): - self.servicelist.moveUp() - self.servicelist.zap() + self.rds_display.hide() # in InfoBarRdsDecoder + self.session.openWithCallback(self.ChannelSelectionRadioClosed, ChannelSelectionRadio, self) - def zapDown(self): - self.servicelist.moveDown() - self.servicelist.zap() + def ChannelSelectionRadioClosed(self, *arg): + self.rds_display.show() # in InfoBarRdsDecoder - def volUp(self): - eDVBVolumecontrol.getInstance().volumeUp() - self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume()) + def showMovies(self): + self.session.openWithCallback(self.movieSelected, MovieSelection) - def volDown(self): - eDVBVolumecontrol.getInstance().volumeDown() - self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume()) + def movieSelected(self, service): + if service is not None: + self.session.open(MoviePlayer, service) - def volMute(self): - eDVBVolumecontrol.getInstance().volumeToggleMute() - self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume()) +class MoviePlayer(InfoBarShowHide, \ + InfoBarMenu, \ + InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, + InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, + InfoBarSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin, + InfoBarServiceErrorPopupSupport): - def quit(self): - quitMainloop() + ENABLE_RESUME_SUPPORT = True + ALLOW_SUSPEND = True + + def __init__(self, session, service): + Screen.__init__(self, session) - def instantRecord(self): - self.session.open(MessageBox, "this would be an instant recording! do you really know what you're doing?!") - return + self["actions"] = HelpableActionMap(self, "MoviePlayerActions", + { + "leavePlayer": (self.leavePlayer, _("leave movie player...")) + }) + + for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \ + InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \ + InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \ + InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \ + InfoBarSummarySupport, InfoBarSubtitleSupport, \ + InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport: + x.__init__(self) + + 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?")) - if self.recording != None: - print "remove entry" - self.session.nav.RecordTimer.removeEntry(self.recording) - self.recording = None - else: - serviceref = self.session.nav.getCurrentlyPlayingServiceReference() + def leavePlayerConfirmed(self, answer): + if answer == True: + self.session.nav.playService(self.lastservice) + self.close() - # try to get event info - epg = None - service = self.session.nav.getCurrentService() - if service != None: - info = iServiceInformationPtr() - if not service.info(info): - ev = eServiceEventPtr() - if info.getEvent(ev, 0) == 0: - epg = ev - # fix me, description. - self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record") - def showMovies(self): - self.session.open(MovieSelection) + ref = self.session.nav.getCurrentlyPlayingServiceReference() + self.session.openWithCallback(self.movieSelected, MovieSelection, ref) + def movieSelected(self, service): + if service is not None: + self.session.nav.playService(service)