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:
  Raoul Snyman (raoul-snyman)
  Tim Bentley (trb143)

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

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 2693)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1743/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1654/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1592/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1348/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/938/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1006/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/874/
[SUCCESS] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/45/
-- 
Your team OpenLP Core is subscribed to branch 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-14 20:45:10 +0000
@@ -254,8 +254,8 @@
         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.quickClearButton.clicked.connect(self.on_clear_button)
+        self.advancedClearButton.clicked.connect(self.on_advanced_clear_button_clicked)
+        self.quickClearButton.clicked.connect(self.on_clear_button_clicked)
         self.advancedSearchButton.clicked.connect(self.on_advanced_search_button)
         self.quickSearchButton.clicked.connect(self.on_quick_search_button)
         # Other stuff
@@ -548,13 +548,18 @@
             self.advancedTab.setVisible(True)
             self.advanced_book_combo_box.setFocus()
 
-    def on_clear_button(self):
+    def on_clear_button_clicked(self):
         # Clear the list, then set the "No search Results" message, then clear the text field and give it focus.
         self.list_view.clear()
         self.check_search_result()
         self.quick_search_edit.clear()
         self.quick_search_edit.setFocus()
 
+    def on_advanced_clear_button_clicked(self):
+        # The same as the on_clear_button_clicked, 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: