lp://staging/~phill-ridout/openlp/pathlib6

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/openlp at revision 2769

Tomas Groth: Approve on 2017-09-25

Tim Bentley: Approve on 2017-09-25

Phill: Pending requested 2017-09-25

Diff: 1335 lines (+392/-213)

20 files modified

openlp/core/common/httputils.py (+0/-1)
openlp/core/lib/db.py (+68/-15)
openlp/core/ui/advancedtab.py (+14/-11)
openlp/core/ui/exceptionform.py (+2/-12)
openlp/core/ui/lib/filedialog.py (+8/-8)
openlp/core/ui/mainwindow.py (+4/-10)
openlp/core/ui/servicemanager.py (+5/-3)
openlp/plugins/alerts/forms/alertform.py (+1/-1)
openlp/plugins/alerts/lib/alertstab.py (+0/-3)
openlp/plugins/custom/lib/customtab.py (+0/-3)
openlp/plugins/images/imageplugin.py (+2/-2)
openlp/plugins/images/lib/db.py (+3/-4)
openlp/plugins/images/lib/imagetab.py (+0/-3)
openlp/plugins/images/lib/mediaitem.py (+67/-65)
openlp/plugins/images/lib/upgrade.py (+70/-0)
openlp/plugins/songusage/forms/songusagedetaildialog.py (+0/-1)
openlp/plugins/songusage/forms/songusagedetailform.py (+17/-22)
tests/functional/openlp_core_ui/test_exceptionform.py (+28/-29)
tests/functional/openlp_plugins/images/test_lib.py (+20/-20)
tests/functional/openlp_plugins/images/test_upgrade.py (+83/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2774. By Phill on 2017-09-25

minor fix

2773. By Phill on 2017-09-24

more fixes

2772. By Phill on 2017-09-24

pep fixes

2771. By Phill on 2017-09-24

Test fox

2770. By Phill on 2017-09-24

Minor misc + pathlib refactors

2769. By Phill on 2017-09-23

converted the image plugin over to using Path objects

2768. By Phill on 2017-09-23

More pathlib changes, focused mainly on the presentation plugin

Add this to your merge proposal:
--------------------------------
lp:~phill-ridout/openlp/pathlib5 (revision 2777)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2193/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2096/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1983/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1353/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/...

2767. By Ken Roberts on 2017-09-22

PJlink2 update K

- Update notes in PJLink-Notes.odt/update PDF
- Add PJLink.get_socket() (process socket data)
- Add PJLink.get_buffer() (process non-socket data)
- Update PJLink.get_data() to work with get_socket/get_buffer
- Cleanup ProjectorManager code
- Fix incorrect note reference to song db in test_projector_db
- Fix projector tests for change to PJLink() creation
- Start PJLinkUDP class
- Remove unused pjlink2.py module
- Code oops cleanups

[SUCCESS] https://ci.openlp.io/job/Branch-...

2766. By Ken Roberts on 2017-09-11

No code changes.

- Added PJLink programming notes as openlp/documentation/PJlink_Notes.odt and PJlink_Notes.pdf
- Update .bzrignore for eric IDE multiple versions

--------------------------------
lp:~alisonken1/openlp/pjlink2-j (revision 2765)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2186/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2089/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1976/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/...

2765. By Phill on 2017-09-11

Thanks to TGC for his json fix
Also fixes some setting upgrades that I inadvertantly missed. As found by superfly

lp:~phill-ridout/openlp/tgcs_json_fix (revision 2766)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2187/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2090/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1977/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1347/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1183/
[SUCC...