lp:~raoul-snyman/openlp/stricter-slot-signatures

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2693

Tim Bentley: Approve on 2016-08-12

Diff: 1400 lines (+441/-396)

8 files modified

nose2.cfg (+11/-6)
openlp/core/lib/projector/constants.py (+230/-214)
openlp/core/lib/projector/pjlink1.py (+45/-40)
openlp/core/ui/projector/editform.py (+23/-25)
openlp/core/ui/projector/manager.py (+35/-32)
openlp/core/ui/projector/sourceselectform.py (+51/-52)
tests/functional/openlp_core_common/test_registryproperties.py (+21/-0)
tests/interfaces/openlp_core_ui/test_projectoreditform.py (+25/-27)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2685. By Raoul Snyman on 2016-08-12

HEAD

2684. By Raoul Snyman on 2016-08-12

Removed a log line I never wrote and move a variable for a test I need it in

2683. By Raoul Snyman on 2016-08-10

HEAD

2682. By Raoul Snyman on 2016-08-10

Fix some slot signatures that were the incorrect type

2681. By Raoul Snyman on 2016-07-24

HEAD

2680. By Raoul Snyman on 2016-07-19

Fix another slot signature

2679. By Raoul Snyman on 2016-07-18

Fix up the types in the signals and slots - PyQt 5.6 is stricter about them now.

2678. By Ken Roberts on 2016-07-07

Bugfix 1593882 and 1593883 - projector authorization

- Fix exception when authenticated connection requested and pin is None
- Fix pjlink authentication (use python hash instead of qt hash)
- Fix md5_hash functions
- Fix qmd5hash functions
- Added tests for bugfixes
Tested with test server and Eiki XL200 projector

--------------------------------
lp:~alisonken1/openlp/bug-1593883-projector-authentication (revision 2684)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1629/
[SUCCESS] https...

2677. By Tomas Groth on 2016-06-16

"Fix various pyodbc related issues. Fixes bug 1590657.
Fix of tracback during SongPro import. Fixes bug 1582152.
Fix traceback during songshowplus import. Fixes bug 1585489.
Skip PresentationManager files we do not support."

2676. By Raoul Snyman on 2016-06-14

Fix bug #1589815 by first reducing the string to digits only and then checking if there's anything left.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1589815 (revision 2675)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1603/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1514/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1452/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1225/
[SUCC...