Merge lp:~tomasgroth/openlp/23bugfixes into lp:openlp
Proposed by
Tomas Groth
Status: | Merged |
---|---|
Approved by: | Tomas Groth |
Approved revision: | 2618 |
Merged at revision: | 2610 |
Proposed branch: | lp:~tomasgroth/openlp/23bugfixes |
Merge into: | lp:openlp |
Diff against target: |
291 lines (+96/-24) 9 files modified
openlp/core/common/uistrings.py (+2/-2) openlp/core/lib/renderer.py (+3/-3) openlp/core/ui/maindisplay.py (+9/-7) openlp/core/ui/slidecontroller.py (+5/-2) openlp/plugins/songs/forms/editsongform.py (+2/-0) openlp/plugins/songs/lib/importers/opensong.py (+1/-0) tests/functional/openlp_core_lib/test_renderer.py (+16/-10) tests/functional/openlp_plugins/songs/test_opensongimport.py (+2/-0) tests/resources/opensongsongs/Amazing Grace2 (+56/-0) |
To merge this branch: | bzr merge lp:~tomasgroth/openlp/23bugfixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tomas Groth | Approve | ||
Tim Bentley | Approve | ||
Review via email: mp+283716@code.launchpad.net |
Description of the change
Fix traceback where OpenSong importer crashed if non-numbers were in the CCLI field.
Fix some broken tests that was not being used due to naming.
When setting the verseorder to uppercase, remember the cursor position. Fixes bug 1536411.
Disable OpenGL on linux (too). Fixes bug 1535332.
Disable OpenGL on windows to make webkit player work.
Made workaround for windows display not updating, and disabled OpenGL on Windows, fixes bug 1531319.
Fix playback of linked audio. Fixes bug 1533280.
To post a comment you must log in.
lp:~tomasgroth/openlp/23bugfixes (revision 2618) /ci.openlp. io/job/ Branch- 01-Pull/ 1269/ /ci.openlp. io/job/ Branch- 02-Functional- Tests/1193/ /ci.openlp. io/job/ Branch- 03-Interface- Tests/1132/ /ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/968/ /ci.openlp. io/job/ Branch- 04b-Windows_ Interface_ Tests/560/ /ci.openlp. io/job/ Branch- 05a-Code_ Analysis/ 633/ /ci.openlp. io/job/ Branch- 05b-Test_ Coverage/ 502/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[FAILURE] https:/
Stopping after failure