lp:~richie-the-g/openlp/sec-global-option

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:openlp

Tim Bentley: Needs Fixing on 2016-05-18

Diff: 272 lines (+96/-4)

7 files modified

openlp/core/lib/serviceitem.py (+3/-0)
openlp/core/ui/maindisplay.py (+0/-2)
openlp/core/ui/slidecontroller.py (+21/-0)
openlp/plugins/bibles/bibleplugin.py (+3/-1)
openlp/plugins/bibles/lib/biblestab.py (+34/-0)
openlp/plugins/songs/lib/songstab.py (+32/-0)
openlp/plugins/songs/songsplugin.py (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2641. By Richard Graham on 2016-05-17

Added Slide options to Bible passages as well as songs. Didn't do Custom Slides as the user can decide to add an end character simply by typing it in. (Updated base OLP version)

2640. By Richard Graham on 2016-05-17

Added Slide options to Bible passages as well as songs. Didn't do Custom Slides as the user can decide to add an end character simply by typing it in.

2639. By Richard Graham on 2016-04-12

Updated a small syntax error picked up. Also included a dropdown for the end info bit, allowing for all slides, the first shown slide, or the last slide in song only.

2638. By Richard Graham on 2016-04-04

Added option to include a character at the end of a final slide of a song. Formerly this was part of the theme definition; it has been shifted to the global song settings.

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

2635. By Tim Bentley on 2016-04-03

More refactoring

2634. By Ian Knight on 2016-04-03

Adds support for importing ProPresenter 5 and 6 files. See branch description for further details.

lp:~knightrider0xd/openlp/propresenter_5-6_import (revision 2634)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1352/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1271/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1210/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1044/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface...

2633. By Ken Roberts on 2016-04-03

"- Fix str.decode() exception when using -d option
- Fix projector try...except block issues with Qt5
- Added test for projector receiving command INST data

[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1371/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1290/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1229/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1061/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/65..."

2632. By Tim Bentley on 2016-03-31

Start to refactor code structure