lp://qastaging/~phill-ridout/openlp/wow_import_fixes

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/openlp at revision 2883

Tim Bentley: Approve on 2019-06-28

Diff: 746 lines (+467/-100)

12 files modified

openlp/core/common/i18n.py (+2/-1)
openlp/core/lib/__init__.py (+54/-1)
openlp/core/ui/formattingtagcontroller.py (+1/-1)
openlp/core/widgets/edits.py (+1/-1)
openlp/plugins/songs/lib/importers/wordsofworship.py (+146/-79)
tests/functional/openlp_core/lib/test_lib.py (+180/-2)
tests/functional/openlp_plugins/songs/test_wordsofworshipimport.py (+36/-12)
tests/resources/songs/wordsofworship/Amazing Grace (6 Verses)_v2_1_2.json (+1/-1)
tests/resources/songs/wordsofworship/Holy Holy Holy Lord God Almighty_v2_1_2.json (+1/-1)
tests/resources/songs/wordsofworship/Test_Song_v2_0_0.json (+18/-0)
tests/resources/songs/wordsofworship/Test_Song_v2_1_2.json (+26/-0)
tests/resources/songs/wordsofworship/When morning gilds the skies_v2_0_0.json (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1746350: Exception importing Words of Worship songs	Medium	Fix Committed
Bug #1832993: Issues affecting custom formatting tags	Medium	Fix Committed

Link a bug report

Related blueprints

2883. By Phill on 2019-06-28

Moar minor changes

2882. By Phill on 2019-06-28

PEP Fixes

2881. By Phill on 2019-06-28

Fix test data

2880. By Phill on 2019-06-28

Word of Worship file importer fixes / rework

2879. By Tomas Groth on 2019-06-11

Added Pyro4 to appveyor to make the latest tests run. Fixed test on windows by mocking out render. Missed a rename of _write_theme to save_theme. Loading VLC module can also result in an OSError. Set the default value of core/display_on_monitor to False to avoid blocking the screen with the display window on first start. Set song import/export default directory to None. Add a webengine view for previewing themes. Made VLC loading more robust. A few minor fixes.

2878. By Raoul Snyman on 2019-06-11

Add presentations through LibreOffice on macOS.

2877. By Tomas Groth on 2019-06-10

Add a webengine view for previewing themes. Made VLC loading more robust. A few minor fixes.

2876. By Bastian Germann on 2019-06-06

Sync dependencies in setup.py and check_dependencies; replacing nose2 with pytest

2875. By Tomas Groth on 2019-06-05

Make it possible to go to next or previous service item when stepping through a presentation. Disables impress and powerpoint presentation console.

2874. By Phill on 2019-06-01

refactor media extensions