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:
Currently preview button uses same icon as Blank to Theme and
Replace Live background uses same icon as Blank to black.
This is problematic because these icons don’t describe these
actions and may be confused with their other meanings.
Preview icon is replaced by system_mediamanager.png icon, which consists of
frame and is easily distinguishable from blank to icons.
Replace Live background icon now uses Blank to theme icon.
I feel like this describes it much better than “Blank to black”
- Removed old "Default image" settings from advanced tab.
- Removed related imports and functions.
- Renamed def on_background_color_changed to on_logo_background_color_changed
- Renamed "Default image" and related settings to "Logo" etc.
- Moved these settings to General tab from Advanced tab
- Re-wired these settings to code functions
To do:
- Remove these from advanced tab.
- Verify tests still work
