Merge into trunk : better-slide-scaling : Code : OpenLP

Status:	Merged
Approved by:	Tim Bentley on 2016-04-03
Approved revision:	2632
Merged at revision:	2636
Proposed branch:	lp://qastaging/~knightrider0xd/openlp/better-slide-scaling
Merge into:	lp://qastaging/openlp
Diff against target:	395 lines (+283/-9) 4 files modified openlp/core/common/settings.py (+1/-0) openlp/core/ui/advancedtab.py (+12/-0) openlp/core/ui/listpreviewwidget.py (+42/-4) tests/functional/openlp_core_ui/test_listpreviewwidget.py (+228/-5)
To merge this branch:	bzr merge lp://qastaging/~knightrider0xd/openlp/better-slide-scaling
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Tim Bentley	2016-04-01	Approve on 2016-04-03
Raoul Snyman		Approve on 2016-04-03
Review via email: mp+290694@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-03-20.

Description of the change

Adds the ability to choose a maximum height for non-text slides in the list-preview-widget in slide controllers. See branch description for further details. May require sanity check.

Changes since last proposal:
- Fixed copy-paste error in comments
- Shifted common test code into setup function as recommended.
- Testing max height doesn't exceed settings spin-box (as requested) not changed as any positive int is valid & spin-box values are arbitrary. (See reply to diff comments on r2630 for details)

lp:~knightrider0xd/openlp/better-slide-scaling (revision 2632)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1340/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1260/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1199/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1034/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/625/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/692/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/560/