Merge lp:~tomasgroth/openlp/bugfixes9 into lp:openlp
Proposed by
Tomas Groth
Status: | Merged |
---|---|
Merged at revision: | 2454 |
Proposed branch: | lp:~tomasgroth/openlp/bugfixes9 |
Merge into: | lp:openlp |
Diff against target: |
255 lines (+74/-25) 9 files modified
openlp/core/lib/serviceitem.py (+7/-2) openlp/core/ui/servicemanager.py (+1/-2) openlp/core/ui/slidecontroller.py (+14/-9) openlp/plugins/presentations/lib/pdfcontroller.py (+3/-9) openlp/plugins/songs/lib/mediaitem.py (+12/-0) openlp/plugins/songs/songsplugin.py (+1/-1) tests/functional/openlp_core_lib/test_serviceitem.py (+34/-1) tests/resources/service/serviceitem-song-linked-audio.osj (+1/-0) tests/utils/osdinteraction.py (+1/-1) |
To merge this branch: | bzr merge lp:~tomasgroth/openlp/bugfixes9 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Tim Bentley | Approve | ||
Review via email: mp+243901@code.launchpad.net |
This proposal supersedes a proposal from 2014-12-05.
Description of the change
Added a refresh call to the hide-toolbar so that it gets updated if needed. Makes the blank-to-theme button visible in the toolbar.
Fix for loading songs with linked audio + test. Fixes bug 1398403
Remove dummy initialization of preview_display to solve issue of mediaplayer preview being hidden.
When cloning a song copy the mediafiles as well. Fixes bug 1309998.
Use shutil.which instead of calling which with check_output, when detecting mudraw/gs.
Moved test service files into appropriate folder.
Set the default song search to search as type.
To post a comment you must log in.
lp:~tomasgroth/openlp/bugfixes9 (revision 2457) ci.openlp. org/job/ Branch- 01-Pull/ 820/ ci.openlp. org/job/ Branch- 02-Functional- Tests/752/ ci.openlp. org/job/ Branch- 03-Interface- Tests/698/ ci.openlp. org/job/ Branch- 04a-Windows_ Functional_ Tests/602/
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[FAILURE] http://