Merge lp://qastaging/~suutari-olli/openlp/combined-bible-quick-search into lp://qastaging/openlp
Status: | Superseded |
---|---|
Proposed branch: | lp://qastaging/~suutari-olli/openlp/combined-bible-quick-search |
Merge into: | lp://qastaging/openlp |
Diff against target: |
290 lines (+142/-35) 4 files modified
openlp/core/common/uistrings.py (+19/-0) openlp/plugins/bibles/lib/manager.py (+31/-24) openlp/plugins/bibles/lib/mediaitem.py (+91/-11) resources/images/openlp-2.qrc (+1/-0) |
To merge this branch: | bzr merge lp://qastaging/~suutari-olli/openlp/combined-bible-quick-search |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tomas Groth | Needs Fixing | ||
Review via email:
|
This proposal has been superseded by a proposal from 2016-04-03.
Description of the change
This branch introduces following improvements to Quick Bible search:
- Combined Reference/Text search which first performs the Reference
search and then moves to Text search if nothing is found.
- Possibility to use “.” when shortening Book names in Reference search.
For an example Gen. 1 = Gen 1 = Genesis 1.
- New/Improved error messages (E.g. added actual example verses to Reference error)
(Parts of the new messages are Bolded so <br> is required since \n does not work with bolding)
This branch also prevents users from performing Text searches which are:
- Shorter than 3 characters long (not including spaces)
- Searches consisting from only spaces
These currently possible bad search quarries result in LONG search times
and program instability/
separated by spaces, but that scenario is relatively rarer.
No test(s) are yet included, if they must be, what should be tested?
lp:~suutari-olli/openlp/combined-bible-quick-search (revision 2619)
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;32mSUCCESS
[←[1;31mFAILURE
Please don't include the changed resources.py in the merge request, it makes it impossible to see the code that has actually been changed.
Places the new image in "resources/images/" if it is not already there, but during the test/review process don't include the updated resources.py. We'll generate it locally for testing.