OpenLP

Merge lp:~googol-deactivatedaccount/openlp/tweaks into lp:openlp

  1. tweaks
  2. Merge into trunk
Proposed by Andreas Preikschat
Status: Merged
Approved by: Raoul Snyman
Approved revision: 1331
Merged at revision: 1658
Proposed branch: lp:~googol-deactivatedaccount/openlp/tweaks
Merge into: lp:openlp
Diff against target: 12 lines (+1/-1)
1 file modified
openlp/core/ui/mainwindow.py (+1/-1)
To merge this branch: bzr merge lp:~googol-deactivatedaccount/openlp/tweaks
Reviewer Review Type Date Requested Status
Raoul Snyman Approve
Tim Bentley Approve
Review via email: mp+65889@code.launchpad.net

Commit message

- fixed saving 'Setup' mode shortcut

Description of the change

Hello,

The shortcut for the "Setup" mode was not saved. The mistake was, that the setup entry had the same object name as the "live" mode, thus it used the "live" mode shortcut.

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) :
review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/ui/mainwindow.py'
2--- openlp/core/ui/mainwindow.py 2011-06-21 06:10:03 +0000
3+++ openlp/core/ui/mainwindow.py 2011-06-26 06:03:28 +0000
4@@ -217,7 +217,7 @@
5 self.modeDefaultItem = checkable_action(
6 mainWindow, u'modeDefaultItem', category=UiStrings().ViewMode)
7 self.modeSetupItem = checkable_action(
8- mainWindow, u'modeLiveItem', category=UiStrings().ViewMode)
9+ mainWindow, u'modeSetupItem', category=UiStrings().ViewMode)
10 self.modeLiveItem = checkable_action(
11 mainWindow, u'modeLiveItem', True, UiStrings().ViewMode)
12 self.modeGroup = QtGui.QActionGroup(mainWindow)