Mercurial Repositories > eric / file diff

--- a/eric7/UI/DiffDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/UI/DiffDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -16,9 +16,9 @@
 from PyQt6.QtGui import QTextCursor
 from PyQt6.QtWidgets import QWidget, QApplication, QDialogButtonBox
 
-from E5Gui import E5MessageBox, E5FileDialog
-from E5Gui.E5MainWindow import E5MainWindow
-from E5Gui.E5PathPicker import E5PathPickerModes
+from E5Gui import EricMessageBox, EricFileDialog
+from E5Gui.EricMainWindow import EricMainWindow
+from E5Gui.EricPathPicker import EricPathPickerModes
 
 from .Ui_DiffDialog import Ui_DiffDialog
 from .DiffHighlighter import DiffHighlighter
@@ -40,8 +40,8 @@
         super().__init__(parent)
         self.setupUi(self)
         
-        self.file1Picker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
-        self.file2Picker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
+        self.file1Picker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
+        self.file2Picker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
         
         self.diffButton = self.buttonBox.addButton(
             self.tr("Compare"), QDialogButtonBox.ButtonRole.ActionRole)
@@ -103,13 +103,13 @@
         dname, fname = Utilities.splitPath(self.filename2)
         fname = "{0}.diff".format(self.filename2) if fname != '.' else dname
             
-        fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+        fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
             self,
             self.tr("Save Diff"),
             fname,
             self.tr("Patch Files (*.diff)"),
             None,
-            E5FileDialog.DontConfirmOverwrite)
+            EricFileDialog.DontConfirmOverwrite)
         
         if not fname:
             return
@@ -120,12 +120,12 @@
             if ex:
                 fname += ex
         if QFileInfo(fname).exists():
-            res = E5MessageBox.yesNo(
+            res = EricMessageBox.yesNo(
                 self,
                 self.tr("Save Diff"),
                 self.tr("<p>The patch file <b>{0}</b> already exists."
                         " Overwrite it?</p>").format(fname),
-                icon=E5MessageBox.Warning)
+                icon=EricMessageBox.Warning)
             if not res:
                 return
         fname = Utilities.toNativeSeparators(fname)
@@ -136,7 +136,7 @@
                     contextlib.suppress(UnicodeError):
                 f.write(txt)
         except OSError as why:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self, self.tr('Save Diff'),
                 self.tr(
                     '<p>The patch file <b>{0}</b> could not be saved.<br />'
@@ -156,7 +156,7 @@
             with open(self.filename1, "r", encoding="utf-8") as f1:
                 lines1 = f1.readlines()
         except OSError:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self,
                 self.tr("Compare Files"),
                 self.tr(
@@ -173,7 +173,7 @@
             with open(self.filename2, "r", encoding="utf-8") as f2:
                 lines2 = f2.readlines()
         except OSError:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self,
                 self.tr("Compare Files"),
                 self.tr(
@@ -269,7 +269,7 @@
             self.diffButton.setEnabled(True)
 
 
-class DiffWindow(E5MainWindow):
+class DiffWindow(EricMainWindow):
     """
     Main window class for the standalone dialog.
     """