OpenLP

Merge lp://qastaging/~suutari-olli/openlp/combined-bible-quick-search into lp://qastaging/openlp

combined-bible-quick-search
Merge into trunk

Proposed by Azaziah on 2016-04-04

Status:	Superseded
Proposed branch:	lp://qastaging/~suutari-olli/openlp/combined-bible-quick-search
Merge into:	lp://qastaging/openlp
Diff against target:	453 lines (+203/-73) 6 files modified openlp/core/common/uistrings.py (+36/-0) openlp/plugins/bibles/bibleplugin.py (+2/-1) openlp/plugins/bibles/lib/biblestab.py (+23/-0) openlp/plugins/bibles/lib/manager.py (+35/-33) openlp/plugins/bibles/lib/mediaitem.py (+106/-39) resources/images/openlp-2.qrc (+1/-0)
To merge this branch:	bzr merge lp://qastaging/~suutari-olli/openlp/combined-bible-quick-search
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Tim Bentley	2016-04-04	Needs Fixing on 2016-04-04
Tomas Groth	2016-04-04	Pending
Review via email: mp+290846@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2016-04-04.

This proposal has been superseded by a proposal from 2016-04-09.

Description of the change

Thank you for your review Tim,

I’ve managed to simplify the code structure.

“This needs to be broken down into vers small bits which cannot be broken. Look at the about ui for a example.”
I’m not sure if I understand what you meant with that.
The example verses need to be translatable.

I agree with you, the string with the scripture reference error is
already quite horrifying and I can remember how I used to struggle
with it for the Finnish translation. However, I feel like the
sample verses make the message much easier to understand.

If we can’t find an alternative solution for this, I propose the following:
We (I) copy paste the old translation from scripture reference error and add localized sample verses by ourselves, thus limiting the possibility of translation screw ups. By having the template and just replacing the foreign Bible book names to it, it shouldn’t take too long.

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.

"- Noticed I had left an old comment to a wrong place. (Moved it to def on_quick_reference_search)"

lp:~suutari-olli/openlp/combined-bible-quick-search (revision 2624)
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-01-Pull/1382/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-02-Functional-Tests/1300/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-03-Interface-Tests/1239/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1071/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/662/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-05a-Code_Analysis/729/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-05b-Test_Coverage/597/
------------------------------------------------------------------------------
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 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/crashing. It’s still possible to search 3 characters
separated by spaces, but that scenario is relatively rarer.

Revision history for this message

Tomas Groth (tomasgroth) wrote on 2016-03-15: Posted in a previous version of this proposal

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.

review: Needs Fixing

Revision history for this message

Tim Bentley (trb143) wrote on 2016-04-03: Posted in a previous version of this proposal

Far to complex to translate and britle needs to be refactored to something simpler.

review: Needs Fixing

Revision history for this message

Tim Bentley (trb143) wrote on 2016-04-04:

Download full text (22.8 KiB)

Not even bothered to look at. Needs to be fixed as last comment was ignored
which is not acceptable
On 4 Apr 2016 2:14 a.m., "Azaziah" <email address hidden> wrote:

Not even bothered to look at. Needs to be fixed as last comment was ignored
which is not acceptable
On 4 Apr 2016 2:14 a.m., "Azaziah" <suutari.olli@gmail.com> wrote:

> Azaziah has proposed merging
> lp:~suutari-olli/openlp/combined-bible-quick-search into lp:openlp.
>
> Requested reviews:
> Tim Bentley (trb143)
> Tomas Groth (tomasgroth)
>
> For more details, see:
>
> https://code.launchpad.net/~suutari-olli/openlp/combined-bible-quick-search/+merge/290846
>
> Thank you for your review Tim,
>
> I’ve managed to simplify the code structure.
>
> “This needs to be broken down into vers small bits which cannot be broken.
> Look at the about ui for a example.”
> I’m not sure if I understand what you meant with that.
> The example verses need to be translatable.
>
> I agree with you, the string with the scripture reference error is
> already quite horrifying and I can remember how I used to struggle
> with it for the Finnish translation. However, I feel like the
> sample verses make the message much easier to understand.
>
> If we can’t find an alternative solution for this, I propose the following:
> We (I) copy paste the old translation from scripture reference error and
> add localized sample verses by ourselves, thus limiting the possibility of
> translation screw ups. By having the template and just replacing the
> foreign Bible book names to it, it shouldn’t take too long.
>
> 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.
>
> "- Noticed I had left an old comment to a wrong place. (Moved it to def
> on_quick_reference_search)"
>
> lp:~suutari-olli/openlp/combined-bible-quick-search (revision 2624)
> [←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-01-Pull/1382/
> [←[1;32mSUCCESS←[1;m]
> https://ci.openlp.io/job/Branch-02-Functional-Tests/1300/
> [←[1;32mSUCCESS←[1;m]
> https://ci.openlp.io/job/Branch-03-Interface-Tests/1239/
> [←[1;32mSUCCESS←[1;m]
> https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1071/
> [←[1;32mSUCCESS←[1;m]
> https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/662/
> [←[1;32mSUCCESS←[1;m]
> https://ci.openlp.io/job/Branch-05a-Code_Analysis/729/
> [←[1;32mSUCCESS←[1;m]
> https://ci.openlp.io/job/Branch-05b-Test_Coverage/597/
>
> ------------------------------------------------------------------------------
> 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 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/crashing. It’s still possible to search 3
> characters
> separated by spaces, but that scenario is relatively rarer.
> --
> You are requested to review the proposed merge of
> lp:~suutari-olli/openlp/combined-bible-quick-search into lp:openlp.
>
> === modified file 'openlp/core/common/uistrings.py'
> --- openlp/core/common/uistrings.py 2016-01-23 08:15:37 +0000
> +++ openlp/core/common/uistrings.py 2016-04-04 01:13:54 +0000
> @@ -151,3 +151,22 @@
> self.Version = translate('OpenLP.Ui', 'Version')
> self.View = translate('OpenLP.Ui', 'View')
> self.ViewMode = translate('OpenLP.Ui', 'View Mode')
> + self.BibleShortSearchTitle = translate('OpenLP.Ui', 'Search is
> Empty or too Short')
> + self.BibleScriptureError = translate('OpenLP.Ui', ' Book
> Chapter | John 3:16 '
> + 'Book
> Chapter%(range)sChapter | John 3%(range)s4 '
> + 'Book
> Chapter%(verse)sVerse%(range)sVerse | John 3%(verse)'
> +
> 's16%(range)s17 Book Chapter%(verse)sVerse%(range)sVerse%'
> +
> '(list)sVerse%(range)sVerse | John 3%(verse)s16-17%(list)s20%'
> +
> '(range)s22 Book Chapter%(verse)sVerse%(range)sVerse%'
> +
> '(list)sChapter%(verse)sVerse%(range)sVerse | John 3%(verse)'
> +
> 's16%(range)s17%(list)s5%(verse)s7%(range)s9 Book Chapter%'
> +
> '(verse)sVerse%(range)sChapter%(verse)sVerse | John 3%(verse)'
> +
> 's16%(range)s4%(verse)s2 Book names may be shortened '
> + 'from full
> names, for an example: Joh 3 = John 3',
> + 'Please pay attention to the
> appended "s" of the wildcards and refrain '
> + 'from translating the words
> inside the names in the brackets.')
> + self.BibleShortSearch = translate('OpenLP.Ui', 'The
> search you have entered is empty or shorter '
> + 'than 3 characters
> long. Please try again with '
> + 'a longer
> search. You can separate different '
> + 'keywords by a
> space to search for all of your keywords and you '
> + 'can separate them
> by a comma to search for one of them.')
>
> === modified file 'openlp/plugins/bibles/lib/manager.py'
> --- openlp/plugins/bibles/lib/manager.py 2015-12-31 22:46:06 +0000
> +++ openlp/plugins/bibles/lib/manager.py 2016-04-04 01:13:54 +0000
> @@ -23,7 +23,7 @@
> import logging
> import os
>
> -from openlp.core.common import RegistryProperties, AppLocation, Settings,
> translate
> +from openlp.core.common import RegistryProperties, AppLocation, Settings,
> UiStrings, translate
> from openlp.core.utils import delete_file
> from openlp.plugins.bibles.lib import parse_reference,
> get_reference_separator, LanguageSelection
> from openlp.plugins.bibles.lib.db import BibleDB, BibleMeta
> @@ -279,21 +279,10 @@
> 'list': get_reference_separator('sep_l_display')}
> self.main_window.information_message(
> translate('BiblesPlugin.BibleManager', 'Scripture
> Reference Error'),
> - translate('BiblesPlugin.BibleManager', 'Your
> scripture reference is either not supported by '
> - 'OpenLP or is invalid. Please make sure
> your reference '
> - 'conforms to one of the following patterns
> or consult the manual:\n\n'
> - 'Book Chapter\n'
> - 'Book Chapter%(range)sChapter\n'
> - 'Book Chapter%(verse)sVerse%(range)sVerse\n'
> - 'Book
> Chapter%(verse)sVerse%(range)sVerse%(list)sVerse'
> - '%(range)sVerse\n'
> - 'Book
> Chapter%(verse)sVerse%(range)sVerse%(list)sChapter'
> - '%(verse)sVerse%(range)sVerse\n'
> - 'Book
> Chapter%(verse)sVerse%(range)sChapter%(verse)sVerse',
> - 'Please pay attention to the appended "s"
> of the wildcards '
> - 'and refrain from translating the words
> inside the names in the brackets.')
> - % reference_separators
> - )
> + translate('BiblesPlugin.BibleManager',
> 'OpenLP couldn’t find anything '
> + 'with your
> search. '
> + 'Please make sure that your reference
> follows one of these patterns:%s'
> + % UiStrings().BibleScriptureError %
> reference_separators))
> return None
>
> def get_language_selection(self, bible):
> @@ -339,22 +328,40 @@
> if second_bible:
> second_web_bible =
> self.db_cache[second_bible].get_object(BibleMeta, 'download_source')
> if web_bible or second_web_bible:
> + self.application.set_normal_cursor()
> self.main_window.information_message(
> 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
> - if text:
> + if len(text) - text.count(' ') < 3:
> + self.main_window.information_message(
> + ('%s' % UiStrings().BibleShortSearchTitle),
> + ('%s' % UiStrings().BibleShortSearch))
> + return None
> + elif text:
> return self.db_cache[bible].verse_search(text)
> else:
> - self.main_window.information_message(
> - translate('BiblesPlugin.BibleManager', 'Scripture
> Reference Error'),
> - translate('BiblesPlugin.BibleManager', 'You did not enter
> a search keyword.\nYou can separate '
> - 'different keywords by a space to search for
> all of your keywords and you can separate '
> - 'them by a comma to search for one of them.')
> - )
> return None
>
> + def get_verses_combined(self, bible, verse_text, book_ref_id=False,
> show_error=False):
> + log.debug('BibleManager.get_verses("%s", "%s")', bible,
> verse_text)
> + if not bible:
> + if show_error:
> + self.main_window.information_message(
> + translate('BiblesPlugin.BibleManager', 'No Bibles
> Available'),
> + translate('BiblesPlugin.BibleManager', 'There are
> no Bibles currently installed. Please use the'
> + ' Import Wizard to install one or more
> Bibles.')
> + )
> + return None
> + language_selection = self.get_language_selection(bible)
> + ref_list = parse_reference(verse_text, self.db_cache[bible],
> language_selection, book_ref_id)
> + if ref_list:
> + return self.db_cache[bible].get_verses(ref_list,
> show_error)
> + else:
> + return None
> +
> def save_meta_data(self, bible, version, copyright, permissions,
> book_name_language=None):
> """
> Saves the bibles meta data.
>
> === modified file 'openlp/plugins/bibles/lib/mediaitem.py'
> --- openlp/plugins/bibles/lib/mediaitem.py 2016-01-08 17:44:47 +0000
> +++ openlp/plugins/bibles/lib/mediaitem.py 2016-04-04 01:13:54 +0000
> @@ -45,6 +45,7 @@
> """
> Reference = 1
> Text = 2
> + Combined = 3
>
>
> class BibleMediaItem(MediaManagerItem):
> @@ -309,6 +310,9 @@
> self.plugin.manager.media = self
> self.load_bibles()
> self.quick_search_edit.set_search_types([
> + (BibleSearch.Combined, ':/bibles/bibles_search_combined.png',
> + translate('BiblesPlugin.MediaItem', 'Text or Scripture
> Reference'),
> + translate('BiblesPlugin.MediaItem', 'Text or Scripture
> Reference...')),
> (BibleSearch.Reference,
> ':/bibles/bibles_search_reference.png',
> translate('BiblesPlugin.MediaItem', 'Scripture
> Reference'),
> translate('BiblesPlugin.MediaItem', 'Search Scripture
> Reference...')),
> @@ -423,7 +427,7 @@
> def update_auto_completer(self):
> """
> This updates the bible book completion list for the search field.
> The completion depends on the bible. It is
> - only updated when we are doing a reference search, otherwise the
> auto completion list is removed.
> + only updated when we are doing reference or combined search, in
> text search the completion list is removed.
> """
> log.debug('update_auto_completer')
> # Save the current search type to the configuration.
> @@ -431,8 +435,8 @@
> # Save the current bible to the configuration.
> Settings().setValue(self.settings_section + '/quick bible',
> self.quickVersionComboBox.currentText())
> books = []
> - # We have to do a 'Reference Search'.
> - if self.quick_search_edit.current_search_type() ==
> BibleSearch.Reference:
> + # We have to do a 'Reference Search' (Or as part of Combined
> Search).
> + if self.quick_search_edit.current_search_type() is not
> BibleSearch.Text:
> bibles = self.plugin.manager.get_bibles()
> bible = self.quickVersionComboBox.currentText()
> if bible:
> @@ -648,10 +652,59 @@
> self.check_search_result()
> self.application.set_normal_cursor()
>
> + def on_quick_reference_search(self):
> + # We are doing a 'Reference Search'.
> + bible = self.quickVersionComboBox.currentText()
> + second_bible = self.quickSecondComboBox.currentText()
> + # Get input from field and replace '. ' with ''
> + # This will check if field has any '.' and removes them. Eg. Gen.
> 1 = Gen 1 = Genesis 1
> + text_direct = self.quick_search_edit.text()
> + text = text_direct.replace('. ', ' ')
> + if self.quick_search_edit.current_search_type() ==
> BibleSearch.Reference:
> + self.search_results = self.plugin.manager.get_verses(bible,
> text)
> + else:
> + self.search_results =
> self.plugin.manager.get_verses_combined(bible, text)
> + if second_bible and self.search_results:
> + self.second_search_results = \
> + self.plugin.manager.get_verses(second_bible, text,
> self.search_results[0].book.book_reference_id)
> +
> + def on_quick_text_search(self):
> + # We are doing a 'Text Search'.
> + bible = self.quickVersionComboBox.currentText()
> + second_bible = self.quickSecondComboBox.currentText()
> + text = self.quick_search_edit.text()
> + self.application.set_busy_cursor()
> + bibles = self.plugin.manager.get_bibles()
> + self.search_results = self.plugin.manager.verse_search(bible,
> second_bible, text)
> + if second_bible and self.search_results:
> + text = []
> + new_search_results = []
> + count = 0
> + passage_not_found = False
> + for verse in self.search_results:
> + db_book =
> bibles[second_bible].get_book_by_book_ref_id(verse.book.book_reference_id)
> + if not db_book:
> + log.debug('Passage "%s %d:%d" not found in Second
> Bible' %
> + (verse.book.name, verse.chapter,
> verse.verse))
> + passage_not_found = True
> + count += 1
> + continue
> + new_search_results.append(verse)
> + text.append((verse.book.book_reference_id, verse.chapter,
> verse.verse, verse.verse))
> + if passage_not_found:
> + self.main_window.information_message(
> + translate('BiblesPlugin.MediaItem', 'Information'),
> + translate('BiblesPlugin.MediaItem', 'The second Bible
> does not contain all the verses '
> + 'that are in the
> main Bible. Only verses found in both Bibles '
> + 'will be shown.
> %d verses have not been included '
> + 'in the
> results.') % count)
> + self.search_results = new_search_results
> + self.second_search_results =
> bibles[second_bible].get_verses(text)
> +
> def on_quick_search_button(self):
> """
> - Does a quick search and saves the search results. Quick search
> can either be "Reference Search" or
> - "Text Search".
> + Does a quick search and saves the search results. Quick search
> can be:
> + "Reference Search" or "Text Search" or Combined search.
> """
> log.debug('Quick Search Button clicked')
> self.quickSearchButton.setEnabled(False)
> @@ -660,40 +713,49 @@
> second_bible = self.quickSecondComboBox.currentText()
> text = self.quick_search_edit.text()
> if self.quick_search_edit.current_search_type() ==
> BibleSearch.Reference:
> - # We are doing a 'Reference Search'.
> - self.search_results = self.plugin.manager.get_verses(bible,
> text)
> - if second_bible and self.search_results:
> - self.second_search_results = \
> - self.plugin.manager.get_verses(second_bible, text,
> self.search_results[0].book.book_reference_id)
> - else:
> - # We are doing a 'Text Search'.
> - self.application.set_busy_cursor()
> - bibles = self.plugin.manager.get_bibles()
> - self.search_results = self.plugin.manager.verse_search(bible,
> second_bible, text)
> - if second_bible and self.search_results:
> - text = []
> - new_search_results = []
> - count = 0
> - passage_not_found = False
> - for verse in self.search_results:
> - db_book =
> bibles[second_bible].get_book_by_book_ref_id(verse.book.book_reference_id)
> - if not db_book:
> - log.debug('Passage "%s %d:%d" not found in Second
> Bible' %
> - (verse.book.name, verse.chapter,
> verse.verse))
> - passage_not_found = True
> - count += 1
> - continue
> - new_search_results.append(verse)
> - text.append((verse.book.book_reference_id,
> verse.chapter, verse.verse, verse.verse))
> - if passage_not_found:
> - QtWidgets.QMessageBox.information(
> - self, translate('BiblesPlugin.MediaItem',
> 'Information'),
> - translate('BiblesPlugin.MediaItem', 'The second
> Bible does not contain all the verses '
> - 'that are in the main Bible. Only
> verses found in both Bibles will be shown. %d '
> - 'verses have not been included in the
> results.') % count,
> -
> QtWidgets.QMessageBox.StandardButtons(QtWidgets.QMessageBox.Ok))
> - self.search_results = new_search_results
> - self.second_search_results =
> bibles[second_bible].get_verses(text)
> + # We are doing a 'Reference Search'. (Get script from def
> on_quick_reference_search)
> + self.on_quick_reference_search()
> + elif self.quick_search_edit.current_search_type() ==
> BibleSearch.Text:
> + # We are doing a 'Text Search'. (Get script from def
> on_quick_text_search)
> + self.on_quick_text_search()
> + # Combined search, starting with reference search.
> + elif self.quick_search_edit.current_search_type() ==
> BibleSearch.Combined:
> + self.on_quick_reference_search()
> + # If keyword is shorter than 3 (not including spaces), message is
> given and search is finalized.
> + # It's actually to find verses with less than 3 chars (Eg. G1 =
> Genesis 1) thus this error is not shown if
> + # any results are found. This check needs to be here in order to
> avoid duplicate errors.
> + if not self.search_results and len(text) - text.count(' ') <
> 3:
> + self.main_window.information_message(
> + ('%s' % UiStrings().BibleShortSearchTitle),
> + ('%s' % UiStrings().BibleShortSearch))
> + # Text search starts here if no reference was found and
> keyword is longer than 2.
> + # This is required in order to avoid duplicate error messages
> for short keywords.
> + if not self.search_results and len(text) - text.count(' ') >
> 2:
> + self.on_quick_text_search()
> + # If no Text or Reference is found, message is given.
> + if not self.search_results:
> + self.application.set_normal_cursor()
> + reference_separators = {
> + 'verse':
> get_reference_separator('sep_v_display'),
> + 'range':
> get_reference_separator('sep_r_display'),
> + 'list':
> get_reference_separator('sep_l_display')}
> +
> self.main_window.information_message(translate('BiblesPlugin.BibleManager',
> 'Nothing found'),
> +
> translate('BiblesPlugin.BibleManager', 'OpenLP '
> +
> 'couldn’t find '
> +
> 'anything with your'
> +
> ' search.'
> +
> ' '
> +
> 'If you tried to '
> +
> 'search with '
> +
> 'Scripture '
> +
> 'Reference, please '
> +
> 'make sure that '
> +
> 'your reference '
> +
> 'follows one of '
> +
> 'these patterns:%s'
> + %
> UiStrings().BibleScriptureError %
> +
> reference_separators))
> + # Finalizing the search
> if not self.quickLockButton.isChecked():
> self.list_view.clear()
> if self.list_view.count() != 0 and self.search_results:
>
> === modified file 'resources/images/openlp-2.qrc'
> --- resources/images/openlp-2.qrc 2016-02-06 17:50:58 +0000
> +++ resources/images/openlp-2.qrc 2016-04-04 01:13:54 +0000
> @@ -30,6 +30,7 @@
> <file>image_new_group.png</file>
> </qresource>
> <qresource prefix="bibles">
> + <file>bibles_search_combined.png</file>
> <file>bibles_search_text.png</file>
> <file>bibles_search_reference.png</file>
> <file>bibles_upgrade_alert.png</file>
>
>
>

Revision history for this message

Tim Bentley (trb143) wrote on 2016-04-04:

Look at about.py
Break the string in to small chunks which can be translated and then glue the lot together.

Simple 1 and 2 word phrases can be translated 10 lines of complex structure where there is no clue what needs to be done is not correct.

Also reply to comments in the comment section not the to section it gets missed.

review: Needs Fixing

lp://qastaging/~suutari-olli/openlp/combined-bible-quick-search updated on 2016-07-31

2626. By Azaziah on 2016-04-06

In this merge:
Splitted scripture reference error into small pieces, built error from them.
This still needs to be moved away from uistrings.py

2627. By Azaziah on 2016-04-09

Noticed "No bibles available" was defined 3 times > Moved it to uistrings.
Added "Must have bibles" condition for other error messages in combined search.

To do:

Add a setting for controlling visibility of the no results error, it may be of annoyance.
Tests...

2628. By Azaziah on 2016-04-09

Added "Search Settings" > "Don't show error fofr no results in combined quick search" checkbox
for controlling whetever no results message is shown or not.

2629. By Azaziah on 2016-04-09

- Fixed layout for the new setting, cleanup for biblestab.py from process.

2630. By Azaziah on 2016-04-09

Merge to trunk on 9.4.16

2631. By Azaziah on 2016-04-09

Noticed the identification for scripture reference error got messed at some point, fixed it.
Also renamed "Interval" to "gap" to make constructing the message less painful.

2632. By Azaziah on 2016-04-10

In this commit:
- Cleanup of the scripture reference error. (Now using full names, removed one un-needed line)
- Added more comments
- Removed def get_verses_combined, now triggering the error message on mediaitem based on search mode instead.

2633. By Azaziah on 2016-04-28

Commit for merging trunk.

This also has a broken test.

2634. By Azaziah on 2016-04-28

Merged trunk on 28.4.16, removed broken test.

2635. By Azaziah on 2016-04-28

Added a setting for automatically resetting the Quick search type to "Combined" on startup.
This setting is by default enabled. (I Feel like some users may get confused if their search
has changed to Text or Reference)

2636. By Azaziah on 2016-04-28

Reworked UI messages on new settings, pep8 fixes.

2637. By Azaziah on 2016-04-28

Code cleanup, (Removed def banana)

2638. By Azaziah on 2016-04-29

Added a test for checking that all the general required stuff is called on quick search.

2639. By Azaziah on 2016-04-30

- Removed un-needed import that was added earlier
- Pep8 fixes

2640. By Azaziah on 2016-04-30

New line is now after ( in biblestab, hopefully this fixes pep8.

2641. By Azaziah on 2016-05-02

- Added "Search while typing" feature for Bible Quick search.
- Added a Setting for controlling this ^^ behaviour
- Refactored some code to avoid duplicate error messages

2642. By Azaziah on 2016-05-02

- Fixed the setting. (Was directed to another setting on one connection)
- Pep8

2643. By Azaziah on 2016-05-02

Improved one comment.

2644. By Azaziah on 2016-05-02

Removed # Cherry comment which I made earlier to locate some code.

2645. By Azaziah on 2016-05-02

Improved the UI message for the new setting.

2646. By Azaziah on 2016-05-02

- Renamed one new function to better describe the action
- Removed 3rd empty line after imports

2647. By Azaziah on 2016-05-02

Improved a bunch of comments.

2648. By Azaziah on 2016-05-02

Changed the requested python2 stuff into python 3 stuff.

2649. By Azaziah on 2016-05-02

Added . to the end of web bibles sentence.

is installed as Web Bible.

2650. By Azaziah on 2016-05-11

- Improved the timer method, resulting in much smoother searches.

2651. By Azaziah on 2016-05-11

- Merged trunk on 11.5.16

2652. By Azaziah on 2016-05-15

- Fixed the dot chechk method.
(No longer removes dot after numbers, eg. 1.)

2653. By Azaziah on 2016-05-15

- Noticed this had a conflict, fixed it, improved comments

2654. By Azaziah on 2016-05-15

- Fixed Settings().Value to .value

2655. By Azaziah on 2016-05-15

- Fixed the test

2656. By Azaziah on 2016-05-15

Removed 2nd blank line from end of the uistrings.

2657. By Azaziah on 2016-05-20

- Merged trunk on 21.5.16

2658. By Azaziah on 2016-05-20

- Removed the unrequired %s complications from "No Bibles installed"

2659. By Azaziah on 2016-05-20

- Removed unrequired % s complications from short search messsage.

2660. By Azaziah on 2016-06-05

- Created "def verse_search_while_typing"
/ This does not trigger web bibles error message and is
used during search while typing.
- Removed the new/old setting created for the old solution

2661. By Azaziah on 2016-06-05

- Merged trunk on 5.6.16
- Removed some additional error messages from "Search while typing"
(Count verses not found in both bibles, no Bibles installed)

2662. By Azaziah on 2016-06-05

- Removed one old comment related to old setting and old solution

2663. By Azaziah on 2016-06-11

- Added "Search too short for search while typing" message to search results
!! Need to rename this from: search_results_banana to something smarter.
- Fixed "," breaking OLP if it's the last char in text search.
- "," no longer separates keywords in Text search.
- Removed mention about separating keywords with "," from the empty search message.
- Started working on not duplicating search results on "Lock search results" > THIS DOES NOT WORK YET.

2664. By Azaziah on 2016-06-12

- Improved the "Too short search" item functionality.
- Improved some comments.

2665. By Azaziah on 2016-06-14

- Improved the "Search too short" message for Quick search.
(Reference search just uses "No search results for now")
- Reverted the attempt to stop duplicated search results if search results are locked,
(This is something that I havn't figured out how to do)

2666. By Azaziah on 2016-06-14

- Some code cleanup

2667. By Azaziah on 2016-06-14

- Merged trunk on 14.6.16

To do?
- Add clear search results button for locked Bible search results
- Prevent duplicated search results on "Lock search results"

2668. By Azaziah on 2016-06-14

- Added "Clear search results" button to Quick & Advanced search.
> Added a new icon for this: http://www.1001freedownloads.com/free-clipart/tango-edit-clear
^^CC0 1.0 Universal (CC0 1.0)

2669. By Azaziah on 2016-06-14

- Code cleanup (Removed 2 un-required empty rows)

2670. By Azaziah on 2016-06-16

- Added the Images by using "bzr add"

E:\bzr\openlp\combined-reference-and-text-search>bzr add E:\bzr\openlp\combined-
reference-and-text-search\resources\images
adding resources/images/bibles_search_clear.png
adding resources/images/bibles_search_combined.png

2671. By Azaziah on 2016-06-16

- Clear the results button now also clears the text input field and gives it focus.

2672. By Azaziah on 2016-07-24

Changed icons to oxygen icons.

2673. By Azaziah on 2016-07-24

- merged trunk on 24.7.16

2674. By Azaziah on 2016-07-28

- Merged trunk on 28.7.16

2675. By Azaziah on 2016-07-28

- Removed the clean icon manual sizing.

2676. By Azaziah on 2016-07-30

- Changed the Clear button to use QToolButton instead of QPushButton.
(Fixes the issue where the clear button is larger than the lock button).

2677. By Azaziah on 2016-07-30

- Lock button now gives focus to Search field.

2678. By Azaziah on 2016-07-31

- Replaced the new icons with 48x48 versions.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes:

Daniel Borges

Samuel Sjöbergsson

OpenLP

Merge lp://qastaging/~suutari-olli/openlp/combined-bible-quick-search into lp://qastaging/openlp

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers