Merge lp:~tomasgroth/openlp/presentation-fixes24 into lp:openlp
Proposed by
Tomas Groth
Status: | Merged |
---|---|
Approved by: | Tim Bentley |
Approved revision: | 2611 |
Merged at revision: | 2607 |
Proposed branch: | lp:~tomasgroth/openlp/presentation-fixes24 |
Merge into: | lp:openlp |
Diff against target: |
214 lines (+51/-29) 9 files modified
openlp/core/ui/servicemanager.py (+6/-2) openlp/core/ui/slidecontroller.py (+13/-12) openlp/plugins/presentations/lib/messagelistener.py (+7/-6) openlp/plugins/songs/forms/editsongform.py (+1/-1) openlp/plugins/songs/lib/mediaitem.py (+3/-3) tests/functional/openlp_core_lib/test_htmlbuilder.py (+1/-2) tests/functional/openlp_core_ui/test_mainwindow.py (+0/-2) tests/functional/openlp_plugins/presentations/test_messagelistener.py (+20/-0) tests/resources/projector/data.py (+0/-1) |
To merge this branch: | bzr merge lp:~tomasgroth/openlp/presentation-fixes24 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Approve | ||
Raoul Snyman | Approve | ||
Review via email: mp+282661@code.launchpad.net |
Description of the change
Fix taking screenshots while using powerpoint or impress.
Fix traceback when expanding and collapsing songs.
In _process_item, postpone check for _reset_blank, since the service_item can change type while being execute (Pdf->Image). For the same reason always use the serviceitem that might have been converted.
Fix crash when sending Pdf live.
Pep8 fixes
To post a comment you must log in.
lp:~tomasgroth/openlp/presentation-fixes24 (revision 2611) /ci.openlp. io/job/ Branch- 01-Pull/ 1247/ /ci.openlp. io/job/ Branch- 02-Functional- Tests/1171/ /ci.openlp. io/job/ Branch- 03-Interface- Tests/1110/ /ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/947/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[FAILURE] https:/
Stopping after failure