lp:~phill-ridout/openlp/search_edit

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:openlp at revision 2704

Raoul Snyman: Approve on 2016-11-14

Tim Bentley: Approve on 2016-11-12

Diff: 222 lines (+31/-44)

6 files modified

openlp/core/lib/mediamanageritem.py (+1/-1)
openlp/core/lib/searchedit.py (+8/-13)
openlp/plugins/bibles/lib/mediaitem.py (+3/-12)
openlp/plugins/custom/lib/mediaitem.py (+0/-5)
openlp/plugins/songs/lib/mediaitem.py (+0/-5)
tests/interfaces/openlp_core_lib/test_searchedit.py (+19/-8)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2706. By Phill on 2016-11-12

removed TODO comment

2705. By Phill on 2016-11-11

PEP fixes

2704. By Phill on 2016-11-11

Modified SaveEdit, so that it saves the chosen search type

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

2699. By Azaziah on 2016-10-18

- Replaced Escape item with "Show desktop"
  (Same as blank to desktop, but does not unblank).
- Combined Offline & Online help buttons into "User Manual" button,
  which launches the appropriate help based on OS. (Offline for Win/Mac)
- Improved blank to modes shortcut descriptions.
- Setting migration for old help/escape help keys.

- Fixed bugs:
https://bugs.launchpad.net/openlp/+bug/805082
https://bugs.launchpad.net/openlp/+bug/1612187
https://bugs.launchpad.net/openlp/+bug/1616441
https...

2698. By Azaziah on 2016-10-17

Fixed the issue where web bible's result in traceback in "Search while typing"
(by removing one miss-placed line)

This branch also fixes the issue where the new "Clear Bible search results" and
"Lock button" give focus to Text search if it is used in "Select" tab.

lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick (revision 2707)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1775/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Fun...

2697. By Tomas Groth on 2016-10-04

Fixes getting bible texts from CrossWalk
Fix to handling of form feed char and vertical tab char.