Merge lp:~suutari-olli/openlp/click-slide-to-go-live-from-blank into lp:openlp
Status: | Superseded |
---|---|
Proposed branch: | lp:~suutari-olli/openlp/click-slide-to-go-live-from-blank |
Merge into: | lp:openlp |
Diff against target: |
266 lines (+142/-3) 5 files modified
openlp/core/common/settings.py (+1/-0) openlp/core/ui/generaltab.py (+7/-0) openlp/core/ui/slidecontroller.py (+32/-2) openlp/plugins/presentations/lib/messagelistener.py (+5/-1) tests/functional/openlp_core_ui/test_slidecontroller.py (+97/-0) |
To merge this branch: | bzr merge lp:~suutari-olli/openlp/click-slide-to-go-live-from-blank |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Tomas Groth | Pending | ||
Review via email: mp+291690@code.launchpad.net |
This proposal supersedes a proposal from 2016-04-10.
This proposal has been superseded by a proposal from 2016-04-13.
Description of the change
In this re-proposal: Merged to trunk on 13.4.16, tests are now passing again.
Add this to your merge proposal:
-------
lp:~suutari-olli/openlp/click-slide-to-go-live-from-blank (revision 2638)
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
-------
Merged trunk on 11.4.2016
-------
Added 3 tests for checking display is re-blanked if it was blanked before re-processing edited Live item.
Also fixed the issue where Next/Previous slide does not unblank display for PowerPoint/Impress.
-------
This branch introduces the functionality of unblanking
display from Blank to Black/Theme/Desktop for:
a) Clicking slide in “Live panel”
b) Next/Previous shortcuts (Green arrows)
c) Go to verse x.
d) When starting automatic playback (To end or Loop)
Also added “Unblank display when changing slide in Live” to advanced
options tab for disabling/enabling this behavior for a-c.
Additionally this branch also includes fix for bug
https:/
Do note that this branch does not fix this for Escape item blanking,
creating yet an another Escape exclusive bug.
The only reason Escape item has been a good alternative for other
blank to methods is the functionality of resuming Live by clicking
slides and the fact it worked in single screen scenarios.
I can’t see any reason why it should not be removed after this branch
is merged since the single screen issue was already fixed earlier.
Just tested a bit.
You have introduced the "Click live slide to unblank" setting, but a "Unblank display when adding new item" also exists in the general tab. You should probably move yours to be under the exiting one to keep similar settings in the same place. Currently your code doesn't honor the "Unblank display when adding new item", which it will have to do. As it is now the item goes live no matter if the setting is enabled or not.
Also the new setting should be "false" as default, this is new behavior, so users should enabled it if they want it.
Also added a code-comment below.