diff -r a56c297bfd61 -r b8005dd4fc9b src/eric7/ViewManager/ViewManager.py
--- a/src/eric7/ViewManager/ViewManager.py Mon Mar 27 22:05:05 2023 +0200
+++ b/src/eric7/ViewManager/ViewManager.py Tue Mar 28 10:14:23 2023 +0200
@@ -160,27 +160,17 @@
self.ui = ui
self.dbs = dbs
- self.__searchWidget = SearchReplaceSlidingWidget(False, self, ui)
- self.__replaceWidget = SearchReplaceSlidingWidget(True, self, ui)
-
- self.checkActions.connect(self.__searchWidget.updateSelectionCheckBox)
- self.checkActions.connect(self.__replaceWidget.updateSelectionCheckBox)
-
- def searchWidget(self):
+ self.__searchReplaceWidget = SearchReplaceSlidingWidget(self, ui)
+
+ self.checkActions.connect(self.__searchReplaceWidget.updateSelectionCheckBox)
+
+ def searchReplaceWidget(self):
"""
Public method to get a reference to the search widget.
@return reference to the search widget (SearchReplaceSlidingWidget)
"""
- return self.__searchWidget
-
- def replaceWidget(self):
- """
- Public method to get a reference to the replace widget.
-
- @return reference to the replace widget (SearchReplaceSlidingWidget)
- """
- return self.__replaceWidget
+ return self.__searchReplaceWidget
def __loadRecent(self):
"""
@@ -3680,7 +3670,9 @@
""" search text and options are reused.</p>""",
)
)
- self.replaceAndSearchAct.triggered.connect(self.__replaceWidget.replaceSearch)
+ self.replaceAndSearchAct.triggered.connect(
+ self.__searchReplaceWidget.replaceSearch
+ )
self.searchActions.append(self.replaceAndSearchAct)
self.replaceSelectionAct = EricAction(
@@ -3707,7 +3699,7 @@
""" current editor.</p>""",
)
)
- self.replaceSelectionAct.triggered.connect(self.__replaceWidget.replace)
+ self.replaceSelectionAct.triggered.connect(self.__searchReplaceWidget.replace)
self.searchActions.append(self.replaceSelectionAct)
self.replaceAllAct = EricAction(
@@ -3734,7 +3726,7 @@
""" editor.</p>""",
)
)
- self.replaceAllAct.triggered.connect(self.__replaceWidget.replaceAll)
+ self.replaceAllAct.triggered.connect(self.__searchReplaceWidget.replaceAll)
self.searchActions.append(self.replaceAllAct)
self.gotoAct = EricAction(
@@ -5664,10 +5656,7 @@
editor.eolChanged.connect(lambda: self.__editorConfigChanged(editor))
editor.encodingChanged.connect(lambda: self.__editorConfigChanged(editor))
editor.selectionChanged.connect(
- lambda: self.__searchWidget.selectionChanged(editor)
- )
- editor.selectionChanged.connect(
- lambda: self.__replaceWidget.selectionChanged(editor)
+ lambda: self.__searchReplaceWidget.selectionChanged(editor)
)
editor.selectionChanged.connect(lambda: self.__editorSelectionChanged(editor))
editor.lastEditPositionAvailable.connect(self.__lastEditPositionAvailable)
@@ -6667,34 +6656,25 @@
"""
Public method to show the search widget.
"""
- self.__replaceWidget.hide()
- self.__searchWidget.show()
- self.__searchWidget.show(self.textForFind())
+ self.__searchReplaceWidget.show(text=self.textForFind(), replaceMode=False)
def __searchNext(self):
"""
Private slot to handle the search next action.
"""
- if self.__replaceWidget.isVisible():
- self.__replaceWidget.findNext()
- else:
- self.__searchWidget.findNext()
+ self.__searchReplaceWidget.findNext()
def __searchPrev(self):
"""
Private slot to handle the search previous action.
"""
- if self.__replaceWidget.isVisible():
- self.__replaceWidget.findPrev()
- else:
- self.__searchWidget.findPrev()
+ self.__searchReplaceWidget.findPrev()
def showReplaceWidget(self):
"""
Public method to show the replace widget.
"""
- self.__searchWidget.hide()
- self.__replaceWidget.show(self.textForFind())
+ self.__searchReplaceWidget.show(text=self.textForFind(), replaceMode=True)
def __findNextWord(self):
"""
@@ -7458,9 +7438,8 @@
if self.autosaveTimer.isActive():
self.autosaveTimer.stop()
- # hide search and replace widgets
- self.__searchWidget.hide()
- self.__replaceWidget.hide()
+ # hide search and replace widget
+ self.__searchReplaceWidget.hide()
# hide the AST Viewer via its action
self.astViewerAct.setChecked(False)
