--- a/eric7/QScintilla/SearchReplaceWidget.py Sat May 22 17:01:51 2021 +0200 +++ b/eric7/QScintilla/SearchReplaceWidget.py Sat May 22 18:51:46 2021 +0200 @@ -18,8 +18,8 @@ from .Editor import Editor -from E5Gui.E5Action import E5Action -from E5Gui import E5MessageBox +from E5Gui.EricAction import EricAction +from E5Gui import EricMessageBox import Preferences @@ -164,7 +164,7 @@ self.__updateQuickSearchMarkers) # define actions - self.findNextAct = E5Action( + self.findNextAct = EricAction( self.tr('Find Next'), self.tr('Find Next'), 0, 0, self, 'search_widget_find_next') @@ -172,7 +172,7 @@ self.findNextAct.setShortcutContext( Qt.ShortcutContext.WidgetWithChildrenShortcut) - self.findPrevAct = E5Action( + self.findPrevAct = EricAction( self.tr('Find Prev'), self.tr('Find Prev'), 0, 0, self, 'search_widget_find_prev') @@ -181,7 +181,7 @@ Qt.ShortcutContext.WidgetWithChildrenShortcut) if replace: - self.replaceAndSearchAct = E5Action( + self.replaceAndSearchAct = EricAction( self.tr("Replace and Search"), self.tr("Replace and Search"), 0, 0, self, "replace_widget_replace_search") @@ -191,7 +191,7 @@ self.replaceAndSearchAct.setShortcutContext( Qt.ShortcutContext.WidgetWithChildrenShortcut) - self.replaceSelectionAct = E5Action( + self.replaceSelectionAct = EricAction( self.tr("Replace Occurrence"), self.tr("Replace Occurrence"), 0, 0, self, "replace_widget_replace_occurrence") @@ -201,7 +201,7 @@ self.replaceSelectionAct.setShortcutContext( Qt.ShortcutContext.WidgetWithChildrenShortcut) - self.replaceAllAct = E5Action( + self.replaceAllAct = EricAction( self.tr("Replace All"), self.tr("Replace All"), 0, 0, self, "replace_widget_replace_all") @@ -525,7 +525,7 @@ self.__setReplaceSelectionEnabled(True) self.__setReplaceAndSearchEnabled(True) else: - E5MessageBox.information( + EricMessageBox.information( self, self.windowTitle(), self.tr("'{0}' was not found.").format(txt)) @@ -563,7 +563,7 @@ self.__setReplaceSelectionEnabled(True) self.__setReplaceAndSearchEnabled(True) else: - E5MessageBox.information( + EricMessageBox.information( self, self.windowTitle(), self.tr("'{0}' was not found.").format(txt)) @@ -980,7 +980,7 @@ if not ok: self.__setReplaceSelectionEnabled(False) self.__setReplaceAndSearchEnabled(False) - E5MessageBox.information( + EricMessageBox.information( self, self.windowTitle(), self.tr("'{0}' was not found.").format(ftxt)) else: @@ -1126,12 +1126,12 @@ self.__setReplaceAndSearchEnabled(False) if found: - E5MessageBox.information( + EricMessageBox.information( self, self.windowTitle(), self.tr("Replaced {0} occurrences.") .format(replacements)) else: - E5MessageBox.information( + EricMessageBox.information( self, self.windowTitle(), self.tr("Nothing replaced because '{0}' was not found.") .format(ftxt))