Mercurial Repositories > eric / file diff

--- a/eric7/Project/ProjectProtocolsBrowser.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Project/ProjectProtocolsBrowser.py	Sat May 22 18:51:46 2021 +0200
@@ -16,9 +16,9 @@
 from PyQt6.QtCore import QThread, pyqtSignal, QProcess
 from PyQt6.QtWidgets import QDialog, QApplication, QMenu
 
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox
-from E5Gui.E5ProgressDialog import E5ProgressDialog
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox
+from E5Gui.EricProgressDialog import EricProgressDialog
 
 from .ProjectBrowserModel import (
     ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem,
@@ -539,7 +539,7 @@
         @type bool
         """
         self.__compileRunning = False
-        ui = e5App().getObject("UserInterface")
+        ui = ericApp().getObject("UserInterface")
         if exitStatus == QProcess.ExitStatus.NormalExit and exitCode == 0:
             path = os.path.dirname(self.__protoFile)
             fileList = glob.glob(os.path.join(path, "*_pb2.py"))
@@ -580,7 +580,7 @@
         @param noDialog flag indicating silent operations
         @type bool
         @param progress reference to the progress dialog
-        @type E5ProgressDialog
+        @type EricProgressDialog
         @param grpc flag indicating to compile as gRPC files
         @type bool
         @return reference to the compile process
@@ -616,7 +616,7 @@
                 self.__compileRunning = False
                 if progress is not None:
                     progress.cancel()
-                E5MessageBox.critical(
+                EricMessageBox.critical(
                     self,
                     self.tr('Process Generation Error'),
                     self.tr(
@@ -625,7 +625,7 @@
                     ).format(exe))
                 return None
         else:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self,
                 self.tr('Compiler Invalid'),
                 self.tr('The configured compiler is invalid.'))
@@ -653,7 +653,7 @@
         """
         if self.__getCompilerCommand(grpc)[0] is not None:
             numProtos = len(self.project.pdata["PROTOCOLS"])
-            progress = E5ProgressDialog(
+            progress = EricProgressDialog(
                 self.tr("Compiling Protocols..."),
                 self.tr("Abort"), 0, numProtos,
                 self.tr("%v/%m Protocols"), self)
@@ -688,7 +688,7 @@
             files = [self.project.getRelativePath(itm.fileName())
                      for itm in items]
             numProtos = len(files)
-            progress = E5ProgressDialog(
+            progress = EricProgressDialog(
                 self.tr("Compiling Protocols..."),
                 self.tr("Abort"), 0, numProtos,
                 self.tr("%v/%m Protocols"), self)
@@ -714,4 +714,4 @@
         """
         Private method to open the configuration dialog.
         """
-        e5App().getObject("UserInterface").showPreferences("protobufPage")
+        ericApp().getObject("UserInterface").showPreferences("protobufPage")