openlp-core team mailing list archive

[Azaziah <suutari.olli@xxxxxxxxx>]

Azaziah has proposed merging lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick/+merge/302597

This branch fixes the issue where the new Clear Bible search results butto gives focus to Text search if it is used in "Select" tab.

lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick (revision 2691)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1713/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1624/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1562/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1324/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/914/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/982/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/850/
[SUCCESS] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/27/
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick into lp:openlp.

=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
--- openlp/plugins/bibles/lib/mediaitem.py	2016-08-10 18:31:33 +0000
+++ openlp/plugins/bibles/lib/mediaitem.py	2016-08-10 21:34:12 +0000
@@ -254,7 +254,7 @@
         self.quickStyleComboBox.activated.connect(self.on_quick_style_combo_box_changed)
         self.advancedStyleComboBox.activated.connect(self.on_advanced_style_combo_box_changed)
         # Buttons
-        self.advancedClearButton.clicked.connect(self.on_clear_button)
+        self.advancedClearButton.clicked.connect(self.on_clear_button_advanced)
         self.quickClearButton.clicked.connect(self.on_clear_button)
         self.advancedSearchButton.clicked.connect(self.on_advanced_search_button)
         self.quickSearchButton.clicked.connect(self.on_quick_search_button)
@@ -555,6 +555,11 @@
         self.quick_search_edit.clear()
         self.quick_search_edit.setFocus()
 
+    def on_clear_button_advanced(self):
+        # The same as the on_clear_button, but does not give focus to Quick search field.
+        self.list_view.clear()
+        self.check_search_result()
+
     def on_lock_button_toggled(self, checked):
         self.quick_search_edit.setFocus()
         if checked: