Merge lp:~nixcode/openlp/fairsplitting into lp:openlp
Status: | Needs review |
---|---|
Proposed branch: | lp:~nixcode/openlp/fairsplitting |
Merge into: | lp:openlp |
Diff against target: |
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) |
To merge this branch: | bzr merge lp:~nixcode/openlp/fairsplitting |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tomas Groth | Needs Information | ||
Review via email: mp+328911@code.launchpad.net |
Description of the change
Adds the option to have text split fairly between slides.
E.g. if 3 lines fit on a slide and you have a 4 line verse this adds the option to have it split 2-2 not 3-1.
lp:~nixcode/openlp/fairsplitting (revision 2758)
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
Unmerged revisions
- 2758. By Jonathan Tanner
-
Replaced math.inf with float(inf) for pre Python3.5 compatibility
- 2757. By Jonathan Tanner
-
Fixed PEP8 errors
- 2756. By Jonathan Tanner
-
added slide splitting controls
Hi Jonathan,
I think this is actually a great idea, but my main concern is how this will fit in with the new render that is being worked on in a separate branch/repo. I expect Raoul to be able to answer this.