From 12a0b8b750aca7827dc5135479480d35e1edf896 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 9 Feb 2015 20:49:24 +0000 Subject: [PATCH] Add default shortcut bindings for preview next/prev, and make the appear in the shortcut edit dialog. Fixes bug 1412570. Fixes: https://launchpad.net/bugs/1412570 --- openlp/core/common/settings.py | 4 ++-- openlp/core/common/uistrings.py | 1 + openlp/core/ui/slidecontroller.py | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py index f30aeb0ee..8d5abb7bc 100644 --- a/openlp/core/common/settings.py +++ b/openlp/core/common/settings.py @@ -216,7 +216,7 @@ class Settings(QtCore.QSettings): 'shortcuts/moveDown': [QtGui.QKeySequence(QtCore.Qt.Key_PageDown)], 'shortcuts/nextTrackItem': [], 'shortcuts/nextItem_live': [QtGui.QKeySequence(QtCore.Qt.Key_Down), QtGui.QKeySequence(QtCore.Qt.Key_PageDown)], - 'shortcuts/nextItem_preview': [], + 'shortcuts/nextItem_preview': [QtGui.QKeySequence(QtCore.Qt.Key_Down), QtGui.QKeySequence(QtCore.Qt.Key_PageDown)], 'shortcuts/nextService': [QtGui.QKeySequence(QtCore.Qt.Key_Right)], 'shortcuts/newService': [], 'shortcuts/offlineHelpItem': [], @@ -230,7 +230,7 @@ class Settings(QtCore.QSettings): 'shortcuts/playSlidesLoop': [], 'shortcuts/playSlidesOnce': [], 'shortcuts/previousService': [QtGui.QKeySequence(QtCore.Qt.Key_Left)], - 'shortcuts/previousItem_preview': [], + 'shortcuts/previousItem_preview': [QtGui.QKeySequence(QtCore.Qt.Key_Up), QtGui.QKeySequence(QtCore.Qt.Key_PageUp)], 'shortcuts/printServiceItem': [QtGui.QKeySequence('Ctrl+P')], 'shortcuts/songExportItem': [], 'shortcuts/songUsageStatus': [QtGui.QKeySequence(QtCore.Qt.Key_F4)], diff --git a/openlp/core/common/uistrings.py b/openlp/core/common/uistrings.py index a279bf573..bebf4add0 100644 --- a/openlp/core/common/uistrings.py +++ b/openlp/core/common/uistrings.py @@ -115,6 +115,7 @@ class UiStrings(object): self.PlaySlidesInLoop = translate('OpenLP.Ui', 'Play Slides in Loop') self.PlaySlidesToEnd = translate('OpenLP.Ui', 'Play Slides to End') self.Preview = translate('OpenLP.Ui', 'Preview') + self.PreviewToolbar = translate('OpenLP.Ui', 'Preview Toolbar') self.PrintService = translate('OpenLP.Ui', 'Print Service') self.Projector = translate('OpenLP.Ui', 'Projector', 'Singular') self.Projectors = translate('OpenLP.Ui', 'Projectors', 'Plural') diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index 5696296e8..94ece4693 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -1418,7 +1418,7 @@ class PreviewController(RegistryMixin, OpenLPMixin, SlideController): super(PreviewController, self).__init__(parent) self.split = 0 self.type_prefix = 'preview' - self.category = None + self.category = 'Preview Toolbar' def bootstrap_post_set_up(self): """