You will need to
manually delete the __pycache__ directory inside openlp_core_utils.
run "bzr resolve openlp_core_utils"
then you will be allowed to commit the changes.
also resolved conflict for advancedtab.py
Refactored the code for combined search.
- Added: def on_quick_reference_search(self): and moved definition of reference search there.
- Added: def on_quick_text_search(self): and moved definition of text search there.
- Removed some un-needed code duplicates (Double finalizing, 3rd normalizing of mouse cursor)
- Searching scripture ref with shorter than 3 char search is now possible (G1 = Genesis 1)
Also removed “Search” from “Search Text or Reference…” since it does not fit the box properly.
Now also includes natural sorting for author, topic, theme & CCLI number as well
Also refactors Songbook Search to make the database do filtering for performance rather than querying all then filtering
I've tested it on my database of 500-odd songs and it seems a little faster
Includes unit tests
--------------------------------
lp:~minkus/openlp/naturalsortsongs (revision 2519)
[SUCCESS] https://ci.op...
bzr-revno: 2637
Fixes: https://launchpad.net/bugs/1280295
Changes since last proposal:
- Fixed copy-paste error in comments
- Shifted common test code into setup function as recommended.
- Testing max height doesn't exceed settings spin-box (as requested) not changed as any positive int is valid & spin-box values are arbitrary. (See reply to diff comments on r2630 for ...
bzr-revno: 2636
Fixes: https://launchpad.net/bugs/891860, https://launchpad.net/bugs/1550856
These changes mainly take place on mainwindow.py but few other strings are changed as well.
Media Manager, Projector Manager, Service Manager, Theme Manager, Preview Panel and Live Panel.
have been renamed to: ”Library, Projectors, Service, Themes, Preview and Live."
Tooltips/texts for these have been changed.
In "Configurate OpenLP":
- Changed typing for all labels to lowercase
(Expect for starting videos automatically, that string may needs to be changed once bug related to that is fixed)
- Removed "Manager" from some strings since it's no longer used.
- Added dots to various tooltips / descriptions.
In advanced tab: Number of recent files to display: has been changed to Number of recent Service files to display:
