diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/UI/FindFileDialog.py
--- a/eric7/UI/FindFileDialog.py Sat May 22 17:01:51 2021 +0200
+++ b/eric7/UI/FindFileDialog.py Sat May 22 18:51:46 2021 +0200
@@ -16,9 +16,9 @@
QDialog, QApplication, QMenu, QDialogButtonBox, QTreeWidgetItem, QComboBox
)
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox
-from E5Gui.E5PathPicker import E5PathPickerModes
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox
+from E5Gui.EricPathPicker import EricPathPickerModes
from .Ui_FindFileDialog import Ui_FindFileDialog
@@ -59,7 +59,7 @@
self.setupUi(self)
self.setWindowFlags(Qt.WindowType.Window)
- self.dirPicker.setMode(E5PathPickerModes.DIRECTORY_MODE)
+ self.dirPicker.setMode(EricPathPickerModes.DIRECTORY_MODE)
self.dirPicker.setInsertPolicy(QComboBox.InsertPolicy.InsertAtTop)
self.dirPicker.setSizeAdjustPolicy(
QComboBox.SizeAdjustPolicy.AdjustToMinimumContentsLengthWithIcon)
@@ -315,7 +315,7 @@
"""
if (
self.__replaceMode and
- not e5App().getObject("ViewManager").checkAllDirty()
+ not ericApp().getObject("ViewManager").checkAllDirty()
):
return
@@ -424,7 +424,7 @@
excludeHiddenFiles=self.excludeHiddenCheckBox.isChecked(),
)
elif self.openFilesButton.isChecked():
- vm = e5App().getObject("ViewManager")
+ vm = ericApp().getObject("ViewManager")
vm.checkAllDirty()
files = vm.getOpenFilenames()
@@ -447,7 +447,7 @@
try:
search = re.compile(txt, flags)
except re.error as why:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Invalid search expression"),
self.tr("""<p>The search expression is not valid.</p>"""
@@ -689,7 +689,7 @@
)
lines = text.splitlines(True)
except (UnicodeError, OSError) as err:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Replace in Files"),
self.tr(
@@ -703,7 +703,7 @@
# Check the original and the current hash. Skip the file,
# if hashes are different.
if origHash != hashStr:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Replace in Files"),
self.tr(
@@ -728,7 +728,7 @@
try:
Utilities.writeEncodedFile(fn, txt, encoding)
except (OSError, Utilities.CodingError, UnicodeError) as err:
- E5MessageBox.critical(
+ EricMessageBox.critical(
self,
self.tr("Replace in Files"),
self.tr(
