openlp-core team mailing list archive

[rimach <crichter@xxxxxx>]

rimach has proposed merging lp:~crichter/openlp/bugfixing into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~crichter/openlp/bugfixing/+merge/95676

Bug #943919 fixed
-- 
https://code.launchpad.net/~crichter/openlp/bugfixing/+merge/95676
Your team OpenLP Core is requested to review the proposed merge of lp:~crichter/openlp/bugfixing into lp:openlp.

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2012-02-15 10:37:42 +0000
+++ openlp/core/ui/slidecontroller.py	2012-03-02 22:01:22 +0000
@@ -172,16 +172,12 @@
             u'Previous Slide',
             u':/slides/slide_previous.png',
             translate('OpenLP.SlideController', 'Move to previous.'),
-            self.onSlideSelectedPrevious,
-            shortcuts=[QtCore.Qt.Key_Up, QtCore.Qt.Key_PageUp],
-            context=QtCore.Qt.WidgetWithChildrenShortcut)
+            self.onSlideSelectedPrevious)
         self.nextItem = self.toolbar.addToolbarButton(
             u'Next Slide',
             u':/slides/slide_next.png',
             translate('OpenLP.SlideController', 'Move to next.'),
-            self.onSlideSelectedNext,
-            shortcuts=[QtCore.Qt.Key_Down, QtCore.Qt.Key_PageDown],
-            context=QtCore.Qt.WidgetWithChildrenShortcut)
+            self.onSlideSelectedNext)
         self.toolbar.addToolbarSeparator(u'Close Separator')
         if self.isLive:
             # Hide Menu
@@ -552,13 +548,18 @@
         action_list.add_action(self.nextItem)
 
     def setLiveHotkeys(self, parent=None):
-        self.previousItem.setObjectName(u'previousItemLive')
-        self.nextItem.setObjectName(u'nextItemLive')
-        action_list = ActionList.get_instance()
-        action_list.add_category(
-            unicode(UiStrings().LiveToolbar), CategoryOrder.standardToolbar)
-        action_list.add_action(self.previousItem)
-        action_list.add_action(self.nextItem)
+        self.previousItem = shortcut_action(parent, u'previousItemLive',
+            [QtCore.Qt.Key_Up], self.onSlideSelectedPrevious,
+            category=unicode(UiStrings().LiveToolbar),
+            context=QtCore.Qt.WidgetWithChildrenShortcut)
+        self.previousItem.setText(
+            translate('OpenLP.SlideController', 'Previous Item Live'))
+        self.nextItem = shortcut_action(parent, u'nextItemLive',
+            [QtCore.Qt.Key_Down], self.onSlideSelectedNext,
+            category=unicode(UiStrings().LiveToolbar),
+            context=QtCore.Qt.WidgetWithChildrenShortcut)
+        self.nextItem.setText(
+            translate('OpenLP.SlideController', 'Next Item Live'))
         self.previousService = shortcut_action(parent, u'previousService',
             [QtCore.Qt.Key_Left], self.servicePrevious,
             category=unicode(UiStrings().LiveToolbar),