X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a8c0bc898071ff61073ce7d798bccd3972ecfefe..eb47577c32b49a28eb7986b0fd86ed0d76207150:/lib/python/Screens/InfoBar.py diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index 9702eed7..aaa3deba 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -1,194 +1,91 @@ from Screen import Screen -from ChannelSelection import ChannelSelection + +from Screens.MovieSelection import MovieSelection +from Screens.MessageBox import MessageBox +from ServiceReference import ServiceReference + from Components.Clock import Clock -from Components.ActionMap import ActionMap -from Components.Button import Button -from Components.ServiceName import ServiceName -from Components.EventInfo import EventInfo +from Components.ActionMap import ActionMap, HelpableActionMap from Components.ServicePosition import ServicePosition -from Components.config import configfile -from Screens.MessageBox import MessageBox -from Screens.MovieSelection import MovieSelection -from Screens.Volume import Volume +from Tools.Notifications import AddNotificationWithCallback + +from Screens.InfoBarGenerics import InfoBarVolumeControl, InfoBarShowHide, \ + InfoBarPowerKey, InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, \ + InfoBarEPG, InfoBarEvent, InfoBarServiceName, InfoBarPVR, InfoBarInstantRecord, \ + InfoBarAudioSelection, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, \ + InfoBarSubserviceSelection, InfoBarTuner + +from Screens.HelpMenu import HelpableScreen, HelpMenu from enigma import * import time -# hack alert! -from Menu import MainMenu, mdom +class InfoBar(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, + InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, + HelpableScreen, InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, + InfoBarSubserviceSelection, InfoBarTuner): -class InfoBar(Screen): - STATE_HIDDEN = 0 - STATE_HIDING = 1 - STATE_SHOWING = 2 - STATE_SHOWN = 3 - 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.hideTimer = eTimer() - self.hideTimer.timeout.get().append(self.doTimerHide) - #self.hideTimer.start(1000) - - - 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 + "showMovies": (self.showMovies, _("Play recorded movies...")) }) -# self["okbutton"] = Button("mainMenu", [self.mainMenu]) + for x in HelpableScreen, \ + InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \ + InfoBarNumberZap, InfoBarChannelSelection, InfoBarMenu, InfoBarEPG, \ + InfoBarEvent, InfoBarServiceName, InfoBarInstantRecord, InfoBarAudioSelection, \ + InfoBarAdditionalInfo, InfoBarNotifications, InfoBarDish, InfoBarSubserviceSelection, InfoBarTuner: + x.__init__(self) + + self.helpList.append((self["actions"], "InfobarActions", [("showMovies", "Watch a Movie...")])) + 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) + def showMovies(self): + self.session.openWithCallback(self.movieSelected, MovieSelection) + + def movieSelected(self, service): + if service is not None: + self.session.open(MoviePlayer, service) - self["Event_Now_Duration"] = EventInfo(self.session.nav, EventInfo.Now_Duration) - self["Event_Next_Duration"] = EventInfo(self.session.nav, EventInfo.Next_Duration) +class MoviePlayer(Screen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, \ + InfoBarMenu, \ + InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications): - self.recording = None + def __init__(self, session, service): + Screen.__init__(self, session) - 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 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 - else: - self.instance.show() -# self.startShow() - self.state = self.STATE_SHOWN - #TODO: make it customizable - self.hideTimer.start(5000) - - def zapUp(self): - self.servicelist.moveUp() - self.servicelist.zap() - - def zapDown(self): - self.servicelist.moveDown() - self.servicelist.zap() - - def volUp(self): - eDVBVolumecontrol.getInstance().volumeUp() - self.volumeDialog.instance.show() - # FIXME: help wanted :) - self.volumeDialog.instance.setValue(eDVBVolumecontrol.getInstance().getVolume()) - self.hideVolTimer = eTimer() - self.hideVolTimer.timeout.get().append(self.volHide) - self.hideVolTimer.start(3000) - - def volDown(self): - eDVBVolumecontrol.getInstance().volumeDown() - self.volumeDialog.instance.show() - # FIXME: help wanted :) - self.volumeDialog.setValue(eDVBVolumecontrol.getInstance().getVolume()) - self.hideVolTimer = eTimer() - self.hideVolTimer.timeout.get().append(self.volHide) - self.hideVolTimer.start(3000) + self["actions"] = HelpableActionMap(self, "MoviePlayerActions", + { + "leavePlayer": (self.leavePlayer, _("leave movie player...")) + }) - def volHide(self): - self.volumeDialog.instance.hide() - - 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 + for x in HelpableScreen, InfoBarVolumeControl, InfoBarShowHide, InfoBarPowerKey, InfoBarMenu, InfoBarServiceName, InfoBarPVR, InfoBarAudioSelection, InfoBarNotifications: + x.__init__(self) - def volMute(self): - eDVBVolumecontrol.getInstance().volumeToggleMute() - self.volumeBar.setValue(eDVBVolumecontrol.getInstance().getVolume()) + self["CurrentTime"] = ServicePosition(self.session.nav, ServicePosition.TYPE_REMAINING) + + self.lastservice = self.session.nav.getCurrentlyPlayingServiceReference() + self.session.nav.playService(service) - def quit(self): - configfile.save() - quitMainloop() - - def stopCurrentRecording(self): - print "remove entry" - self.session.nav.RecordTimer.removeEntry(self.recording) - self.recording = None + def leavePlayer(self): + self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing this movie?")) - def startInstantRecording(self): - 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 - try: - service = self.session.nav.getCurrentService() - info = service.info() - ev = info.getEvent(0) - epg = ev - except: - pass - - # 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 - - 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?") - 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)