raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

In this commit:

Browse Source 
- Fixed (packed) the new icon
- Improved some error messages

To do
- Write tests

Possible other changes/features that may be added later.
- Ignore '.' in Reference search for smoother searching experience
- Block spaces + single character combos since they kind of break the search.
- Listing search results when typing for Text search
This commit is contained in:
suutari-olli 2016-03-07 20:27:37 +02:00
parent 3c70500c23
commit 9b9c33123e
2 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
openlp/plugins/bibles/lib/manager.py
View File

@ -279,21 +279,21 @@ class BibleManager(RegistryProperties):
'list': get_reference_separator('sep_l_display')} 'list': get_reference_separator('sep_l_display')}
self.main_window.information_message( self.main_window.information_message(
translate('BiblesPlugin.BibleManager', 'Scripture Reference Error'), translate('BiblesPlugin.BibleManager', 'Scripture Reference Error'),
translate('BiblesPlugin.BibleManager', 'Your scripture reference is either not supported by ' translate('BiblesPlugin.BibleManager', '<strong>OpenLP couldn’t find anything '
'OpenLP or is invalid. Please make sure your reference ' 'with your search.</strong><br><br>'
'conforms to one of the following patterns or consult the manual:\n\n' 'Please make sure that your reference follows one of the following patterns:<br><br>'
'Book Chapter | John 3:16\n' 'Book Chapter | John 3:16<br>'
'Book Chapter%(range)sChapter | John 3%(range)s4\n' 'Book Chapter%(range)sChapter | John 3%(range)s4<br>'
'Book Chapter%(verse)sVerse%(range)sVerse | John 3%(verse)s16%(range)s17\n' 'Book Chapter%(verse)sVerse%(range)sVerse | John 3%(verse)s16%(range)s17<br>'
'Book Chapter%(verse)sVerse%(range)sVerse%(list)sVerse' 'Book Chapter%(verse)sVerse%(range)sVerse%(list)sVerse'
'%(range)sVerse | John 3%(verse)s16-17%(list)s20%(range)s22\n' '%(range)sVerse | John 3%(verse)s16-17%(list)s20%(range)s22<br>'
'Book Chapter%(verse)sVerse%(range)sVerse%(list)sChapter' 'Book Chapter%(verse)sVerse%(range)sVerse%(list)sChapter'
'%(verse)sVerse%(range)sVerse | John 3%(verse)s16%(range)s17%' '%(verse)sVerse%(range)sVerse | John 3%(verse)s16%(range)s17%'
'(list)s5%(verse)s7%(range)s9\n' '(list)s5%(verse)s7%(range)s9<br>'
'Book Chapter%(verse)sVerse%(range)sChapter%(verse)sVerse' 'Book Chapter%(verse)sVerse%(range)sChapter%(verse)sVerse'
' | John 3%(verse)s16%(range)s4%(verse)s2\n\n' ' | John 3%(verse)s16%(range)s4%(verse)s2<br><br>'
'Book names may be shortened from full names but must not contain any additional dots.', 'Book names may be shortened from full names<br>but must not contain any additional dots.'
'Please pay attention to the appended "s" of the wildcards ' , 'Please pay attention to the appended "s" of the wildcards '
'and refrain from translating the words inside the names in the brackets.') 'and refrain from translating the words inside the names in the brackets.')
% reference_separators % reference_separators
) )
@ -344,7 +344,8 @@ class BibleManager(RegistryProperties):
if web_bible or second_web_bible: if web_bible or second_web_bible:
self.main_window.information_message( self.main_window.information_message(
translate('BiblesPlugin.BibleManager', 'Web Bible cannot be used'), translate('BiblesPlugin.BibleManager', 'Web Bible cannot be used'),
translate('BiblesPlugin.BibleManager', 'Text Search is not available with Web Bibles.') translate('BiblesPlugin.BibleManager', 'Text Search is not available with Web Bibles.\n'
'Please use the Scripture Reference Search instead.')
) )
return None return None
if len(text) < 3 or str.isspace(text): if len(text) < 3 or str.isspace(text):
@ -352,8 +353,8 @@ class BibleManager(RegistryProperties):
translate('BiblesPlugin.BibleManager', 'Keyword is too short'), translate('BiblesPlugin.BibleManager', 'Keyword is too short'),
translate('BiblesPlugin.BibleManager', 'The keyword you have entered is empty or shorter ' translate('BiblesPlugin.BibleManager', 'The keyword you have entered is empty or shorter '
'than 3 characters long. Please try again with ' 'than 3 characters long. Please try again with '
'a longer keyword.\n \nYou can separate different keywords by ' 'a longer keyword.\n\nYou can separate different keywords by '
' a space to search for all of your keywords and you can ' 'a space to search for all of your keywords and you can '
'separate them by a comma to search for one of them.')) 'separate them by a comma to search for one of them.'))
return None return None
elif text: elif text:

15
openlp/plugins/bibles/lib/mediaitem.py
View File

@ -310,7 +310,7 @@ class BibleMediaItem(MediaManagerItem):
self.plugin.manager.media = self self.plugin.manager.media = self
self.load_bibles() self.load_bibles()
self.quick_search_edit.set_search_types([ self.quick_search_edit.set_search_types([
(BibleSearch.Combined, ':/bibles/bibles_search_reference.png', (BibleSearch.Combined, ':/bibles/bibles_search_combined.png',
translate('BiblesPlugin.MediaItem', 'Text or Scripture Reference'), translate('BiblesPlugin.MediaItem', 'Text or Scripture Reference'),
translate('BiblesPlugin.MediaItem', 'Search Text or Scripture Reference...')), translate('BiblesPlugin.MediaItem', 'Search Text or Scripture Reference...')),
(BibleSearch.Reference, ':/bibles/bibles_search_reference.png', (BibleSearch.Reference, ':/bibles/bibles_search_reference.png',
@ -704,12 +704,13 @@ class BibleMediaItem(MediaManagerItem):
self.second_search_results = \ self.second_search_results = \
self.plugin.manager.get_verses(second_bible, text, self.search_results[0].book.book_reference_id) self.plugin.manager.get_verses(second_bible, text, self.search_results[0].book.book_reference_id)
# If keyword is shorter than 3, message is given and search is finalized. # If keyword is shorter than 3, message is given and search is finalized.
# This needs to be here in order to avoid deadlock/duplicate errors.
if len(text) < 3 or str.isspace(text): if len(text) < 3 or str.isspace(text):
self.main_window.information_message( self.main_window.information_message(
translate('BiblesPlugin.BibleManager', 'Search is Empty or too Short'), translate('BiblesPlugin.BibleManager', 'Search is Empty or too Short'),
translate('BiblesPlugin.BibleManager', 'The Search you have entered is empty or shorter ' translate('BiblesPlugin.BibleManager', 'The Search you have entered is empty or shorter '
'than 3 characters long. Please try again with ' 'than 3 characters long. Please try again with '
'a longer keyword.\n \nYou can separate different keywords ' 'a longer keyword.\n\nYou can separate different keywords '
'by a space to search for all of your keywords and you can ' 'by a space to search for all of your keywords and you can '
'separate them by a comma to search for one of them.')) 'separate them by a comma to search for one of them.'))
if not self.quickLockButton.isChecked(): if not self.quickLockButton.isChecked():
@ -761,8 +762,8 @@ class BibleMediaItem(MediaManagerItem):
translate('BiblesPlugin.BibleManager', 'Nothing found'), translate('BiblesPlugin.BibleManager', 'Nothing found'),
translate('BiblesPlugin.BibleManager', '<strong>OpenLP couldn’t find ' translate('BiblesPlugin.BibleManager', '<strong>OpenLP couldn’t find '
'anything with your search.</strong><br><br>' 'anything with your search.</strong><br><br>'
'If you tried to search with Scripture Reference, please make sure that your ' 'If you tried to search with Scripture Reference, please make sure that '
'reference follows one of the following patterns:<br><br>' 'your reference follows one of the following patterns:<br><br>'
'Book Chapter | John 3:16<br>' 'Book Chapter | John 3:16<br>'
'Book Chapter%(range)sChapter | John 3%(range)s4<br>' 'Book Chapter%(range)sChapter | John 3%(range)s4<br>'
'Book Chapter%(verse)sVerse%(range)sVerse | John 3%(verse)s16%(range)s17<br>' 'Book Chapter%(verse)sVerse%(range)sVerse | John 3%(verse)s16%(range)s17<br>'
@ -771,9 +772,9 @@ class BibleMediaItem(MediaManagerItem):
'Book Chapter%(verse)sVerse%(range)sVerse%(list)sChapter' 'Book Chapter%(verse)sVerse%(range)sVerse%(list)sChapter'
'%(verse)sVerse%(range)sVerse | John 3%(verse)s16%(range)s17%' '%(verse)sVerse%(range)sVerse | John 3%(verse)s16%(range)s17%'
'(list)s5%(verse)s7%(range)s9<br>' '(list)s5%(verse)s7%(range)s9<br>'
'Book Chapter%(verse)sVerse%(range)sChapter%(verse)sVerse' 'Book Chapter%(verse)sVerse%(range)sChapter%(verse)sVerse '
' | John 3%(verse)s16%(range)s4%(verse)s2<br><br>' '| John 3%(verse)s16%(range)s4%(verse)s2<br><br>'
'Book names may be shortened from full names but' 'Book names may be shortened from full names<br>but'
' must not contain any additional dots.', ' must not contain any additional dots.',
'Please pay attention to the appended "s" of the wildcards ' 'Please pay attention to the appended "s" of the wildcards '
'and refrain from translating the words inside the names in the brackets.') 'and refrain from translating the words inside the names in the brackets.')