lp://qastaging/~phill-ridout/openlp/no-results

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/openlp at revision 2705

Raoul Snyman: Approve on 2016-11-15

Tim Bentley: Approve on 2016-11-12

Diff: 400 lines (+145/-58)

8 files modified

openlp/core/common/uistrings.py (+2/-0)
openlp/core/lib/mediamanageritem.py (+0/-30)
openlp/core/ui/lib/listwidgetwithdnd.py (+35/-3)
openlp/plugins/bibles/lib/mediaitem.py (+4/-18)
openlp/plugins/custom/lib/mediaitem.py (+0/-2)
openlp/plugins/songs/lib/mediaitem.py (+0/-1)
tests/functional/openlp_core_ui_lib/test_listwidgetwithdnd.py (+104/-0)
tests/functional/openlp_plugins/bibles/test_mediaitem.py (+0/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2709. By Phill on 2016-11-12

Pep againbzr pushbzr push

2708. By Phill on 2016-11-12

Fixed Tests

2707. By Phill on 2016-11-12

Moved over to using UiStrings

2706. By Phill on 2016-11-11

Added test!

2705. By Phill on 2016-11-11

fix if statment

2704. By Phill on 2016-11-10

Move no results functionality to the ListWidgetWithDnD

2703. By Phill on 2016-11-05

Regenerated resources for my earlier resource clean up merge77

lp:~phill-ridout/openlp/bug1623711-part2 (revision 2703)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1813/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1724/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1662/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1416/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1006/
[SUCCESS] https://ci.openlp.io/j...

2702. By Phill on 2016-11-01

lp:~phill-ridout/openlp/bug1623711-2.4 (revision 2652)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1806/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1717/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1655/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1411/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1001/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1069/
[SUCCESS] https://ci.openlp.io/j...

2701. By Phill on 2016-11-01

Added a script to clean up the resource folder.
Ran script and made some other resource cleanup code changes.

Add this to your merge proposal:
--------------------------------
lp:~phill-ridout/openlp/resource_clean_up (revision 2705)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1803/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1714/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1652/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests...

2700. By Tim Bentley on 2016-10-26

My dad needed a report of all the songs on their database, they had 1800.
Made this into a reporting option and cleaned up the menu.
Fixed some errors spotted as well

Fixed issues and comments
1800 songs takes about 3 secs to run on my i7

lp:~trb143/openlp/reporting (revision 2701)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1801/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1712/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1650/
[SUCCESS] https://ci....