lp:~tomasgroth/openlp/song-import-fixes24

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp/2.4 at revision 2666

Tim Bentley: Approve on 2017-01-22

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1487788: Importing photos does not give focus to OpenLP	Low	Fix Committed
Bug #1512040: Loop tooltip gets stuck to "Stop playing..."	Low	Fix Committed
Bug #1530597: Importing Songbeamer songs using latin1 encoding doesn't get decoded correctly	Low	Fix Committed
Bug #1624661: Missing DB in unmounted disk results in Traceback	Low	Fix Committed
Bug #1652851: VideoPsalm import fails due to unexpected format	Medium	Fix Committed
Bug #1655985: EasySlide importer gets the verse order wrong	Low	Fix Committed
Bug #1655988: Formatting tags gets included in searchable lyric text	High	Fix Committed

Link a bug report

Related blueprints

2667. By Tomas Groth on 2017-01-22

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

2666. By Tomas Groth on 2017-01-22

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.

2665. By Tim Bentley on 2017-01-20

More Translations

2664. By Tim Bentley on 2017-01-04

Update the year in headers and about form.

2663. By Raoul Snyman on 2016-12-18

Fix bug #1645867 by setting an application attribute related to OpenGL
Set the width of the Theme wizard so that it doesn't resize by itself
Hide the splash screen when the backup dialog shows and when the exception form shows
Add icons back into the media library tabs

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/mac-niggles-2.4 (revision 2666)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1875/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Fun...

2662. By Raoul Snyman on 2016-12-15

Fix web remote for once and for all

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/upgrade-jquery-2.4 (revision 2648)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1870/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1781/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1719/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1459/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tes...

2661. By Raoul Snyman on 2016-12-15

Fix the QSize bug.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/qsize-2.4 (revision 2664)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1866/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1777/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1715/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1455/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1045/
[SUCCESS] https:/...

2660. By Raoul Snyman on 2016-12-15

Fix an off-by-one problem when using the autocompletion on macOS

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1642684-2.4 (revision 2660)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1868/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1779/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1717/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1457/
[SUCCESS] https://ci.openlp.io/job/Branch...

2659. By Raoul Snyman on 2016-11-26

Release 2.4.4

2658. By Tim Bentley on 2016-11-26

trans