lp:~raoul-snyman/openlp/better-threading

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2807

Tim Bentley: Approve on 2018-01-07

Phill: Pending requested 2018-01-07

Diff: 3036 lines (+638/-970)

26 files modified

openlp/core/api/deploy.py (+4/-4)
openlp/core/api/http/server.py (+19/-20)
openlp/core/api/websockets.py (+72/-89)
openlp/core/app.py (+2/-5)
openlp/core/common/applocation.py (+1/-1)
openlp/core/common/httputils.py (+8/-7)
openlp/core/lib/imagemanager.py (+22/-13)
openlp/core/projectors/manager.py (+1/-2)
openlp/core/projectors/pjlink.py (+2/-2)
openlp/core/threading.py (+70/-14)
openlp/core/ui/firsttimeform.py (+36/-39)
openlp/core/ui/mainwindow.py (+44/-36)
openlp/core/ui/media/systemplayer.py (+14/-14)
openlp/core/version.py (+6/-7)
openlp/plugins/songs/forms/songselectform.py (+9/-31)
tests/functional/openlp_core/api/http/test_http.py (+19/-19)
tests/functional/openlp_core/api/test_websockets.py (+10/-10)
tests/functional/openlp_core/common/test_httputils.py (+2/-2)
tests/functional/openlp_core/lib/test_image_manager.py (+148/-53)
tests/functional/openlp_core/test_app.py (+18/-12)
tests/functional/openlp_core/test_threading.py (+89/-0)
tests/functional/openlp_core/ui/media/test_systemplayer.py (+0/-549)
tests/functional/openlp_core/ui/test_firsttimeform.py (+15/-15)
tests/functional/openlp_core/ui/test_mainwindow.py (+11/-10)
tests/functional/openlp_plugins/songs/test_songselect.py (+2/-2)
tests/interfaces/openlp_core/ui/test_mainwindow.py (+14/-14)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2805. By Raoul Snyman on 2018-01-07

Fix the tests I now added back in

2804. By Raoul Snyman on 2018-01-07

Fix some issues highlighted by Tim and Phill, and added a file that was erroneously removed

2803. By Raoul Snyman on 2018-01-07

Fix the tests I broke

2802. By Raoul Snyman on 2018-01-07

If XDG is available, log files belong in the real cache dir

2801. By Raoul Snyman on 2018-01-07

Remove the Qt style option - it never worked anyway

2800. By Raoul Snyman on 2018-01-07

Fix the direction of the '--no-web-server' command line option

2799. By Raoul Snyman on 2018-01-07

Fix a mismatch of arguments in a call to reload_bibles()

2798. By Raoul Snyman on 2018-01-06

Stop the HTTP server properly too

2797. By Raoul Snyman on 2018-01-06

Call close() to stop everything properly

2796. By Raoul Snyman on 2018-01-05

Fix an issue with versions of websockets > 4.0