openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/trivial into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/57747

Hello,

- removed the up/down shortcuts from the shortcut list (= cannot be changed anymore)

Reasons for this change is, that changing the up/down shortcuts work fine but when you when you press "down" the slidecontroller selects a slide but does not sent it live/previews it. It seems that the widget provides the ability to react on up/down event independently of our shortcuts. I think this is the easiest way to deal with this (and by the way, I don't think that somebody wants to change the shortcuts anyway :-D ).
-- 
https://code.launchpad.net/~googol-hush/openlp/trivial/+merge/57747
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/trivial into lp:openlp.

=== modified file 'openlp/core/lib/ui.py'
--- openlp/core/lib/ui.py	2011-04-12 21:07:08 +0000
+++ openlp/core/lib/ui.py	2011-04-14 18:21:06 +0000
@@ -87,7 +87,6 @@
     OpenService = translate('OpenLP.Ui', 'Open Service')
     Preview = translate('OpenLP.Ui', 'Preview')
     PreviewPanel = translate('OpenLP.Ui', 'Preview Panel')
-    PreviewToolbar = translate('OpenLP.Ui', 'Preview Toolbar')
     PrintServiceOrder = translate('OpenLP.Ui', 'Print Service Order')
     ReplaceBG = translate('OpenLP.Ui', 'Replace Background')
     ReplaceLiveBG = translate('OpenLP.Ui', 'Replace Live Background')
@@ -427,4 +426,4 @@
     if index == -1:
         # Not Found.
         index = 0
-    combo_box.setCurrentIndex(index)
\ No newline at end of file
+    combo_box.setCurrentIndex(index)

=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2011-04-12 21:07:08 +0000
+++ openlp/core/ui/slidecontroller.py	2011-04-14 18:21:06 +0000
@@ -368,10 +368,8 @@
         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, UiStrings.PreviewToolbar)
-        action_list.add_action(self.nextItem, UiStrings.PreviewToolbar)
+        action_list.add_action(self.previousItem)
+        action_list.add_action(self.nextItem)
 
     def setLiveHotkeys(self, parent=None):
         self.previousItem.setObjectName(u'previousItemLive')         
@@ -379,8 +377,8 @@
         action_list = ActionList.get_instance()
         action_list.add_category(
             UiStrings.LiveToolbar, CategoryOrder.standardToolbar)
-        action_list.add_action(self.previousItem, UiStrings.LiveToolbar)
-        action_list.add_action(self.nextItem, UiStrings.LiveToolbar)
+        action_list.add_action(self.previousItem)
+        action_list.add_action(self.nextItem)
         self.previousService = shortcut_action(parent, u'previousService',
             [QtCore.Qt.Key_Left], self.servicePrevious, UiStrings.LiveToolbar)
         self.previousService.setShortcutContext(QtCore.Qt.WidgetWithChildrenShortcut)