X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5697c8db5f4c96eb1658e708911bf904eae7c268..2eb13f628b3d0780556b5898d8dbee838baf5e31:/lib/python/Screens/InfoBar.py?ds=sidebyside diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index 516d44c5..1e8f761f 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -1,263 +1,168 @@ from Screen import Screen -from EpgSelection import EPGSelection -from ChannelSelection import ChannelSelection -from Components.Clock import Clock -from Components.ActionMap import ActionMap -from Components.ActionMap import NumberActionMap -from Components.Button import Button -from Components.ServiceName import ServiceName -from Components.EventInfo import EventInfo -from Components.ServicePosition import ServicePosition -from Components.config import configfile -from Components.Label import Label -from Screens.MessageBox import MessageBox from Screens.MovieSelection import MovieSelection -from Screens.Volume import Volume -from Screens.Mute import Mute - -from enigma import * - -import time - -# hack alert! -from Menu import MainMenu, mdom - -class NumberZap(Screen): - def quit(self): - self.Timer.stop() - self.close() - - def keyOK(self): - self.Timer.stop() - print "do the action here" - self.close() - - def keyNumberGlobal(self, number): - self.Timer.start(3000) #reset timer - self.field = self.field + str(number) - self["number"].setText(self.field) - - def __init__(self, session, number): - Screen.__init__(self, session) - self.field = str(number) - - self["number"] = Label(self.field) - - self["actions"] = NumberActionMap( [ "SetupActions" ], - { - "cancel": self.quit, - "ok": self.keyOK, - "1": self.keyNumberGlobal, - "2": self.keyNumberGlobal, - "3": self.keyNumberGlobal, - "4": self.keyNumberGlobal, - "5": self.keyNumberGlobal, - "6": self.keyNumberGlobal, - "7": self.keyNumberGlobal, - "8": self.keyNumberGlobal, - "9": self.keyNumberGlobal, - "0": self.keyNumberGlobal - }) - - self.Timer = eTimer() - self.Timer.timeout.get().append(self.keyOK) - self.Timer.start(3000) - - -class InfoBar(Screen): - STATE_HIDDEN = 0 - STATE_HIDING = 1 - STATE_SHOWING = 2 - STATE_SHOWN = 3 +from Screens.ChannelSelection import ChannelSelectionRadio +from Screens.ChoiceBox import ChoiceBox + +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, \ + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarRdsDecoder, \ + InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarSeek, InfoBarInstantRecord, \ + InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \ + InfoBarSubserviceSelection, InfoBarTuner, InfoBarShowMovies, InfoBarTimeshift, \ + InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, \ + InfoBarSummarySupport, InfoBarMoviePlayerSummarySupport, InfoBarTimeshiftState, InfoBarTeletextPlugin, InfoBarExtensions, \ + InfoBarSubtitleSupport, InfoBarPiP, InfoBarPlugins, InfoBarSleepTimer, InfoBarServiceErrorPopupSupport + +from Screens.HelpMenu import HelpableScreen + +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 + def __init__(self, session): Screen.__init__(self, session) - #instantiate forever - self.servicelist = self.session.instantiateDialog(ChannelSelection) - - self.state = self.STATE_HIDDEN - - self.volumeDialog = self.session.instantiateDialog(Volume) - self.muteDialog = self.session.instantiateDialog(Mute) - - self.hideTimer = eTimer() - self.hideTimer.timeout.get().append(self.doTimerHide) - #self.hideTimer.start(1000) + self["actions"] = HelpableActionMap(self, "InfobarActions", + { + "showMovies": (self.showMovies, _("Play recorded movies...")), + "showRadio": (self.showRadio, _("Show the radio player...")), + "showTv": (self.showTv, _("Show the tv player...")), + }, prio=2) - self.hideVolTimer = eTimer() - self.hideVolTimer.timeout.get().append(self.volHide) - - #self["actions"] = ActionMap( [ "InfobarActions" ], - self["actions"] = NumberActionMap( [ "InfobarActions" ], + 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"] = ObsoleteSource(new_source = "global.CurrentTime", removal_date = "2008-01") + + self.__event_tracker = ServiceEventTracker(screen=self, eventmap= { - "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, - "1": self.keyNumberGlobal, - "2": self.keyNumberGlobal, - "3": self.keyNumberGlobal, - "4": self.keyNumberGlobal, - "5": self.keyNumberGlobal, - "6": self.keyNumberGlobal, - "7": self.keyNumberGlobal, - "8": self.keyNumberGlobal, - "9": self.keyNumberGlobal, - "0": self.keyNumberGlobal, - "showEPGList": self.showEPGList + iPlayableService.evUpdatedEventInfo: self.__eventInfoChanged }) -# self["okbutton"] = Button("mainMenu", [self.mainMenu]) - - self["CurrentTime"] = Clock() - # ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING) - # Clock() - 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 - - self.pos = 0 - - 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 keyNumberGlobal(self, number): - print "You pressed number " + str(number) - self.session.open(NumberZap, number) - - 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 doTimerHide(self): - if self.state == self.STATE_SHOWN: - self.instance.hide() - self.state = self.STATE_HIDDEN - - def toggleShow(self): - if self.state == self.STATE_SHOWN: - self.instance.hide() - #pls check animation support, sorry -# self.startHide() - self.state = self.STATE_HIDDEN + 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() -# self.startShow() - self.state = self.STATE_SHOWN - #TODO: make it customizable - self.hideTimer.start(5000) + self.rds_display.hide() # in InfoBarRdsDecoder + self.session.openWithCallback(self.ChannelSelectionRadioClosed, ChannelSelectionRadio, self) - def zapUp(self): - self.servicelist.moveUp() - self.servicelist.zap() + def ChannelSelectionRadioClosed(self, *arg): + self.rds_display.show() # in InfoBarRdsDecoder - def zapDown(self): - self.servicelist.moveDown() - self.servicelist.zap() - - def volUp(self): - eDVBVolumecontrol.getInstance().volumeUp() - self.volumeDialog.instance.show() - self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) - self.hideVolTimer.start(3000) + def showMovies(self): + self.session.openWithCallback(self.movieSelected, MovieSelection) - def volDown(self): - eDVBVolumecontrol.getInstance().volumeDown() - self.volumeDialog.instance.show() - self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) - self.hideVolTimer.start(3000) - - def volHide(self): - self.volumeDialog.instance.hide() + def movieSelected(self, service): + if service is not None: + self.session.open(MoviePlayer, service) - def startShow(self): - self.instance.m_animation.startMoveAnimation(ePoint(0, 600), ePoint(0, 380), 100) - self.state = self.STATE_SHOWN - - def startHide(self): - self.instance.m_animation.startMoveAnimation(ePoint(0, 380), ePoint(0, 600), 100) - self.state = self.STATE_HIDDEN +class MoviePlayer(InfoBarShowHide, \ + InfoBarMenu, \ + InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, + InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, + InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarTeletextPlugin, + InfoBarServiceErrorPopupSupport): - def volMute(self): - eDVBVolumecontrol.getInstance().volumeToggleMute() - self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) + ENABLE_RESUME_SUPPORT = True + ALLOW_SUSPEND = True - if (eDVBVolumecontrol.getInstance().isMuted()): - self.muteDialog.instance.show() - else: - self.muteDialog.instance.hide() - - def showEPGList(self): -# TODO hier irgendwie EPGSelection benutzen und setRoot benutzen um nen service zu uebergeben -# self.session.nav.getCurrentlyPlayingServiceReference() sollte das wohl sein - self.session.open(EPGSelection) - - def quit(self): - configfile.save() - quitMainloop() - - def stopCurrentRecording(self): - print "remove entry" - self.session.nav.RecordTimer.removeEntry(self.recording) - self.recording = None - - def startInstantRecording(self): - serviceref = self.session.nav.getCurrentlyPlayingServiceReference() - - # try to get event info - epg = None - try: - service = self.session.nav.getCurrentService() - info = service.info() - ev = info.getEvent(0) - epg = ev - except: - pass + def __init__(self, session, service): + Screen.__init__(self, session) - # fix me, description. - self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg, "instant record") - - def recordQuestionCallback(self, answer): - if answer == False: - return + self["actions"] = HelpableActionMap(self, "MoviePlayerActions", + { + "leavePlayer": (self.leavePlayer, _("leave movie player...")) + }) - if self.recording != None: - self.stopCurrentRecording() - else: - self.startInstantRecording() - - def instantRecord(self): - if self.recording != None: - self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Do you want to stop the current\n(instant) recording?") - else: - self.session.openWithCallback(self.recordQuestionCallback, MessageBox, "Start recording?") + for x in HelpableScreen, InfoBarShowHide, InfoBarMenu, \ + InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, \ + InfoBarAudioSelection, InfoBarNotifications, InfoBarSimpleEventView, \ + InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, \ + InfoBarMoviePlayerSummarySupport, InfoBarSubtitleSupport, \ + InfoBarTeletextPlugin, InfoBarServiceErrorPopupSupport: + x.__init__(self) + + self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference() + self.session.nav.playService(service) + + def leavePlayer(self): + 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): + 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): - 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)