Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sat Nov 17 12:45:58 2018 +0100
+++ b/Documentation/Help/source.qhp	Sat Nov 17 15:07:53 2018 +0100
@@ -14060,6 +14060,7 @@
       <keyword name="SearchWidget.__findNextPrev" id="SearchWidget.__findNextPrev" ref="eric6.Helpviewer.SearchWidget.html#SearchWidget.__findNextPrev" />
       <keyword name="SearchWidget.__findNextPrev" id="SearchWidget.__findNextPrev" ref="eric6.WebBrowser.SearchWidget.html#SearchWidget.__findNextPrev" />
       <keyword name="SearchWidget.__findNextPrevCallback" id="SearchWidget.__findNextPrevCallback" ref="eric6.WebBrowser.SearchWidget.html#SearchWidget.__findNextPrevCallback" />
+      <keyword name="SearchWidget.__resetSearch" id="SearchWidget.__resetSearch" ref="eric6.WebBrowser.SearchWidget.html#SearchWidget.__resetSearch" />
       <keyword name="SearchWidget.__searchTextEdited" id="SearchWidget.__searchTextEdited" ref="eric6.Helpviewer.SearchWidget.html#SearchWidget.__searchTextEdited" />
       <keyword name="SearchWidget.__searchTextEdited" id="SearchWidget.__searchTextEdited" ref="eric6.WebBrowser.SearchWidget.html#SearchWidget.__searchTextEdited" />
       <keyword name="SearchWidget.__setFindtextComboBackground" id="SearchWidget.__setFindtextComboBackground" ref="eric6.Helpviewer.SearchWidget.html#SearchWidget.__setFindtextComboBackground" />

--- a/Documentation/Source/eric6.WebBrowser.SearchWidget.html	Sat Nov 17 12:45:58 2018 +0100
+++ b/Documentation/Source/eric6.WebBrowser.SearchWidget.html	Sat Nov 17 15:07:53 2018 +0100
@@ -69,6 +69,9 @@
 <td><a href="#SearchWidget.__findNextPrevCallback">__findNextPrevCallback</a></td>
 <td>Private method to process the result of the last search.</td>
 </tr><tr>
+<td><a href="#SearchWidget.__resetSearch">__resetSearch</a></td>
+<td>Private method to reset the last search.</td>
+</tr><tr>
 <td><a href="#SearchWidget.__searchTextEdited">__searchTextEdited</a></td>
 <td>Private slot to perform an incremental search.</td>
 </tr><tr>
@@ -138,7 +141,12 @@
 <dd>
 flag indicating if the last search succeeded
 </dd>
-</dl><a NAME="SearchWidget.__searchTextEdited" ID="SearchWidget.__searchTextEdited"></a>
+</dl><a NAME="SearchWidget.__resetSearch" ID="SearchWidget.__resetSearch"></a>
+<h4>SearchWidget.__resetSearch</h4>
+<b>__resetSearch</b>(<i></i>)
+<p>
+        Private method to reset the last search.
+</p><a NAME="SearchWidget.__searchTextEdited" ID="SearchWidget.__searchTextEdited"></a>
 <h4>SearchWidget.__searchTextEdited</h4>
 <b>__searchTextEdited</b>(<i>txt</i>)
 <p>

--- a/WebBrowser/SearchWidget.py	Sat Nov 17 12:45:58 2018 +0100
+++ b/WebBrowser/SearchWidget.py	Sat Nov 17 15:07:53 2018 +0100
@@ -184,12 +184,19 @@
         
         self.__setFindtextComboBackground(False)
         self.show()
-
+    
+    def __resetSearch(self):
+        """
+        Private method to reset the last search.
+        """
+        self.__mainWindow.currentBrowser().findText("")
+    
     @pyqtSlot()
     def on_closeButton_clicked(self):
         """
         Private slot to close the widget.
         """
+        self.__resetSearch()
         self.close()
     
     def keyPressEvent(self, event):
@@ -203,6 +210,7 @@
             if cb:
                 cb.setFocus(Qt.ActiveWindowFocusReason)
             event.accept()
+            self.__resetSearch()
             self.close()
     
     def __setFindtextComboBackground(self, error):

--- a/WebBrowser/WebBrowserView.py	Sat Nov 17 12:45:58 2018 +0100
+++ b/WebBrowser/WebBrowserView.py	Sat Nov 17 15:07:53 2018 +0100
@@ -1752,6 +1752,8 @@
         """
         Private method to handle the loadStarted signal.
         """
+        # reset search
+        self.findText("")
         self.__isLoading = True
         self.__progress = 0