lp:~raoul-snyman/openlp/new-branding

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2709

Tim Bentley: Approve on 2016-12-14

Diff: 50931 lines (+24784/-25743)

8 files modified

openlp/.version (+1/-1)
openlp/core/resources.py (+24641/-25585)
openlp/core/ui/aboutdialog.py (+1/-0)
openlp/core/ui/lib/mediadockmanager.py (+1/-1)
openlp/core/ui/mainwindow.py (+8/-10)
openlp/core/ui/projector/sourceselectform.py (+2/-2)
resources/images/openlp-logo.svg (+107/-135)
tests/functional/openlp_core_ui/test_aboutform.py (+23/-9)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2703. By Raoul Snyman on 2016-12-13

Fix a problem with the test

2702. By Raoul Snyman on 2016-12-13

Fix a problem with the test

2701. By Raoul Snyman on 2016-12-13

Added a test

2700. By Raoul Snyman on 2016-12-13

HEAD

2699. By Raoul Snyman on 2016-12-13

Make the tabs in the media library prettier

2698. By Raoul Snyman on 2016-12-12

Update the version number to 2.5.0 just for any dev builds that might happen

2697. By Raoul Snyman on 2016-12-12

Fix the problem with the Library/Media Manager icons not showing up.

2696. By Raoul Snyman on 2016-10-23

Add new branding to OpenLP for when we get to 2.6

2695. By Raoul Snyman on 2016-08-21

Fix bug #1547964 by ignoring the exception (it's harmless)

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/disconnect-slots (revision 2697)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1746/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1657/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1595/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1351/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-...

2694. By Raoul Snyman on 2016-08-14

Fix bug #1608194 by updated OpenLP to use the new SongSelect website.

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1608194 (revision 2694)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1739/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1650/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1588/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1344/
[SUCCESS] https://ci.openlp.io/job/Branc...