X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/e69fde464582ffb74d03510f7ba45542af17d730..d7b1e65daf11504f1d3bb270d574d9022c45d97f:/lib/python/Screens/InfoBarGenerics.py diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index ca697ae8..dbfe20cc 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -9,12 +9,8 @@ from Components.Label import Label from Components.Pixmap import Pixmap from Components.PluginComponent import plugins from Components.ServiceEventTracker import ServiceEventTracker -from Components.Sources.CurrentService import CurrentService -from Components.Sources.EventInfo import EventInfo -from Components.Sources.FrontendStatus import FrontendStatus +from Components.Sources.Source import ObsoleteSource from Components.Sources.Boolean import Boolean -from Components.Sources.Clock import Clock -from Components.TimerList import TimerEntryComponent from Components.config import config, ConfigBoolean, ConfigClock from EpgSelection import EPGSelection from Plugins.Plugin import PluginDescriptor @@ -50,7 +46,6 @@ from Menu import MainMenu, mdom class InfoBarDish: def __init__(self): self.dishDialog = self.session.instantiateDialog(Dish) - self.onLayoutFinish.append(self.dishDialog.show) class InfoBarShowHide: """ InfoBar show/hide control, accepts toggleShow and hide actions, might start @@ -159,7 +154,7 @@ class NumberZap(Screen): self["number"] = Label(self.field) - self["actions"] = NumberActionMap( [ "SetupActions" ], + self["actions"] = NumberActionMap( [ "SetupActions" ], { "cancel": self.quit, "ok": self.keyOK, @@ -199,9 +194,13 @@ class InfoBarNumberZap: def keyNumberGlobal(self, number): # print "You pressed number " + str(number) if number == 0: - self.servicelist.recallPrevService() + if isinstance(self, InfoBarPiP) and self.pipHandles0Action(): + self.pipDoHandle0Action() + else: + self.servicelist.recallPrevService() else: - self.session.openWithCallback(self.numberEntered, NumberZap, number) + if self.has_key("TimeshiftActions") and not self.timeshift_enabled: + self.session.openWithCallback(self.numberEntered, NumberZap, number) def numberEntered(self, retval): # print self.servicelist @@ -249,7 +248,7 @@ class InfoBarNumberZap: config.misc.initialchannelselection = ConfigBoolean(default = True) class InfoBarChannelSelection: - """ ChannelSelection - handles the channelSelection dialog and the initial + """ ChannelSelection - handles the channelSelection dialog and the initial channelChange actions which open the channelSelection dialog """ def __init__(self): #instantiate forever @@ -341,7 +340,7 @@ class InfoBarChannelSelection: class InfoBarMenu: """ Handles a menu action, to open the (main) menu """ def __init__(self): - self["MenuActions"] = HelpableActionMap(self, "InfobarMenuActions", + self["MenuActions"] = HelpableActionMap(self, "InfobarMenuActions", { "mainMenu": (self.mainMenu, _("Enter main menu...")), }) @@ -402,7 +401,7 @@ class InfoBarEPG: self.dlg_stack = [ ] self.bouquetSel = None self.eventView = None - self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions", + self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions", { "showEventInfo": (self.openEventView, _("show EPG...")), "showSingleServiceEPG": (self.openSingleServiceEPG, _("show single service EPG...")), @@ -483,7 +482,7 @@ class InfoBarEPG: self.dlg_stack.append(self.bouquetSel) else: self.bouquetSel = self.session.open(BouquetSelector, bouquets, self.openBouquetEPG, enableWrapAround=True) - elif cnt == 1: + elif cnt == 1: self.openBouquetEPG(bouquets[0][1], withCallback) def openSingleServiceEPG(self): @@ -542,13 +541,13 @@ class InfoBarEPG: class InfoBarTuner: """provides a snr/agc/ber display""" def __init__(self): - self["FrontendStatus"] = FrontendStatus(service_source = self.session.nav.getCurrentService) + self["FrontendStatus"] = ObsoleteSource(new_source = "session.FrontendStatus", removal_date = "2008-01") class InfoBarEvent: """provides a current/next event info display""" def __init__(self): - self["Event_Now"] = EventInfo(self.session.nav, EventInfo.NOW) - self["Event_Next"] = EventInfo(self.session.nav, EventInfo.NEXT) + self["Event_Now"] = ObsoleteSource(new_source = "session.Event_Now", removal_date = "2008-01") + self["Event_Next"] = ObsoleteSource(new_source = "session.Event_Next", removal_date = "2008-01") class InfoBarRdsDecoder: """provides RDS and Rass support/display""" @@ -600,7 +599,7 @@ class InfoBarRdsDecoder: class InfoBarServiceName: def __init__(self): - self["CurrentService"] = CurrentService(self.session.nav) + self["CurrentService"] = ObsoleteSource(new_source = "session.CurrentService", removal_date = "2008-01") class InfoBarSeek: """handles actions like seeking, pause""" @@ -611,12 +610,16 @@ class InfoBarSeek: SEEK_STATE_FF_2X = (0, 2, 0, ">> 2x") SEEK_STATE_FF_4X = (0, 4, 0, ">> 4x") SEEK_STATE_FF_8X = (0, 8, 0, ">> 8x") + SEEK_STATE_FF_16X = (0, 16, 0, ">> 16x") SEEK_STATE_FF_32X = (0, 32, 0, ">> 32x") + SEEK_STATE_FF_48X = (0, 48, 0, ">> 48x") SEEK_STATE_FF_64X = (0, 64, 0, ">> 64x") SEEK_STATE_FF_128X = (0, 128, 0, ">> 128x") + SEEK_STATE_BACK_8X = (0, -8, 0, "<< 8x") SEEK_STATE_BACK_16X = (0, -16, 0, "<< 16x") SEEK_STATE_BACK_32X = (0, -32, 0, "<< 32x") + SEEK_STATE_BACK_48X = (0, -48, 0, "<< 48x") SEEK_STATE_BACK_64X = (0, -64, 0, "<< 64x") SEEK_STATE_BACK_128X = (0, -128, 0, "<< 128x") @@ -646,12 +649,13 @@ class InfoBarSeek: if action[:5] == "seek:": time = int(action[5:]) self.screen.seekRelative(time * 90000) - self.screen.showAfterSeek() + if config.usage.show_infobar_on_skip.value: + self.screen.showAfterSeek() return 1 else: return HelpableActionMap.action(self, contexts, action) - self["SeekActions"] = InfoBarSeekActionMap(self, actionmap, + self["SeekActions"] = InfoBarSeekActionMap(self, actionmap, { "playpauseService": self.playpauseService, "pauseService": (self.pauseService, _("pause")), @@ -661,7 +665,7 @@ class InfoBarSeek: "seekFwdManual": (self.seekFwdManual, _("skip forward (enter time)")), "seekBack": (self.seekBack, _("skip backward")), "seekBackManual": (self.seekBackManual, _("skip backward (enter time)")), - + "seekFwdDef": (self.seekFwdDef, _("skip forward (self defined)")), "seekBackDef": (self.seekBackDef, _("skip backward (self defined)")) }, prio=-1) @@ -670,7 +674,7 @@ class InfoBarSeek: self["SeekActions"].setEnabled(False) self.seekstate = self.SEEK_STATE_PLAY - + self.seek_flag = True self.onPlayStateChanged = [ ] @@ -792,13 +796,17 @@ class InfoBarSeek: self.SEEK_STATE_PAUSE: self.SEEK_STATE_SM_EIGHTH, self.SEEK_STATE_FF_2X: self.SEEK_STATE_FF_4X, self.SEEK_STATE_FF_4X: self.SEEK_STATE_FF_8X, - self.SEEK_STATE_FF_8X: self.SEEK_STATE_FF_32X, - self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_64X, + self.SEEK_STATE_FF_8X: self.SEEK_STATE_FF_16X, + self.SEEK_STATE_FF_16X: self.SEEK_STATE_FF_32X, + self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_48X, + self.SEEK_STATE_FF_48X: self.SEEK_STATE_FF_64X, self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_128X, self.SEEK_STATE_FF_128X: self.SEEK_STATE_FF_128X, - self.SEEK_STATE_BACK_16X: self.SEEK_STATE_PLAY, + self.SEEK_STATE_BACK_8X: self.SEEK_STATE_PLAY, + self.SEEK_STATE_BACK_16X: self.SEEK_STATE_BACK_8X, self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_16X, - self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_32X, + self.SEEK_STATE_BACK_48X: self.SEEK_STATE_BACK_32X, + self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_48X, self.SEEK_STATE_BACK_128X: self.SEEK_STATE_BACK_64X, self.SEEK_STATE_SM_HALF: self.SEEK_STATE_SM_HALF, self.SEEK_STATE_SM_QUARTER: self.SEEK_STATE_SM_HALF, @@ -809,22 +817,26 @@ class InfoBarSeek: def seekBack(self): lookup = { - self.SEEK_STATE_PLAY: self.SEEK_STATE_BACK_16X, + self.SEEK_STATE_PLAY: self.SEEK_STATE_BACK_8X, self.SEEK_STATE_PAUSE: self.SEEK_STATE_PAUSE, self.SEEK_STATE_FF_2X: self.SEEK_STATE_PLAY, self.SEEK_STATE_FF_4X: self.SEEK_STATE_FF_2X, self.SEEK_STATE_FF_8X: self.SEEK_STATE_FF_4X, - self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_8X, - self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_32X, + self.SEEK_STATE_FF_16X: self.SEEK_STATE_FF_8X, + self.SEEK_STATE_FF_32X: self.SEEK_STATE_FF_16X, + self.SEEK_STATE_FF_48X: self.SEEK_STATE_FF_32X, + self.SEEK_STATE_FF_64X: self.SEEK_STATE_FF_48X, self.SEEK_STATE_FF_128X: self.SEEK_STATE_FF_64X, + self.SEEK_STATE_BACK_8X: self.SEEK_STATE_BACK_16X, self.SEEK_STATE_BACK_16X: self.SEEK_STATE_BACK_32X, - self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_64X, + self.SEEK_STATE_BACK_32X: self.SEEK_STATE_BACK_48X, + self.SEEK_STATE_BACK_48X: self.SEEK_STATE_BACK_64X, self.SEEK_STATE_BACK_64X: self.SEEK_STATE_BACK_128X, self.SEEK_STATE_BACK_128X: self.SEEK_STATE_BACK_128X, self.SEEK_STATE_SM_HALF: self.SEEK_STATE_SM_QUARTER, self.SEEK_STATE_SM_QUARTER: self.SEEK_STATE_SM_EIGHTH, self.SEEK_STATE_SM_EIGHTH: self.SEEK_STATE_PAUSE, - self.SEEK_STATE_EOF: self.SEEK_STATE_BACK_16X, + self.SEEK_STATE_EOF: self.SEEK_STATE_BACK_8X, } self.setSeekState(lookup[self.seekstate]) @@ -840,7 +852,7 @@ class InfoBarSeek: seekable = self.getSeek() if seekable is not None: seekable.seekRelative(1, seconds * 90000) - + def seekBackDef(self): self.seek_flag = False seconds = config.usage.self_defined_seek.value @@ -848,7 +860,7 @@ class InfoBarSeek: seekable = self.getSeek() if seekable is not None: seekable.seekRelative(1, 0 - seconds * 90000) - + def seekFwdManual(self): self.session.openWithCallback(self.fwdSeekTo, MinuteInput) @@ -869,7 +881,7 @@ class InfoBarSeek: def checkSkipShowHideLock(self): wantlock = self.seekstate != self.SEEK_STATE_PLAY - if config.usage.show_infobar_on_zap.value: + if config.usage.show_infobar_on_skip.value: if self.lockedBecauseOfSkipping and not wantlock: self.unlockShow() self.lockedBecauseOfSkipping = False @@ -951,11 +963,11 @@ class InfoBarTimeshiftState(InfoBarPVRState): class InfoBarShowMovies: - # i don't really like this class. + # i don't really like this class. # it calls a not further specified "movie list" on up/down/movieList, # so this is not more than an action map def __init__(self): - self["MovieListActions"] = HelpableActionMap(self, "InfobarMovieListActions", + self["MovieListActions"] = HelpableActionMap(self, "InfobarMovieListActions", { "movieList": (self.showMovies, _("movie list")), "up": (self.showMovies, _("movie list")), @@ -992,7 +1004,7 @@ class InfoBarShowMovies: class InfoBarTimeshift: def __init__(self): - self["TimeshiftActions"] = HelpableActionMap(self, "InfobarTimeshiftActions", + self["TimeshiftActions"] = HelpableActionMap(self, "InfobarTimeshiftActions", { "timeshiftStart": (self.startTimeshift, _("start timeshift")), # the "yellow key" "timeshiftStop": (self.stopTimeshift, _("stop timeshift")) # currently undefined :), probably 'TV' @@ -1204,7 +1216,7 @@ class InfoBarPlugins: return list def runPlugin(self, plugin): - plugin(session = self.session) + plugin(session = self.session, servicelist = self.servicelist) # depends on InfoBarExtensions class InfoBarSleepTimer: @@ -1235,6 +1247,9 @@ class InfoBarPiP: def pipShown(self): return self.session.pipshown + def pipHandles0Action(self): + return self.pipShown() and config.usage.pip_zero_button.value != "standard" + def getShowHideName(self): if self.session.pipshown: return _("Disable Picture in Picture") @@ -1279,10 +1294,20 @@ class InfoBarPiP: def movePiP(self): self.session.open(PiPSetup, pip = self.session.pip) + def pipDoHandle0Action(self): + use = config.usage.pip_zero_button.value + if "swap" == use: + self.swapPiP() + elif "swapstop" == use: + self.swapPiP() + self.showPiP() + elif "stop" == use: + self.showPiP() + from RecordTimer import parseEvent class InfoBarInstantRecord: - """Instant Record - handles the instantRecord action in order to + """Instant Record - handles the instantRecord action in order to start/stop instant records""" def __init__(self): self["InstantRecordActions"] = HelpableActionMap(self, "InfobarInstantRecord", @@ -1359,7 +1384,7 @@ class InfoBarInstantRecord: if not x in self.session.nav.RecordTimer.timer_list: self.recording.remove(x) elif x.dontSave and x.isRunning(): - list.append(TimerEntryComponent(x, False)) + list.append((x, False)) if answer[1] == "changeduration": if len(self.recording) == 1: @@ -1441,7 +1466,7 @@ from Tools.ISO639 import LanguageCodes class InfoBarAudioSelection: def __init__(self): - self["AudioSelectionAction"] = HelpableActionMap(self, "InfobarAudioSelectionActions", + self["AudioSelectionAction"] = HelpableActionMap(self, "InfobarAudioSelectionActions", { "audioSelection": (self.audioSelection, _("Audio Options...")), }) @@ -1453,7 +1478,6 @@ class InfoBarAudioSelection: n = audio and audio.getNumberOfTracks() or 0 keys = [ "red", "", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0"] + [""]*n tlist = [] - print "tlist:", tlist if n > 0: self.audioChannel = service.audioChannel() @@ -1472,8 +1496,8 @@ class InfoBarAudioSelection: tlist.append((description, x)) - selectedAudio = tlist[0][1] - tlist.sort(lambda x,y : cmp(x[0], y[0])) + selectedAudio = audio.getCurrentTrack() + tlist.sort(key=lambda x: x[0]) selection = 2 for x in tlist: @@ -1732,12 +1756,12 @@ class InfoBarCueSheetSupport: ENABLE_RESUME_SUPPORT = False def __init__(self, actionmap = "InfobarCueSheetActions"): - self["CueSheetActions"] = HelpableActionMap(self, actionmap, + self["CueSheetActions"] = HelpableActionMap(self, actionmap, { "jumpPreviousMark": (self.jumpPreviousMark, _("jump to previous marked position")), "jumpNextMark": (self.jumpNextMark, _("jump to next marked position")), "toggleMark": (self.toggleMark, _("toggle a cut mark at the current position")) - }, prio=1) + }, prio=1) self.cut_list = [ ] self.is_closing = False @@ -1769,7 +1793,7 @@ class InfoBarCueSheetSupport: if seekable is not None: seekable.seekTo(self.resume_point) self.hideAfterResume() - + def hideAfterResume(self): if isinstance(self, InfoBarShowHide): self.hide() @@ -1881,18 +1905,24 @@ class InfoBarCueSheetSupport: class InfoBarSummary(Screen): skin = """ - + WithSeconds - + Name + + Progress + """ +# for picon: (path="piconlcd" will use LCD picons) +# +# Reference +# + def __init__(self, session, parent): Screen.__init__(self, session) - self["CurrentService"] = CurrentService(self.session.nav) - self["CurrentTime"] = Clock() class InfoBarSummarySupport: def __init__(self): @@ -1901,6 +1931,30 @@ class InfoBarSummarySupport: def createSummary(self): return InfoBarSummary +class InfoBarMoviePlayerSummary(Screen): + skin = """ + + + WithSeconds + + + Name + + + Position + + """ + + def __init__(self, session, parent): + Screen.__init__(self, session) + +class InfoBarMoviePlayerSummarySupport: + def __init__(self): + pass + + def createSummary(self): + return InfoBarMoviePlayerSummary + class InfoBarTeletextPlugin: def __init__(self): self.teletext_plugin = None