OpenLP

Merge lp://qastaging/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc into lp://qastaging/openlp

  1. change-blank-to-desktop-hotkey-to-esc
  2. Merge into trunk
Proposed by Azaziah
Status: Superseded
Proposed branch: lp://qastaging/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc
Merge into: lp://qastaging/openlp
Diff against target: 232 lines (+59/-51)
6 files modified
openlp/core/common/settings.py (+8/-5)
openlp/core/ui/mainwindow.py (+16/-32)
openlp/core/ui/shortcutlistform.py (+3/-3)
openlp/core/ui/slidecontroller.py (+11/-10)
resources/images/openlp-2.qrc (+0/-1)
tests/functional/openlp_plugins/bibles/test_mediaitem.py (+21/-0)
To merge this branch: bzr merge lp://qastaging/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc
Reviewer Review Type Date Requested Status
Tim Bentley Needs Fixing
Review via email: mp+302896@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-08-14.

This proposal has been superseded by a proposal from 2016-08-20.

To post a comment you must log in.
Revision history for this message
Azaziah (suutari-olli) wrote :

See the comment for the right place.

"This used to be in self.main_window.warning_message, where it was causing traceback.

Does it still work?
I'm not exactly sure of what it's supposed to do to be honest.

Is there a reason why this could not be an a separate line?"

Revision history for this message
Tim Bentley (trb143) wrote :

See below and tests would be nice.

review: Needs Fixing
lp://qastaging/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc updated
2700. By Azaziah

- Removed for_display=True which was causing traceback since it's apparently no longer used.
- Added manual row split for the duplicated key error message.
  (Looks bad to have 12 words in one row and then one word in the row after that)

2701. By Azaziah

- Added test

2702. By Azaziah

- Removed modifications to test_mainwindow.

2703. By Azaziah

- Added the missing </strong> tag to expection form. (bug 1616441)

2704. By Azaziah

- Merged trunk

2705. By Azaziah

- A working only blank to desktop

2706. By Azaziah

- fixed the "blank only" button visibility

2707. By Azaziah

- The new method now also stops loops.

2708. By Azaziah

- Renamed some code

2709. By Azaziah

- Setting migration for escape item
- Renamed shortcut descriptions for blanks

2710. By Azaziah

- Removed the old "escape item" test.

2711. By Azaziah

Fixed 1 strong tag

2712. By Azaziah

- Fixed some .forma tags to .format

2713. By Azaziah

- Removed one unrequired code line

2714. By Azaziah

- Merged trunk on 4.10.16

2715. By Azaziah

- Added pip's fix for sword test

2716. By Azaziah

- Merged trunk and fixed conflict.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.