Merge lp:~suutari-olli/openlp/escape-fixes-1294111-1497637 into lp:openlp
Status: | Superseded |
---|---|
Proposed branch: | lp:~suutari-olli/openlp/escape-fixes-1294111-1497637 |
Merge into: | lp:openlp |
Diff against target: |
126 lines (+42/-22) 2 files modified
openlp/core/ui/slidecontroller.py (+31/-18) tests/functional/openlp_core_ui/test_slidecontroller.py (+11/-4) |
To merge this branch: | bzr merge lp:~suutari-olli/openlp/escape-fixes-1294111-1497637 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Needs Fixing | ||
Review via email: mp+274175@code.launchpad.net |
This proposal supersedes a proposal from 2015-10-12.
This proposal has been superseded by a proposal from 2015-10-15.
Description of the change
This branch fixes the next issues:
- Escape item does not work unless “Live” has focus. https:/
- Escape item does not work with Impress/PowerPoint. https:/
Focus issue was fixed by moving the escape item
definitions away from set_live_hot_keys to the same
section where definitions for blank to … are located.
Impress/PowerPoint issue was fixed by
using script to hide them.
test_slidecontr
with the service_item which is used to determine if
Impress/PowerPoint presentations are running.
Do note that this is a duplicate of the focus bug: https:/
New bug:
If PowerPoint/Impress presentation is shut with escape_
send it back to Live, it must be re-sent there.
This may be fixable by modifying:
def slide_selected(
#Starting from line 1073 of slidecontroller.py
Jenkins
https:/
https:/
https:/
https:/
https:/
https:/
https:/
Unmerged revisions
- 2568. By Azaziah
-
Merge to trunk on 7.1.2015
I noticed this branch also seems to fix this bug:
https://bugs.launchpad .net/openlp/ +bug/1531691 However, escape item still remains buggy with problems
related to resuming Live from video or presentations. - 2567. By Azaziah
-
Merge to trunk on 1/7/2015.
I noticed this branch also seems to be fixing this bug:
https://bugs.launchpad .net/openlp/ +bug/1531691 However, escape item still remains buggy with problems related to resuming
video and presentations. - 2566. By Azaziah
-
Added back end part of one comment that was previously deleted.
- 2565. By Azaziah
-
Noticed I made one comment duplicate.
- 2564. By Azaziah
-
Made 1 line 3 chars shorter to fit 120.
- 2563. By Azaziah
-
Improved test for live_escape + Comments + Fixes
- 2562. By Azaziah
-
Edited out one comment, removed one empty line on test.
- 2561. By Azaziah
-
Reverted some useless changes I noticed.
- 2560. By Azaziah
-
Done some cleanup for proper merging part 7.
- 2559. By Azaziah
-
Done some cleanup for proper merging part 6.
See below.
Should have a new test not just a fix to an existing one.