X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FScreens%2FInfoBar.py;h=ab40838d53d13921f516f4294664007ffad77eb7;hp=5eb5ab10f2d075b91ae6ac55a98851b8af63cabb;hb=d1e450f95a9b79b144a00dcf0f9356ff6cb9bfb2;hpb=a4da9cccc2575c4bf299bde9594dad3e049ddf6a diff --git a/lib/python/Screens/InfoBar.py b/lib/python/Screens/InfoBar.py index 5eb5ab1..ab40838 100644 --- a/lib/python/Screens/InfoBar.py +++ b/lib/python/Screens/InfoBar.py @@ -1,80 +1,127 @@ from Screen import Screen -from ChannelSelection import ChannelSelection -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 enigma import * +from Screens.MovieSelection import MovieSelection +from Screens.ChannelSelection import ChannelSelectionRadio +from Screens.MessageBox import MessageBox +from Screens.Ci import CiHandler -import time +from Components.Sources.Clock import Clock +from Components.ActionMap import HelpableActionMap +from Components.config import config -# hack alert! -from Menu import * +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 + +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 -class InfoBar(Screen): def __init__(self, session): Screen.__init__(self, session) - #instantiate forever - self.servicelist = self.session.instantiateDialog(ChannelSelection) - - self["actions"] = ActionMap( [ "InfobarActions" ], + CiHandler.setSession(session) + + self["actions"] = HelpableActionMap(self, "InfobarActions", { - "switchChannel": self.switchChannel, - "mainMenu": self.mainMenu, - "zapUp": self.zapUp, - "zapDown": self.zapDown, - "instantRecord": self.instantRecord - }) - 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) + 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["ServiceName"] = ServiceName(self.session.nav) - - self["Event_Now"] = EventInfo(self.session.nav, EventInfo.Now) - self["Event_Next"] = EventInfo(self.session.nav, EventInfo.Next) - 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(Menu, menu, menu.childNodes) + def showTv(self): + self.showTvChannelList(True) - def switchChannel(self): - self.session.execDialog(self.servicelist) + def showRadio(self): + 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) + + def movieSelected(self, service): + if service is not None: + self.session.open(MoviePlayer, service) - def zapUp(self): - self.servicelist.zapUp() +class MoviePlayer(InfoBarShowHide, \ + InfoBarMenu, \ + InfoBarServiceName, InfoBarSeek, InfoBarShowMovies, InfoBarAudioSelection, HelpableScreen, InfoBarNotifications, + InfoBarServiceNotifications, InfoBarPVRState, InfoBarCueSheetSupport, InfoBarSimpleEventView, + InfoBarSummarySupport, InfoBarSubtitleSupport, Screen, InfoBarExtensions, InfoBarTeletextPlugin, + InfoBarServiceErrorPopupSupport): - def zapDown(self): - self.servicelist.zapDown() + ENABLE_RESUME_SUPPORT = True + ALLOW_SUSPEND = True - def instantRecord(self): - if self.recording != None: - print "remove entry" - self.session.nav.RecordTimer.removeEntry(self.recording) - self.recording = None - else: - serviceref = self.session.nav.getCurrentlyPlayingServiceReference() + def __init__(self, session, service): + Screen.__init__(self, session) + + 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, InfoBarExtensions, \ + 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?")) + + 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 - - self.recording = self.session.nav.recordWithTimer(time.time(), time.time() + 30, serviceref, epg) - print "got entry: %s" % (str(self.recording)) + def showMovies(self): + 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)