lp:~raoul-snyman/openlp/wordproject-importer

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2708

Tim Bentley: Approve on 2016-12-04

Diff: 1184 lines (+933/-15)

9 files modified

openlp/core/ui/lib/wizard.py (+2/-0)
openlp/plugins/bibles/forms/bibleimportform.py (+63/-13)
openlp/plugins/bibles/lib/importers/wordproject.py (+169/-0)
openlp/plugins/bibles/lib/manager.py (+6/-1)
openlp/plugins/bibles/lib/mediaitem.py (+1/-0)
openlp/plugins/media/lib/mediaitem.py (+2/-1)
tests/functional/openlp_plugins/bibles/test_wordprojectimport.py (+220/-0)
tests/resources/bibles/wordproject_chapter.htm (+248/-0)
tests/resources/bibles/wordproject_index.htm (+222/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2709. By Raoul Snyman on 2016-11-25

Fix pep8

2708. By Raoul Snyman on 2016-11-25

Move contents of html files into actual html files

2707. By Raoul Snyman on 2016-11-25

Stop wizards from resizing themselves based on the contents of comboboxes

2706. By Raoul Snyman on 2016-11-24

Add a WordProject Bible importer

2705. By Phill on 2016-11-15

Move the "no results" code in to the list widget.

lp:~phill-ridout/openlp/no-results (revision 2709)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1839/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1750/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1688/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1434/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1024/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_...

2704. By Phill on 2016-11-14

Move some code in to the searchedit module

lp:~phill-ridout/openlp/search_edit (revision 2705)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1835/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1746/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1684/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1430/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1020/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analys...

2703. By Phill on 2016-11-05

Regenerated resources for my earlier resource clean up merge77

lp:~phill-ridout/openlp/bug1623711-part2 (revision 2703)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1813/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1724/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1662/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1416/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1006/
[SUCCESS] https://ci.openlp.io/j...

2702. By Phill on 2016-11-01

lp:~phill-ridout/openlp/bug1623711-2.4 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1806/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1717/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1655/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1411/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1001/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1069/
[SUCCESS] https://ci.openlp.io/j...

2701. By Phill on 2016-11-01

Added a script to clean up the resource folder.
Ran script and made some other resource cleanup code changes.

Add this to your merge proposal:
--------------------------------
lp:~phill-ridout/openlp/resource_clean_up (revision 2705)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1803/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1714/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1652/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests...

2700. By Tim Bentley on 2016-10-26

My dad needed a report of all the songs on their database, they had 1800.
Made this into a reporting option and cleaned up the menu.
Fixed some errors spotted as well

Fixed issues and comments
1800 songs takes about 3 secs to run on my i7

lp:~trb143/openlp/reporting (revision 2701)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1801/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1712/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1650/
[SUCCESS] https://ci....