lp:~phill-ridout/openlp/qr

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2775

Tomas Groth: Approve on 2017-10-01

Tim Bentley: Approve on 2017-10-01

Diff: 549 lines (+469/-44)

3 files modified

openlp/core/api/tab.py (+20/-40)
resources/images/app_qr.svg (+446/-0)
resources/images/openlp-2.qrc (+3/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2770. By Phill on 2017-10-01

Add new qrcode

2769. By Phill on 2017-10-01

HEAD

2768. By Phill on 2017-10-01

Prehead commit

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

2763. By Jonathan Springer on 2017-08-27

- Fix system player stopping instead of pausing when asked to paused
- Keep position label from causing seek slider and volume slider from jumping
- Fix video backboard not being hidden when switching to next non media slide
- Zero position label when stopping media to match seek sliders behavior
- Use media controller methods to pause and play media when hiding, blanking, and unblanking display to keep UI in sync with media state.
- Fix transparent display on macOS

2762. By Phill on 2017-08-25

Part 3, converted some more utility methods

Fixed the problem TGC was having.

Superflys fix included (https://bin.snyman.info/mmm5sqj8)

lp:~phill-ridout/openlp/pathlib3 (revision 2764)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2175/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2079/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1966/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1336/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_C...

2761. By Theodore Frederick on 2017-08-23

Adds option to ignore aspect ratio and stretch image.