lp:~nixcode/openlp/fairsplitting

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openlp

Tomas Groth: Needs Information on 2017-08-20

Diff: 355 lines (+202/-6)

7 files modified

openlp/core/common/__init__.py (+8/-0)
openlp/core/common/settings.py (+2/-1)
openlp/core/lib/renderer.py (+89/-4)
openlp/core/ui/generaltab.py (+41/-1)
tests/functional/openlp_core_lib/test_image_manager.py (+2/-0)
tests/functional/openlp_core_lib/test_projector_db.py (+1/-0)
tests/functional/openlp_core_lib/test_renderer.py (+59/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2758. By Jonathan Tanner on 2017-08-11

Replaced math.inf with float(inf) for pre Python3.5 compatibility

2757. By Jonathan Tanner on 2017-08-11

Fixed PEP8 errors

2756. By Jonathan Tanner on 2017-08-10

added slide splitting controls

2755. By Raoul Snyman on 2017-08-03

Remove the version number from various places within OpenLP. Fix the import path of UiStrings.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/remove-version-number (revision 2756)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2112/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2022/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1930/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1307/
[SUCCESS] https:...

2754. By Phill on 2017-08-03

This is the first in a series of merges to switch to the pathlib module. As per tgc's request I am splitting this down into smaller parts for merging. As such, this merge works in itself, but is incomplete.

Please bear this in mind when reviewing

Also contains a fix for bible gateway

lp:~phill-ridout/openlp/pathlib1 (revision 2757)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2108/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2018/
[SUCCESS] https://ci.openlp.io/job/B...

2753. By Ken Roberts on 2017-08-01

-- Renamed test_projector_clss to clss_one
-- Added test_projector_clss_two
-- Updated PJLink non-standard class check
-- Added process_snum
-- Added tests for process_snum
-- Renamed tests/functional/openlp_core_lib/test_projectordb.py to test_projector_db.py
-- Added filter model command (rfil) -- Added lamp model command (rlmp)
-- Added tests for filter/model commands
-- Fix typo in projector status window
-- Cleanups from commit notes
-- Added invalid data buffer cleanups
-- Added calls ...

2752. By virbinarus on 2017-07-04

I removed the blank spaces from the file.
Allows service items to be expanded and collapsed with the left and right arrow keys.

lp:~virbinarus/openlp/expandserviceitem (revision 2758)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2097/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/2007/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1920/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1297/
[[1;32...

2751. By Ken Roberts on 2017-06-22

-- Fix docstring for pjlink2 db upgrade
-- Add PJLink2 module for UDP socket (skeleton)
-- Move ProjectorManager.projector_list to class attribute
-- Added database_exists check for first time install skip upgrade checks
-- Fix db upgrade for songs
-- Fix db upgrade for songusage
-- Added database_exists from sqlalchemy_utils
-- Added test for skipping upgrade on no db
-- Revert songs db upgrade_7 back to upgrade_6
-- kwargs cleanup

--------------------------------
lp:~alisonken1/openlp/pjli...

2750. By Phill on 2017-06-09

I've TODOne some of the TODO's. As well as some other clean ups

lp:~phill-ridout/openlp/TODOne (revision 2745)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/2077/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1987/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1903/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Code_Analysis/1281/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Test_Coverage/1131/
[SUCCESS] https://ci.openlp.io/job/Branch-04c-Code_Analysis2/2...

2749. By Azaziah on 2017-06-08

Fixed bugs:
Bug #1639860: Close button is disabled in numerous windows
Bug #1652559: Find duplicates wizard does not reset cursor if closed from "x" instead of "cancel" button and causes traceback on exit
Bug #1666272: Linked audio "next" button results in traceback
Bug #1678292: Space after Bible book name auto-completion is missing
Bug #1694732: wizard sub title does not wrap
Bug #1695268: Bibles plugin fails to load due to invalid "last search type"
Bug: If Bible book name contains dot aft...