From ee960bb88c083b98d31d187ad034872414ce815a Mon Sep 17 00:00:00 2001 From: Andreas Preikschat Date: Mon, 24 Oct 2011 18:13:30 +0200 Subject: [PATCH] use '1' etc shortcuts for bible verses, images, etc --- openlp/core/lib/ui.py | 1 - openlp/core/ui/slidecontroller.py | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/openlp/core/lib/ui.py b/openlp/core/lib/ui.py index 2e9669e89..756df36c3 100644 --- a/openlp/core/lib/ui.py +++ b/openlp/core/lib/ui.py @@ -105,7 +105,6 @@ 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.ReplaceBG = translate('OpenLP.Ui', 'Replace Background') self.ReplaceLiveBG = translate('OpenLP.Ui', 'Replace live background.') diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py index aaecb7735..6eb0bf2e4 100644 --- a/openlp/core/ui/slidecontroller.py +++ b/openlp/core/ui/slidecontroller.py @@ -497,13 +497,15 @@ class SlideController(QtGui.QWidget): if key in self.slideList.keys(): self.__checkUpdateSelectedSlide(self.slideList[key]) self.slideSelected() + elif key.startswith(u'V'): + if key[1:] in self.slideList.keys(): + self.__checkUpdateSelectedSlide(self.slideList[key[1:]]) + self.slideSelected() def setPreviewHotkeys(self, parent=None): self.previousItem.setObjectName(u'previousItemPreview') self.nextItem.setObjectName(u'nextItemPreview') action_list = ActionList.get_instance() - action_list.add_category( - UiStrings().PreviewToolbar, CategoryOrder.standardToolbar) action_list.add_action(self.previousItem) action_list.add_action(self.nextItem) @@ -783,6 +785,7 @@ class SlideController(QtGui.QWidget): self.onSongBarHandler) else: row += 1 + self.slideList[unicode(row)] = row - 1 item.setText(frame[u'text']) else: label = QtGui.QLabel() @@ -800,6 +803,7 @@ class SlideController(QtGui.QWidget): self.previewListWidget.setCellWidget(framenumber, 0, label) slideHeight = width * self.parent().renderer.screen_ratio row += 1 + self.slideList[unicode(row)] = row - 1 text.append(unicode(row)) self.previewListWidget.setItem(framenumber, 0, item) if slideHeight != 0: