openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/bug-1128376-2 into lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1128376 in OpenLP: "Configure shortcuts has two items called settings"
  https://bugs.launchpad.net/openlp/+bug/1128376

For more details, see:
https://code.launchpad.net/~googol/openlp/bug-1128376-2/+merge/149275

Hello,

- fixed bug #1128376 (Configure shortcuts has two items called settings)
-- 
https://code.launchpad.net/~googol/openlp/bug-1128376-2/+merge/149275
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bug-1128376-2 into lp:openlp/2.0.

=== modified file 'openlp/core/ui/mainwindow.py'
--- openlp/core/ui/mainwindow.py	2013-01-02 20:10:37 +0000
+++ openlp/core/ui/mainwindow.py	2013-02-19 14:02:20 +0000
@@ -310,9 +310,9 @@
         # Give QT Extra Hint that this is the Preferences Menu Item
         self.settingsConfigureItem.setMenuRole(QtGui.QAction.PreferencesRole)
         self.settingsImportItem = create_action(mainWindow,
-           u'settingsImportItem', category=UiStrings().Settings)
+           u'settingsImportItem', category=UiStrings().Import)
         self.settingsExportItem = create_action(mainWindow,
-           u'settingsExportItem', category=UiStrings().Settings)
+           u'settingsExportItem', category=UiStrings().Export)
         action_list.add_category(unicode(UiStrings().Help),
             CategoryOrder.standardMenu)
         self.aboutItem = create_action(mainWindow, u'aboutItem',