Mercurial Repositories > eric / file diff

--- a/eric7/UI/CompareDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/UI/CompareDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -15,9 +15,9 @@
 from PyQt6.QtGui import QFontMetrics, QBrush, QTextCursor
 from PyQt6.QtWidgets import QWidget, QApplication, QDialogButtonBox
 
-from E5Gui import E5MessageBox
-from E5Gui.E5MainWindow import E5MainWindow
-from E5Gui.E5PathPicker import E5PathPickerModes
+from E5Gui import EricMessageBox
+from E5Gui.EricMainWindow import EricMainWindow
+from E5Gui.EricPathPicker import EricPathPickerModes
 
 import UI.PixmapCache
 
@@ -101,8 +101,8 @@
         if files is None:
             files = []
         
-        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)
@@ -241,7 +241,7 @@
             with open(filename1, "r", encoding="utf-8") as f1:
                 lines1 = f1.readlines()
         except OSError:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self,
                 self.tr("Compare Files"),
                 self.tr(
@@ -254,7 +254,7 @@
             with open(filename2, "r", encoding="utf-8") as f2:
                 lines2 = f2.readlines()
         except OSError:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self,
                 self.tr("Compare Files"),
                 self.tr(
@@ -458,7 +458,7 @@
             self.hsb2.valueChanged.disconnect(self.hsb1.setValue)
 
 
-class CompareWindow(E5MainWindow):
+class CompareWindow(EricMainWindow):
     """
     Main window class for the standalone dialog.
     """