lp:~knightrider0xd/openlp/auto-scroll-choice

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2644

Tim Bentley: Approve on 2016-04-16

Raoul Snyman: Approve on 2016-04-16

Diff: 302 lines (+168/-12)

4 files modified

openlp/core/common/settings.py (+2/-1)
openlp/core/ui/advancedtab.py (+41/-0)
openlp/core/ui/listpreviewwidget.py (+21/-9)
tests/functional/openlp_core_ui/test_listpreviewwidget.py (+104/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1550858: Choose behaviour for auto-scroll of slides in slide-controller

Wishlist

Fix Committed

Link a bug report

Related blueprints

2645. By Ian Knight on 2016-04-16

Added extra validation checks and matching tests to __recalculate_layout(), row_resized(), replace_service_item() & change_slide()

2644. By Ian Knight on 2016-04-16

Cleaned up extra brackets

2643. By Ian Knight on 2016-04-16

Added comments

2642. By Ian Knight on 2016-04-16

Merged from trunk

2641. By Ian Knight on 2016-04-16

Implemented feature, cleaned pep8 errors

2640. By Ian Knight on 2016-04-16

Implemented auto-scroll-choice

2639. By Tomas Groth on 2016-04-12

"Fix traceback when searching for book that doesn't exists in second bible. Fixes bug 1553863.
Set progress bar steps to number of chapters in zefania import.
Use standard button text in the FTW, if possible. Fixes bug 1554554.
Translation fixes. Fixes bug 1545072
Fix song tag detection. Fixes bug 1549549.
Fix a method call with too many parentheses, which fixes getting bible books from crosswalk."

2638. By Tim Bentley on 2016-04-06

Remove utils and move code to common and lib dirs, fix up tests and broken tests

2637. By Chris Hill on 2016-04-03

Fixes bug #1280295 - 'Enable natural sorting for song book searches' using get_natural_key
Now also includes natural sorting for author, topic, theme & CCLI number as well
Also refactors Songbook Search to make the database do filtering for performance rather than querying all then filtering
I've tested it on my database of 500-odd songs and it seems a little faster
Includes unit tests

--------------------------------
lp:~minkus/openlp/naturalsortsongs (revision 2519)
[SUCCESS] https://ci.op...

2636. By Ian Knight on 2016-04-03

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 ...