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: 378 lines (+86/-96)
8 files modified
openlp/core/common/settings.py (+6/-4)
openlp/core/ui/exceptionform.py (+1/-1)
openlp/core/ui/mainwindow.py (+16/-32)
openlp/core/ui/shortcutlistform.py (+3/-3)
openlp/core/ui/slidecontroller.py (+37/-30)
resources/images/openlp-2.qrc (+0/-1)
tests/functional/openlp_core_ui/test_slidecontroller.py (+2/-25)
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
Tomas Groth Needs Information
Tim Bentley Pending
Review via email: mp+303995@code.qastaging.launchpad.net

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

This proposal has been superseded by a proposal from 2016-09-02.

Description of the change

- Changed the default shortcuts for Blank to desktop to Esc + D
- Removed default shortcut for "Escape item"
- Combined Offline & Online help buttons into "User Manual" button,
  which launches the appropriate help based on OS. (Offline for Win/Mac)
- Fixed bugs:
https://bugs.launchpad.net/openlp/+bug/805082
https://bugs.launchpad.net/openlp/+bug/1612187
https://bugs.launchpad.net/openlp/+bug/1616441
--------------------------------
lp:~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc (revision 2704)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1761/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1672/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1610/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1366/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/956/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1024/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/892/
[SUCCESS] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/57/

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

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 : Posted in a previous version of this proposal

See below and tests would be nice.

review: Needs Fixing
Revision history for this message
Tomas Groth (tomasgroth) wrote :

Looks good to me!
The only thing that nags me is that pressing Esc will also unblank. In my perception of the world Esc should only exit something - not bring it back!
If Tim and Raoul thinks it fine as it is, feel free to ignore me...

review: Needs Information
Revision history for this message
Azaziah (suutari-olli) wrote :

> Looks good to me!
> The only thing that nags me is that pressing Esc will also unblank. In my
> perception of the world Esc should only exit something - not bring it back!
> If Tim and Raoul thinks it fine as it is, feel free to ignore me...

Good point which I hadn't thought of before.
Perhaps we should create a new shortkey which would
only Blank to desktop but not unblank?

Revision history for this message
Tomas Groth (tomasgroth) wrote :

A new blank-only shortcut sounds great to me :-)

lp://qastaging/~suutari-olli/openlp/change-blank-to-desktop-hotkey-to-esc updated
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.