lp:~phill-ridout/openlp/pathlib7

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2771

Tomas Groth: Approve on 2017-09-26

Tim Bentley: Approve on 2017-09-26

Diff: 1282 lines (+304/-310)

13 files modified

openlp/core/lib/json/theme.json (+1/-1)
openlp/core/lib/renderer.py (+4/-3)
openlp/core/lib/theme.py (+19/-15)
openlp/core/ui/maindisplay.py (+4/-4)
openlp/core/ui/themeform.py (+31/-27)
openlp/core/ui/thememanager.py (+184/-209)
openlp/core/ui/themestab.py (+2/-2)
openlp/plugins/images/lib/upgrade.py (+0/-1)
tests/functional/openlp_core_lib/test_theme.py (+6/-5)
tests/functional/openlp_core_ui/test_maindisplay.py (+9/-9)
tests/functional/openlp_core_ui/test_themeform.py (+1/-1)
tests/functional/openlp_core_ui/test_thememanager.py (+22/-29)
tests/interfaces/openlp_core_ui/test_thememanager.py (+21/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2773. By Phill on 2017-09-26

pep fixes

2772. By Phill on 2017-09-26

HEAD

2771. By Phill on 2017-09-26

Modify themes to work with pathlib

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...

2764. By Phill on 2017-09-05

Change the settings upgrade code to handle versioned upgrades
Upgrade settings to store file paths and json encoded Path objects
Enable the json encoders/decoders to work with custom objects with defined json methods
Added in automatic backup before settings upgrade on superflys request

lp:~phill-ridout/openlp/pathlib4 (revision 2769)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2184/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2087/
[SUCCESS] https://ci.openlp.io/job...