Merge lp:~tomasgroth/openlp/song-import-fixes24 into lp:openlp/2.4
Proposed by
Tomas Groth
Status: | Merged | ||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 2666 | ||||||||||||||||||||||||||||
Proposed branch: | lp:~tomasgroth/openlp/song-import-fixes24 | ||||||||||||||||||||||||||||
Merge into: | lp:openlp/2.4 | ||||||||||||||||||||||||||||
Diff against target: |
407 lines (+174/-29) 12 files modified
openlp/core/__init__.py (+38/-2) openlp/core/lib/treewidgetwithdnd.py (+6/-1) openlp/core/ui/slidecontroller.py (+2/-0) openlp/plugins/songs/lib/__init__.py (+2/-2) openlp/plugins/songs/lib/importers/easyslides.py (+12/-12) openlp/plugins/songs/lib/importers/songbeamer.py (+7/-3) openlp/plugins/songs/lib/importers/videopsalm.py (+4/-2) tests/functional/openlp_plugins/songs/test_easyslidesimport.py (+2/-0) tests/resources/easyslidessongs/Amazing Grace.json (+6/-6) tests/resources/easyslidessongs/Export_2017-01-12_BB.json (+44/-0) tests/resources/easyslidessongs/Export_2017-01-12_BB.xml (+50/-0) tests/resources/videopsalmsongs/videopsalm-as-safe-a-stronghold.json (+1/-1) |
||||||||||||||||||||||||||||
To merge this branch: | bzr merge lp:~tomasgroth/openlp/song-import-fixes24 | ||||||||||||||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Approve | ||
Review via email: mp+315319@code.launchpad.net |
Description of the change
Fixes:
Bug #1487788: Importing photos does not give focus to OpenLP
Bug #1512040: Loop tooltip gets stuck to "Stop playing..."
Bug #1624661: Missing DB in unmounted disk results in Traceback
Clean search lyrics for formatting tags. Fixes bug #1655988.
Fix an issue with easyslide import not handling verse order correctly. Fixes bug #1655985.
Improve the songbeamer encoding detection. Fixes bug #1530597.
Handle a few videopsalm quirks. Fixes bug #1652851.
To post a comment you must log in.
lp:~tomasgroth/openlp/song-import-fixes24 (revision 2667) /ci.openlp. io/job/ Branch- 01-Pull/ 1893/ /ci.openlp. io/job/ Branch- 02-Functional- Tests/1804/ /ci.openlp. io/job/ Branch- 03-Interface- Tests/1743/ /ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/1479/ /ci.openlp. io/job/ Branch- 04b-Windows_ Interface_ Tests/1069/ /ci.openlp. io/job/ Branch- 05a-Code_ Analysis/ 1137/ /ci.openlp. io/job/ Branch- 05b-Test_ Coverage/ 1005/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/