X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/5c647467dcacf02c52304186df62f03d21a3f094..3285eb3ebcd0ba134ac6b80337f8519d5a0da5b0:/lib/python/Screens/InfoBarGenerics.py diff --git a/lib/python/Screens/InfoBarGenerics.py b/lib/python/Screens/InfoBarGenerics.py index 99f6ba0c..85b1d80f 100644 --- a/lib/python/Screens/InfoBarGenerics.py +++ b/lib/python/Screens/InfoBarGenerics.py @@ -5,17 +5,15 @@ from Components.ActionMap import NumberActionMap from Components.BlinkingPixmap import BlinkingPixmapConditional from Components.Harddisk import harddiskmanager from Components.Input import Input -from Components.Label import * -from Components.Pixmap import Pixmap, PixmapConditional +from Components.Label import Label +from Components.Pixmap import Pixmap from Components.PluginComponent import plugins -from Components.ProgressBar import * 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.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 @@ -406,8 +404,17 @@ class InfoBarEPG: self["EPGActions"] = HelpableActionMap(self, "InfobarEPGActions", { "showEventInfo": (self.openEventView, _("show EPG...")), + "showSingleServiceEPG": (self.openSingleServiceEPG, _("show single service EPG...")), + "showInfobarOrEpgWhenInfobarAlreadyVisible": self.showEventInfoWhenNotVisible, }) + def showEventInfoWhenNotVisible(self): + if self.shown: + self.openEventView() + else: + self.toggleShow() + return 1 + def zapToService(self, service): if not service is None: if self.servicelist.getRoot() != self.epg_bouquet: #already in correct bouquet? @@ -638,15 +645,14 @@ class InfoBarSeek: if action[:5] == "seek:": time = int(action[5:]) self.screen.seekRelative(time * 90000) - if isinstance(self.screen, InfoBarShowHide): - self.screen.doShow() + self.screen.showAfterSeek() return 1 else: return HelpableActionMap.action(self, contexts, action) self["SeekActions"] = InfoBarSeekActionMap(self, actionmap, { - "playpauseService": (self.playpauseService, _("pause")), + "playpauseService": self.playpauseService, "pauseService": (self.pauseService, _("pause")), "unPauseService": (self.unPauseService, _("continue")), @@ -654,12 +660,17 @@ 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) # give them a little more priority to win over color buttons self["SeekActions"].setEnabled(False) self.seekstate = self.SEEK_STATE_PLAY + + self.seek_flag = True self.onPlayStateChanged = [ ] @@ -667,6 +678,10 @@ class InfoBarSeek: self.__seekableStatusChanged() + def showAfterSeek(self): + if isinstance(self, InfoBarShowHide): + self.doShow() + def up(self): pass @@ -817,6 +832,22 @@ class InfoBarSeek: if seekable is not None: seekable.seekRelative(-1, 3) + def seekFwdDef(self): + self.seek_flag = False + seconds = config.usage.self_defined_seek.value + print "Seek", seconds, "seconds self defined forward" + 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 + print "Seek", seconds, "seconds self defined backward" + seekable = self.getSeek() + if seekable is not None: + seekable.seekRelative(1, 0 - seconds * 90000) + def seekFwdManual(self): self.session.openWithCallback(self.fwdSeekTo, MinuteInput) @@ -865,11 +896,14 @@ class InfoBarSeek: self.doSeek(0) def seekRelative(self, diff): - seekable = self.getSeek() - if seekable is not None: - print "seekRelative: res:", seekable.seekRelative(1, diff) + if self.seek_flag == True: + seekable = self.getSeek() + if seekable is not None: + print "seekRelative: res:", seekable.seekRelative(1, diff) + else: + print "seek failed!" else: - print "seek failed!" + self.seek_flag = True def seekRelativeToEnd(self, diff): assert diff <= 0, "diff is expected to be negative!" @@ -1169,7 +1203,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: @@ -1218,6 +1252,7 @@ class InfoBarPiP: self.session.pipshown = False else: self.session.pip = self.session.instantiateDialog(PictureInPicture) + self.session.pip.show() newservice = self.session.nav.getCurrentlyPlayingServiceReference() if self.session.pip.playService(newservice): self.session.pipshown = True @@ -1323,7 +1358,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: @@ -1695,11 +1730,11 @@ class InfoBarCueSheetSupport: ENABLE_RESUME_SUPPORT = False - def __init__(self): - self["CueSheetActions"] = HelpableActionMap(self, "InfobarCueSheetActions", + def __init__(self, actionmap = "InfobarCueSheetActions"): + self["CueSheetActions"] = HelpableActionMap(self, actionmap, { - "jumpPreviousMark": (self.jumpPreviousMark, _("jump to next marked position")), - "jumpNextMark": (self.jumpNextMark, _("jump to previous marked position")), + "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) @@ -1732,6 +1767,11 @@ class InfoBarCueSheetSupport: seekable = self.__getSeekable() if seekable is not None: seekable.seekTo(self.resume_point) + self.hideAfterResume() + + def hideAfterResume(self): + if isinstance(self, InfoBarShowHide): + self.hide() def __getSeekable(self): service = self.session.nav.getCurrentService() @@ -1803,10 +1843,16 @@ class InfoBarCueSheetSupport: def addMark(self, point): insort(self.cut_list, point) self.uploadCuesheet() + self.showAfterCuesheetOperation() def removeMark(self, point): self.cut_list.remove(point) self.uploadCuesheet() + self.showAfterCuesheetOperation() + + def showAfterCuesheetOperation(self): + if isinstance(self, InfoBarShowHide): + self.doShow() def __getCuesheet(self): service = self.session.nav.getCurrentService() @@ -1826,9 +1872,10 @@ class InfoBarCueSheetSupport: cue = self.__getCuesheet() if cue is None: - print "upload failed, no cuesheet interface" - return - self.cut_list = cue.getCutList() + print "download failed, no cuesheet interface" + self.cut_list = [ ] + else: + self.cut_list = cue.getCutList() class InfoBarSummary(Screen): skin = """