lp:~phill-ridout/openlp/import-depreciations

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2738

Phill: Approve on 2017-05-22

Tomas Groth: Approve on 2017-05-22

Tim Bentley: Approve on 2017-05-20

Diff: 405 lines (+152/-68)

10 files modified

openlp/core/common/__init__.py (+45/-1)
openlp/core/lib/pluginmanager.py (+3/-28)
openlp/core/ui/media/mediacontroller.py (+6/-14)
openlp/plugins/presentations/lib/impresscontroller.py (+2/-1)
openlp/plugins/presentations/lib/pdfcontroller.py (+1/-1)
openlp/plugins/presentations/lib/powerpointcontroller.py (+1/-1)
openlp/plugins/presentations/lib/pptviewcontroller.py (+1/-1)
openlp/plugins/presentations/lib/presentationtab.py (+1/-1)
openlp/plugins/presentations/presentationplugin.py (+6/-15)
tests/functional/openlp_core_common/test_common.py (+86/-5)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1620371: The imp package is pending deprecation in favor of importlib.

Low

Fix Committed

Link a bug report

Related blueprints

2736. By Phill on 2017-05-15

pep

2735. By Phill on 2017-05-15

head

2734. By Phill on 2017-05-15

Reworked the extension_loader function

2733. By Phill on 2017-05-14

Update and refactor dynamic import code

2732. By Phill on 2017-05-06

Fix the QFormLayout in BibleImportForm
Fix one of the tests that was skipped

lp:~phill-ridout/openlp/test_fixes (revision 2732)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1973/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1883/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1824/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1206/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1074/
[SUCCESS] https://ci.openlp.io/job/Branch-04c...

2731. By Tomas Groth on 2017-05-05

Integrate the Jenkins setup with the AppVeyor setup, so that Jenkins fails if AppVeyor fails.

2730. By Raoul Snyman on 2017-03-28

Fix the author_type import properly

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-author_type (revision 2731)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1950/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1861/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1802/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1528/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/...

2729. By Raoul Snyman on 2017-03-28

Fix a problem with loading Qt's translation files, bug #1676163

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/fix-translations (revision 2729)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1944/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1855/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1796/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1522/
[SUCCESS] https://ci.openlp.io/job/Branch...

2728. By Raoul Snyman on 2017-03-25

Various fixes and things:
- Update SongSelect importer to handle changes to the SongSelect site
- Fix PresentationManager importer to take weird XML into account
- Fix OpenLP importer to support author_types
- Fix OpenLP importer to support song numbers
- Fix opening the data folder in KDE where it was being misinterpreted as a SMB share
- Fix a problem with the media player no longer controlling the playlist
- Fix a problem where a timer would expire after the application had been torn down
...

2727. By Simon Hanna on 2017-03-13

Minor fix that makes sure that songbeamer files get decoded properly.