lp:~chris.2ndtheme/openlp/secondTheme

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

Raoul Snyman: Needs Fixing on 2016-05-07

Diff: 1665 lines (+1017/-47)

15 files modified

openlp/core/common/uistrings.py (+1/-0)
openlp/core/lib/formattingtags.py (+29/-2)
openlp/core/lib/json/theme.json (+20/-0)
openlp/core/lib/renderer.py (+11/-2)
openlp/core/lib/theme.py (+93/-0)
openlp/core/ui/themeform.py (+88/-0)
openlp/core/ui/thememanager.py (+8/-1)
openlp/core/ui/themewizard.py (+105/-0)
openlp/plugins/songs/forms/editversedialog.py (+4/-0)
openlp/plugins/songs/forms/editverseform.py (+67/-0)
resources/forms/editversedialog.ui (+29/-13)
resources/forms/themewizard.ui (+506/-28)
tests/functional/openlp_core_lib/test_theme.py (+2/-1)
tests/functional/openlp_plugins/songs/test_editverseform.py (+43/-0)
tests/resources/themes/Default/Default.xml (+11/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2660. By Christian Wöhr on 2016-07-10

Added Tests
removed unnecessary imports

2659. By Christian Wöhr on 2016-06-05

unlinked formattingtags and theme again

2658. By Christian Wöhr on 2016-05-24

rename of variables

2657. By Christian Wöhr on 2016-05-06

Init

2656. By Ken Roberts on 2016-05-02

- Convert strings in mainwindow.py
- Convert strings in maindisplay.py
- Added test for projector Manufacturer.__repr__()
- pep8 in tests/functional/openlp_plugins/songs/test_openlpimporter.py

--------------------------------
lp:~alisonken1/openlp/strings_mainwindow (revision 2656)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1512/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1423/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1361/
[SUCCESS] https://ci.o...

2655. By Samuel Mehrbrodt on 2016-04-29

Fix performance regression with Songbook search

The problem was that in each iteration the database was accessed (the song object).
Fixed this by loading all neccessary information directly in the query.

2654. By Raoul Snyman on 2016-04-27

Fix bug #1557514 by auto-detecting the columns of the tables in the songs database

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1557514 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1503/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1414/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1352/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1148/
[SUCCESS] https://ci.openlp...

2653. By Ian Knight on 2016-04-27

Added QR code and link to iOS remote app and test to HTML Builder.

lp:~knightrider0xd/openlp/ios-app (revision 2650)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1499/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1410/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1348/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1145/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/736/
[SUCCESS] https://ci.openlp.io/job/B...

2652. By Tomas Groth on 2016-04-27

Added support for importing SWORD bibles using PySword.

2651. By Chris Hill on 2016-04-26

Natural sort for authors, topics, songbooks, themes in Edit Song comboboxen & Song Maintenance form, as mentioned previously by Raoul - Matthew 21:28–29! :)

Also some minor fixes that I picked up after merge 2637 for natural sorting:
x Author, Topics, Theme search were performing two sorts (one database sort, then a natural sort in code). Removed the first database sort.
x Changed all sorting to use in-place sort() rather than copy sorted(), as apparently there's a speed bonus (http://stacko...