X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/efc5aca651306518e6f21a6bd7cbfa1928821b60..77923ed4e1caecf4cef7d46bd6979ef700fed7e2:/lib/python/Plugins/Extensions/CutListEditor/plugin.py diff --git a/lib/python/Plugins/Extensions/CutListEditor/plugin.py b/lib/python/Plugins/Extensions/CutListEditor/plugin.py index b636632c..0d2454e4 100644 --- a/lib/python/Plugins/Extensions/CutListEditor/plugin.py +++ b/lib/python/Plugins/Extensions/CutListEditor/plugin.py @@ -5,7 +5,7 @@ from Screens.MessageBox import MessageBox from Components.ServicePosition import ServicePositionGauge from Components.ActionMap import HelpableActionMap from Components.MultiContent import MultiContentEntryText -from Components.ServiceEventTracker import ServiceEventTracker +from Components.ServiceEventTracker import ServiceEventTracker, InfoBarBase from Components.VideoWindow import VideoWindow from Screens.InfoBarGenerics import InfoBarSeek, InfoBarCueSheetSupport from Components.GUIComponent import GUIComponent @@ -144,32 +144,34 @@ class CutList(GUIComponent): if self.instance is not None: self.instance.moveSelectionTo(index) -class CutListEditor(Screen, InfoBarSeek, InfoBarCueSheetSupport, HelpableScreen): +class CutListEditor(Screen, InfoBarBase, InfoBarSeek, InfoBarCueSheetSupport, HelpableScreen): skin = """ - - - + + + + Format:%A %B %d, %H:%M + + + + + Name + + + Position,Detailed + + + + + + + """ - - - - Name - - - - Position,Detailed - - - - - """ def __init__(self, session, service): self.skin = CutListEditor.skin Screen.__init__(self, session) InfoBarSeek.__init__(self, actionmap = "CutlistSeekActions") InfoBarCueSheetSupport.__init__(self) + InfoBarBase.__init__(self, steal_current_service = True) HelpableScreen.__init__(self) self.old_service = session.nav.getCurrentlyPlayingServiceReference() session.nav.playService(service) @@ -211,17 +213,15 @@ class CutListEditor(Screen, InfoBarSeek, InfoBarCueSheetSupport, HelpableScreen) # to track new entries we save the last version of the cutlist self.last_cuts = [ ] self.cut_start = None + self.onClose.append(self.__onClose) + + def __onClose(self): + self.session.nav.playService(self.old_service) def showTutorial(self): if not self.tutorial_seen: self.tutorial_seen = True - self.session.open(MessageBox, - """Welcome to the Cutlist editor. - -Seek to the start of the stuff you want to cut away. Press OK, select 'start cut'. - -Then seek to the end, press OK, select 'end cut'. That's it. - """, MessageBox.TYPE_INFO) + self.session.open(MessageBox,_("Welcome to the Cutlist editor.\n\nSeek to the start of the stuff you want to cut away. Press OK, select 'start cut'.\n\nThen seek to the end, press OK, select 'end cut'. That's it."), MessageBox.TYPE_INFO) def checkSkipShowHideLock(self): pass @@ -256,7 +256,6 @@ Then seek to the end, press OK, select 'end cut'. That's it. self.removeMark(m) def exit(self): - self.session.nav.playService(self.old_service) self.close() def getCutlist(self):