Merge lp:~tomasgroth/openlp/bugfixes6 into lp:openlp
Proposed by
Tomas Groth
Status: | Merged | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Raoul Snyman | ||||||||||||||||||||
Approved revision: | 2451 | ||||||||||||||||||||
Merged at revision: | 2447 | ||||||||||||||||||||
Proposed branch: | lp:~tomasgroth/openlp/bugfixes6 | ||||||||||||||||||||
Merge into: | lp:openlp | ||||||||||||||||||||
Diff against target: |
163 lines (+102/-6) 5 files modified
openlp/core/ui/settingsdialog.py (+1/-1) openlp/core/ui/slidecontroller.py (+4/-2) openlp/plugins/songs/lib/mediaitem.py (+3/-0) openlp/plugins/songs/lib/openlyricsexport.py (+8/-3) tests/functional/openlp_plugins/songs/test_openlyricsexport.py (+86/-0) |
||||||||||||||||||||
To merge this branch: | bzr merge lp:~tomasgroth/openlp/bugfixes6 | ||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Tim Bentley | Approve | ||
Review via email:
|
Description of the change
Fix for overwriting files on song export + test. Fixes bug 1216232.
Only show slide-dropdown on live-slidecontr
Make sure that the slidecontroller toolbar layout is correctly adjusted to fit its size. Fixes bug 1387304.
Mark a song edited from preview as coming from plugin. Fixes bug 1382672
Make the settingswindow higher to make room for the new settings. Fixes bug 1377283.
To post a comment you must log in.
CI is still having issues: ci.openlp. org/job/ Branch- 01-Pull/ 780/ ci.openlp. org/job/ Branch- 02-Functional- Tests/716/ ci.openlp. org/job/ Branch- 03-Interface- Tests/662/
lp:~tomasgroth/openlp/bugfixes6 (revision 2451)
[SUCCESS] http://
[SUCCESS] http://
[FAILURE] http://
Stopping after failure