Mercurial Repositories > eric / changeset

--- a/eric7.epj	Sat May 22 17:01:51 2021 +0200
+++ b/eric7.epj	Sat May 22 18:51:46 2021 +0200
@@ -2,7 +2,7 @@
   "header": {
     "comment": "eric project file for project eric7",
     "copyright": "Copyright (C) 2021 Detlev Offenbach, detlev@die-offenbachs.de",
-    "saved": "2021-05-22, 16:56:28"
+    "saved": "2021-05-22, 18:49:32"
   },
   "project": {
     "AUTHOR": "Detlev Offenbach",
@@ -285,15 +285,6 @@
       "eric7/Debugger/StartRunDialog.ui",
       "eric7/Debugger/VariableDetailDialog.ui",
       "eric7/Debugger/VariablesFilterDialog.ui",
-      "eric7/E5Gui/E5ComboSelectionDialog.ui",
-      "eric7/E5Gui/E5ErrorMessageFilterDialog.ui",
-      "eric7/E5Gui/E5ListSelectionDialog.ui",
-      "eric7/E5Gui/E5PlainTextDialog.ui",
-      "eric7/E5Gui/E5ProcessDialog.ui",
-      "eric7/E5Gui/E5SimpleHelpDialog.ui",
-      "eric7/E5Gui/E5StringListEditWidget.ui",
-      "eric7/E5Gui/E5ToolBarDialog.ui",
-      "eric7/E5Gui/E5ZoomWidget.ui",
       "eric7/Graphics/UMLSceneSizeDialog.ui",
       "eric7/HexEdit/HexEditGotoWidget.ui",
       "eric7/HexEdit/HexEditReplaceWidget.ui",
@@ -709,7 +700,16 @@
       "eric7/EricNetwork/EricSslCertificateSelectionDialog.ui",
       "eric7/EricNetwork/EricSslCertificatesDialog.ui",
       "eric7/EricNetwork/EricSslCertificatesInfoDialog.ui",
-      "eric7/EricNetwork/EricSslCertificatesInfoWidget.ui"
+      "eric7/EricNetwork/EricSslCertificatesInfoWidget.ui",
+      "eric7/E5Gui/EricComboSelectionDialog.ui",
+      "eric7/E5Gui/EricErrorMessageFilterDialog.ui",
+      "eric7/E5Gui/EricListSelectionDialog.ui",
+      "eric7/E5Gui/EricPlainTextDialog.ui",
+      "eric7/E5Gui/EricProcessDialog.ui",
+      "eric7/E5Gui/EricSimpleHelpDialog.ui",
+      "eric7/E5Gui/EricStringListEditWidget.ui",
+      "eric7/E5Gui/EricToolBarDialog.ui",
+      "eric7/E5Gui/EricZoomWidget.ui"
     ],
     "HASH": "df7daa8781250f7664e6ecaeaf1361fa2efd39ee",
     "IDLPARAMS": {
@@ -1072,54 +1072,6 @@
       "eric7/DocumentationTools/TemplatesListsStyle.py",
       "eric7/DocumentationTools/TemplatesListsStyleCSS.py",
       "eric7/DocumentationTools/__init__.py",
-      "eric7/E5Gui/E5Action.py",
-      "eric7/E5Gui/E5AnimatedLabel.py",
-      "eric7/E5Gui/E5AnimatedWidget.py",
-      "eric7/E5Gui/E5Application.py",
-      "eric7/E5Gui/E5ClickableLabel.py",
-      "eric7/E5Gui/E5ComboSelectionDialog.py",
-      "eric7/E5Gui/E5Completers.py",
-      "eric7/E5Gui/E5ErrorMessage.py",
-      "eric7/E5Gui/E5ErrorMessageFilterDialog.py",
-      "eric7/E5Gui/E5FileDialog.py",
-      "eric7/E5Gui/E5FileSaveConfirmDialog.py",
-      "eric7/E5Gui/E5GenericDiffHighlighter.py",
-      "eric7/E5Gui/E5Led.py",
-      "eric7/E5Gui/E5LineEdit.py",
-      "eric7/E5Gui/E5LineEditButton.py",
-      "eric7/E5Gui/E5ListSelectionDialog.py",
-      "eric7/E5Gui/E5ListView.py",
-      "eric7/E5Gui/E5MainWindow.py",
-      "eric7/E5Gui/E5MapWidget.py",
-      "eric7/E5Gui/E5MessageBox.py",
-      "eric7/E5Gui/E5ModelMenu.py",
-      "eric7/E5Gui/E5ModelToolBar.py",
-      "eric7/E5Gui/E5OverrideCursor.py",
-      "eric7/E5Gui/E5PassivePopup.py",
-      "eric7/E5Gui/E5PasswordMeter.py",
-      "eric7/E5Gui/E5PathPicker.py",
-      "eric7/E5Gui/E5PathPickerDialog.py",
-      "eric7/E5Gui/E5PlainTextDialog.py",
-      "eric7/E5Gui/E5ProcessDialog.py",
-      "eric7/E5Gui/E5ProgressDialog.py",
-      "eric7/E5Gui/E5SideBar.py",
-      "eric7/E5Gui/E5SimpleHelpDialog.py",
-      "eric7/E5Gui/E5SingleApplication.py",
-      "eric7/E5Gui/E5SqueezeLabels.py",
-      "eric7/E5Gui/E5StringListEditWidget.py",
-      "eric7/E5Gui/E5TabWidget.py",
-      "eric7/E5Gui/E5TableView.py",
-      "eric7/E5Gui/E5TextEditSearchWidget.py",
-      "eric7/E5Gui/E5TextInputDialog.py",
-      "eric7/E5Gui/E5TextSpinBox.py",
-      "eric7/E5Gui/E5ToolBarDialog.py",
-      "eric7/E5Gui/E5ToolBarManager.py",
-      "eric7/E5Gui/E5ToolBox.py",
-      "eric7/E5Gui/E5ToolButton.py",
-      "eric7/E5Gui/E5TreeSortFilterProxyModel.py",
-      "eric7/E5Gui/E5TreeView.py",
-      "eric7/E5Gui/E5TreeWidget.py",
-      "eric7/E5Gui/E5ZoomWidget.py",
       "eric7/E5Gui/__init__.py",
       "eric7/Globals/AppInfo.py",
       "eric7/Globals/__init__.py",
@@ -2264,7 +2216,55 @@
       "eric7/EricNetwork/EricSslInfoWidget.py",
       "eric7/EricNetwork/EricSslUtilities.py",
       "eric7/EricNetwork/EricTldExtractor.py",
-      "eric7/EricNetwork/EricUrlInfo.py"
+      "eric7/EricNetwork/EricUrlInfo.py",
+      "eric7/E5Gui/EricAction.py",
+      "eric7/E5Gui/EricAnimatedLabel.py",
+      "eric7/E5Gui/EricAnimatedWidget.py",
+      "eric7/E5Gui/EricApplication.py",
+      "eric7/E5Gui/EricClickableLabel.py",
+      "eric7/E5Gui/EricComboSelectionDialog.py",
+      "eric7/E5Gui/EricCompleters.py",
+      "eric7/E5Gui/EricErrorMessage.py",
+      "eric7/E5Gui/EricErrorMessageFilterDialog.py",
+      "eric7/E5Gui/EricFileDialog.py",
+      "eric7/E5Gui/EricFileSaveConfirmDialog.py",
+      "eric7/E5Gui/EricGenericDiffHighlighter.py",
+      "eric7/E5Gui/EricLed.py",
+      "eric7/E5Gui/EricLineEdit.py",
+      "eric7/E5Gui/EricLineEditButton.py",
+      "eric7/E5Gui/EricListSelectionDialog.py",
+      "eric7/E5Gui/EricListView.py",
+      "eric7/E5Gui/EricMainWindow.py",
+      "eric7/E5Gui/EricMapWidget.py",
+      "eric7/E5Gui/EricMessageBox.py",
+      "eric7/E5Gui/EricModelMenu.py",
+      "eric7/E5Gui/EricModelToolBar.py",
+      "eric7/E5Gui/EricOverrideCursor.py",
+      "eric7/E5Gui/EricPassivePopup.py",
+      "eric7/E5Gui/EricPasswordMeter.py",
+      "eric7/E5Gui/EricPathPicker.py",
+      "eric7/E5Gui/EricPathPickerDialog.py",
+      "eric7/E5Gui/EricPlainTextDialog.py",
+      "eric7/E5Gui/EricProcessDialog.py",
+      "eric7/E5Gui/EricProgressDialog.py",
+      "eric7/E5Gui/EricSideBar.py",
+      "eric7/E5Gui/EricSimpleHelpDialog.py",
+      "eric7/E5Gui/EricSingleApplication.py",
+      "eric7/E5Gui/EricSqueezeLabels.py",
+      "eric7/E5Gui/EricStringListEditWidget.py",
+      "eric7/E5Gui/EricTabWidget.py",
+      "eric7/E5Gui/EricTableView.py",
+      "eric7/E5Gui/EricTextEditSearchWidget.py",
+      "eric7/E5Gui/EricTextInputDialog.py",
+      "eric7/E5Gui/EricTextSpinBox.py",
+      "eric7/E5Gui/EricToolBarDialog.py",
+      "eric7/E5Gui/EricToolBarManager.py",
+      "eric7/E5Gui/EricToolBox.py",
+      "eric7/E5Gui/EricToolButton.py",
+      "eric7/E5Gui/EricTreeSortFilterProxyModel.py",
+      "eric7/E5Gui/EricTreeView.py",
+      "eric7/E5Gui/EricTreeWidget.py",
+      "eric7/E5Gui/EricZoomWidget.py"
     ],
     "SPELLEXCLUDES": "Dictionaries/excludes.dic",
     "SPELLLANGUAGE": "en_US",

--- a/eric7/CondaInterface/Conda.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/CondaInterface/Conda.py	Sat May 22 18:51:46 2021 +0200
@@ -14,7 +14,7 @@
 from PyQt6.QtCore import pyqtSignal, QObject, QProcess, QCoreApplication
 from PyQt6.QtWidgets import QDialog
 
-from E5Gui import E5MessageBox
+from E5Gui import EricMessageBox
 
 import Globals
 import Preferences
@@ -145,7 +145,7 @@
         proc = QProcess()
         proc.start(exe, args)
         if not proc.waitForStarted(15000):
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self.__ui,
                 self.tr("conda remove"),
                 self.tr("""The conda executable could not be started."""))
@@ -158,14 +158,14 @@
             try:
                 jsonDict = json.loads(output)
             except Exception:
-                E5MessageBox.critical(
+                EricMessageBox.critical(
                     self.__ui,
                     self.tr("conda remove"),
                     self.tr("""The conda executable returned invalid data."""))
                 return False
             
             if "error" in jsonDict:
-                E5MessageBox.critical(
+                EricMessageBox.critical(
                     self.__ui,
                     self.tr("conda remove"),
                     self.tr("<p>The conda executable returned an error.</p>"

--- a/eric7/CondaInterface/CondaExecDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/CondaInterface/CondaExecDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -12,7 +12,7 @@
 from PyQt6.QtCore import pyqtSlot, QProcess, QTimer
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QAbstractButton
 
-from E5Gui import E5MessageBox
+from E5Gui import EricMessageBox
 
 from .Ui_CondaExecDialog import Ui_CondaExecDialog
 
@@ -99,7 +99,7 @@
         self.__process.start(self.__condaExe, arguments)
         procStarted = self.__process.waitForStarted(5000)
         if not procStarted:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self,
                 self.tr("Conda Execution"),
                 self.tr("""The conda executable could not be started. Is it"""

--- a/eric7/CondaInterface/CondaExportDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/CondaInterface/CondaExportDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -14,10 +14,10 @@
     QDialog, QDialogButtonBox, QAbstractButton, QApplication
 )
 
-from E5Gui import E5MessageBox, E5FileDialog
-from E5Gui.E5PathPicker import E5PathPickerModes
-from E5Gui.E5Application import e5App
-from E5Gui.E5OverrideCursor import E5OverrideCursor
+from E5Gui import EricMessageBox, EricFileDialog
+from E5Gui.EricPathPicker import EricPathPickerModes
+from E5Gui.EricApplication import ericApp
+from E5Gui.EricOverrideCursor import EricOverrideCursor
 
 from .Ui_CondaExportDialog import Ui_CondaExportDialog
 
@@ -48,7 +48,7 @@
         self.__refreshButton = self.buttonBox.addButton(
             self.tr("&Refresh"), QDialogButtonBox.ButtonRole.ActionRole)
         
-        self.requirementsFilePicker.setMode(E5PathPickerModes.SAVE_FILE_MODE)
+        self.requirementsFilePicker.setMode(EricPathPickerModes.SAVE_FILE_MODE)
         self.requirementsFilePicker.setFilters(
             self.tr("Text Files (*.txt);;All Files (*)"))
         
@@ -108,7 +108,7 @@
         Private slot to refresh the displayed list.
         """
         ok = (
-            E5MessageBox.yesNo(
+            EricMessageBox.yesNo(
                 self,
                 self.tr("Generate Requirements"),
                 self.tr("""The requirements were changed. Do you want"""
@@ -133,7 +133,7 @@
             self.__prefix,
         ]
         
-        with E5OverrideCursor():
+        with EricOverrideCursor():
             success, output = self.__conda.runProcess(args)
             
             if success:
@@ -158,7 +158,7 @@
         self.saveToButton.setEnabled(self.__requirementsAvailable)
         self.copyButton.setEnabled(self.__requirementsAvailable)
         
-        aw = e5App().getObject("ViewManager").activeWindow()
+        aw = ericApp().getObject("ViewManager").activeWindow()
         if aw and self.__requirementsAvailable:
             self.insertButton.setEnabled(True)
             self.replaceAllButton.setEnabled(True)
@@ -177,7 +177,7 @@
         @type str
         """
         if os.path.exists(fileName):
-            ok = E5MessageBox.warning(
+            ok = EricMessageBox.warning(
                 self,
                 self.tr("Generate Requirements"),
                 self.tr("""The file <b>{0}</b> already exists. Do you want"""
@@ -189,7 +189,7 @@
             with open(fileName, "w") as f:
                 f.write(self.requirementsEdit.toPlainText())
         except OSError as err:
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self,
                 self.tr("Generate Requirements"),
                 self.tr("""<p>The requirements could not be written"""
@@ -209,13 +209,13 @@
         """
         Private slot to write the requirements text to a new file.
         """
-        fileName, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+        fileName, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
             self,
             self.tr("Generate Requirements"),
             os.path.expanduser("~"),
             self.tr("Text Files (*.txt);;All Files (*)"),
             None,
-            E5FileDialog.DontConfirmOverwrite
+            EricFileDialog.DontConfirmOverwrite
         )
         if fileName:
             ext = os.path.splitext(fileName)[1]
@@ -240,7 +240,7 @@
         Private slot to insert the requirements text at the cursor position
         of the current editor.
         """
-        aw = e5App().getObject("ViewManager").activeWindow()
+        aw = ericApp().getObject("ViewManager").activeWindow()
         if aw:
             aw.beginUndoAction()
             cline, cindex = aw.getCursorPosition()
@@ -253,7 +253,7 @@
         Private slot to replace the selected text of the current editor
         with the requirements text.
         """
-        aw = e5App().getObject("ViewManager").activeWindow()
+        aw = ericApp().getObject("ViewManager").activeWindow()
         if aw:
             aw.beginUndoAction()
             aw.replaceSelectedText(self.requirementsEdit.toPlainText())
@@ -265,6 +265,6 @@
         Private slot to replace the text of the current editor with the
         requirements text.
         """
-        aw = e5App().getObject("ViewManager").activeWindow()
+        aw = ericApp().getObject("ViewManager").activeWindow()
         if aw:
             aw.setText(self.requirementsEdit.toPlainText())

--- a/eric7/CondaInterface/CondaExportDialog.ui	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/CondaInterface/CondaExportDialog.ui	Sat May 22 18:51:46 2021 +0200
@@ -44,7 +44,7 @@
       </widget>
      </item>
      <item row="1" column="1">
-      <widget class="E5PathPicker" name="requirementsFilePicker" native="true">
+      <widget class="EricPathPicker" name="requirementsFilePicker" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
@@ -156,9 +156,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5PathPicker</class>
+   <class>EricPathPicker</class>
    <extends>QWidget</extends>
-   <header>E5Gui/E5PathPicker.h</header>
+   <header>E5Gui/EricPathPicker.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

--- a/eric7/CondaInterface/CondaNewEnvironmentDataDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/CondaInterface/CondaNewEnvironmentDataDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -10,7 +10,7 @@
 from PyQt6.QtCore import pyqtSlot
 from PyQt6.QtWidgets import QDialog, QDialogButtonBox
 
-from E5Gui.E5PathPicker import E5PathPickerModes
+from E5Gui.EricPathPicker import EricPathPickerModes
 
 from .Ui_CondaNewEnvironmentDataDialog import Ui_CondaNewEnvironmentDataDialog
 
@@ -38,7 +38,7 @@
         
         self.__requirementsMode = showRequirements
         
-        self.requirementsFilePicker.setMode(E5PathPickerModes.OPEN_FILE_MODE)
+        self.requirementsFilePicker.setMode(EricPathPickerModes.OPEN_FILE_MODE)
         self.requirementsFilePicker.setFilters(
             self.tr("Text Files (*.txt);;All Files (*)"))
         

--- a/eric7/CondaInterface/CondaNewEnvironmentDataDialog.ui	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/CondaInterface/CondaNewEnvironmentDataDialog.ui	Sat May 22 18:51:46 2021 +0200
@@ -65,7 +65,7 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="E5PathPicker" name="requirementsFilePicker" native="true">
+    <widget class="EricPathPicker" name="requirementsFilePicker" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -91,9 +91,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5PathPicker</class>
+   <class>EricPathPicker</class>
    <extends>QWidget</extends>
-   <header>E5Gui/E5PathPicker.h</header>
+   <header>E5Gui/EricPathPicker.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

--- a/eric7/CondaInterface/CondaPackagesWidget.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/CondaInterface/CondaPackagesWidget.py	Sat May 22 18:51:46 2021 +0200
@@ -15,9 +15,9 @@
     QDialog
 )
 
-from E5Gui import E5FileDialog, E5MessageBox, E5TextInputDialog
-from E5Gui.E5Application import e5App
-from E5Gui.E5OverrideCursor import E5OverrideCursor
+from E5Gui import EricFileDialog, EricMessageBox, EricTextInputDialog
+from E5Gui.EricApplication import ericApp
+from E5Gui.EricOverrideCursor import EricOverrideCursor
 
 from .Ui_CondaPackagesWidget import Ui_CondaPackagesWidget
 
@@ -222,7 +222,7 @@
             self.statusLabel.show()
             self.statusLabel.setText(self.tr("Getting installed packages..."))
             
-            with E5OverrideCursor():
+            with EricOverrideCursor():
                 # 1. populate with installed packages
                 self.packagesList.setUpdatesEnabled(False)
                 installedPackages = self.__conda.getInstalledPackages(
@@ -287,7 +287,7 @@
         self.environmentsComboBox.clear()
         self.packagesList.clear()
         
-        with E5OverrideCursor():
+        with EricOverrideCursor():
             self.__populateEnvironments()
             
             index = self.environmentsComboBox.findText(
@@ -356,7 +356,7 @@
         self.searchResultList.clear()
         pattern = self.searchEdit.text()
         if pattern:
-            with E5OverrideCursor():
+            with EricOverrideCursor():
                 prefix = (
                     ""
                     if CondaInterface.condaVersion() >= (4, 4, 0) else
@@ -400,7 +400,7 @@
                     message = result["message"]
                 except KeyError:
                     message = result["error"]
-                E5MessageBox.warning(
+                EricMessageBox.warning(
                     self,
                     self.tr("Conda Search Package Error"),
                     message)
@@ -558,7 +558,7 @@
         prefix = self.environmentsComboBox.itemData(
             self.environmentsComboBox.currentIndex())
         if prefix:
-            ok, packageSpecs = E5TextInputDialog.getText(
+            ok, packageSpecs = EricTextInputDialog.getText(
                 self,
                 self.tr("Install Packages"),
                 self.tr("Package Specifications (separated by whitespace):"),
@@ -578,7 +578,7 @@
         prefix = self.environmentsComboBox.itemData(
             self.environmentsComboBox.currentIndex())
         if prefix:
-            requirements = E5FileDialog.getOpenFileNames(
+            requirements = EricFileDialog.getOpenFileNames(
                 self,
                 self.tr("Install Packages"),
                 "",
@@ -633,7 +633,7 @@
                 ok, prefix, interpreter = self.__conda.createCondaEnvironment(
                     args)
                 if ok:
-                    e5App().getObject("VirtualEnvManager").addVirtualEnv(
+                    ericApp().getObject("VirtualEnvManager").addVirtualEnv(
                         virtEnvName, prefix, interpreter, isConda=True)
     
     @pyqtSlot()
@@ -656,7 +656,7 @@
             ]
             ok, prefix, interpreter = self.__conda.createCondaEnvironment(args)
             if ok:
-                e5App().getObject("VirtualEnvManager").addVirtualEnv(
+                ericApp().getObject("VirtualEnvManager").addVirtualEnv(
                     virtEnvName, prefix, interpreter, isConda=True)
     
     @pyqtSlot()
@@ -665,7 +665,7 @@
         Private slot to delete a conda environment.
         """
         envName = self.environmentsComboBox.currentText()
-        ok = E5MessageBox.yesNo(
+        ok = EricMessageBox.yesNo(
             self,
             self.tr("Delete Environment"),
             self.tr("""<p>Shall the environment <b>{0}</b> really be"""
@@ -690,7 +690,7 @@
         
         # check, if the destination is writeable
         if not os.access(cfgFile, os.W_OK):
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Edit Configuration"),
                 self.tr("""The configuration file "{0}" does not exist"""
@@ -705,7 +705,7 @@
         """
         Private slot to open the configuration page.
         """
-        e5App().getObject("UserInterface").showPreferences("condaPage")
+        ericApp().getObject("UserInterface").showPreferences("condaPage")
     
     @pyqtSlot()
     def on_recheckButton_clicked(self):

--- a/eric7/CondaInterface/CondaPackagesWidget.ui	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/CondaInterface/CondaPackagesWidget.ui	Sat May 22 18:51:46 2021 +0200
@@ -126,7 +126,7 @@
          <widget class="QComboBox" name="environmentsComboBox"/>
         </item>
         <item>
-         <widget class="E5ToolButton" name="condaMenuButton"/>
+         <widget class="EricToolButton" name="condaMenuButton"/>
         </item>
        </layout>
       </item>
@@ -431,9 +431,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5ToolButton</class>
+   <class>EricToolButton</class>
    <extends>QToolButton</extends>
-   <header>E5Gui/E5ToolButton.h</header>
+   <header>E5Gui/EricToolButton.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>

--- a/eric7/Cooperation/ChatWidget.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Cooperation/ChatWidget.py	Sat May 22 18:51:46 2021 +0200
@@ -11,8 +11,8 @@
 from PyQt6.QtGui import QColor
 from PyQt6.QtWidgets import QWidget, QListWidgetItem, QMenu, QApplication
 
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox, E5FileDialog
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox, EricFileDialog
 
 from Globals import recentNameHosts
 
@@ -348,7 +348,7 @@
         self.sharingGroup.setEnabled(connected)
         
         if connected:
-            vm = e5App().getObject("ViewManager")
+            vm = ericApp().getObject("ViewManager")
             aw = vm.activeWindow()
             if aw:
                 self.checkEditorActions(aw)
@@ -404,7 +404,7 @@
         from QScintilla.Editor import Editor
         if (message.startswith(Editor.StartEditToken + Editor.Separator) or
                 message.startswith(Editor.EndEditToken + Editor.Separator)):
-            vm = e5App().getObject("ViewManager")
+            vm = ericApp().getObject("ViewManager")
             aw = vm.activeWindow()
             if aw:
                 self.checkEditorActions(aw)
@@ -550,13 +550,13 @@
         """
         txt = self.chatEdit.toPlainText()
         if txt:
-            fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+            fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
                 self,
                 self.tr("Save Chat"),
                 "",
                 self.tr("Text Files (*.txt);;All Files (*)"),
                 None,
-                E5FileDialog.DontConfirmOverwrite)
+                EricFileDialog.DontConfirmOverwrite)
             if fname:
                 ext = QFileInfo(fname).suffix()
                 if not ext:
@@ -564,12 +564,12 @@
                     if ex:
                         fname += ex
                 if QFileInfo(fname).exists():
-                    res = E5MessageBox.yesNo(
+                    res = EricMessageBox.yesNo(
                         self,
                         self.tr("Save Chat"),
                         self.tr("<p>The 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)
@@ -578,7 +578,7 @@
                     with open(fname, "w", encoding="utf-8") as f:
                         f.write(txt)
                 except OSError as err:
-                    E5MessageBox.critical(
+                    EricMessageBox.critical(
                         self,
                         self.tr("Error saving Chat"),
                         self.tr("""<p>The chat contents could not be"""

--- a/eric7/Cooperation/ChatWidget.ui	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Cooperation/ChatWidget.ui	Sat May 22 18:51:46 2021 +0200
@@ -257,7 +257,7 @@
          </widget>
         </item>
         <item>
-         <widget class="E5Led" name="connectionLed" native="true">
+         <widget class="EricLed" name="connectionLed" native="true">
           <property name="toolTip">
            <string>Shows the connection status</string>
           </property>
@@ -317,7 +317,7 @@
        </widget>
       </item>
       <item>
-       <widget class="E5Led" name="serverLed" native="true">
+       <widget class="EricLed" name="serverLed" native="true">
         <property name="toolTip">
          <string>Shows the status of the server</string>
         </property>
@@ -330,9 +330,9 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>E5Led</class>
+   <class>EricLed</class>
    <extends>QWidget</extends>
-   <header>E5Gui/E5Led.h</header>
+   <header>E5Gui/EricLed.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

--- a/eric7/Cooperation/Connection.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Cooperation/Connection.py	Sat May 22 18:51:46 2021 +0200
@@ -10,8 +10,8 @@
 from PyQt6.QtCore import pyqtSignal, QTimer, QTime, QByteArray
 from PyQt6.QtNetwork import QTcpSocket, QHostInfo
 
-from E5Gui import E5MessageBox
-from E5Gui.E5Application import e5App
+from E5Gui import EricMessageBox
+from E5Gui.EricApplication import ericApp
 
 import Preferences
 
@@ -214,7 +214,7 @@
                     not Preferences.getCooperation("AutoAcceptConnections")):
                 # don't ask for reverse connections or
                 # if we shall accept automatically
-                res = E5MessageBox.yesNo(
+                res = EricMessageBox.yesNo(
                     None,
                     self.tr("New Connection"),
                     self.tr("""<p>Accept connection from """
@@ -228,7 +228,7 @@
             if self.__client is not None:
                 chatWidget = self.__client.chatWidget()
                 if chatWidget is not None and not chatWidget.isVisible():
-                    e5App().getObject(
+                    ericApp().getObject(
                         "UserInterface").activateCooperationViewer()
             
             if not self.__isGreetingMessageSent:

--- a/eric7/DataViews/PyCoverageDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/DataViews/PyCoverageDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -16,9 +16,9 @@
     QApplication
 )
 
-from E5Gui import E5MessageBox
-from E5Gui.E5Application import e5App
-from E5Gui.E5ProgressDialog import E5ProgressDialog
+from E5Gui import EricMessageBox
+from E5Gui.EricApplication import ericApp
+from E5Gui.EricProgressDialog import EricProgressDialog
 
 from .Ui_PyCoverageDialog import Ui_PyCoverageDialog
 
@@ -239,7 +239,7 @@
             self.summaryGroup.hide()
         
         if total_exceptions:
-            E5MessageBox.warning(
+            EricMessageBox.warning(
                 self,
                 self.tr("Parse Error"),
                 self.tr("""%n file(s) could not be parsed. Coverage"""
@@ -308,7 +308,7 @@
             itm = self.resultList.currentItem()
         fn = itm.text(0)
         
-        vm = e5App().getObject("ViewManager")
+        vm = ericApp().getObject("ViewManager")
         vm.openSourceFile(fn)
         editor = vm.getOpenEditor(fn)
         editor.codeCoverageShowAnnotations()
@@ -350,7 +350,7 @@
         cover.load()
         
         # now process them
-        progress = E5ProgressDialog(
+        progress = EricProgressDialog(
             self.tr("Annotating files..."), self.tr("Abort"),
             0, len(files), self.tr("%v/%m Files"), self)
         progress.setMinimumDuration(0)

--- a/eric7/DataViews/PyProfileDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/DataViews/PyProfileDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -16,7 +16,7 @@
     QApplication
 )
 
-from E5Gui import E5MessageBox
+from E5Gui import EricMessageBox
 
 from .Ui_PyProfileDialog import Ui_PyProfileDialog
 import Utilities
@@ -239,7 +239,7 @@
         
         fname = "{0}.profile".format(self.basename)
         if not os.path.exists(fname):
-            E5MessageBox.warning(
+            EricMessageBox.warning(
                 self,
                 self.tr("Profile Results"),
                 self.tr("""<p>There is no profiling data"""
@@ -251,7 +251,7 @@
             with open(fname, 'rb') as f:
                 self.stats = pickle.load(f)     # secok
         except (OSError, pickle.PickleError, EOFError):
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self,
                 self.tr("Loading Profiling Data"),
                 self.tr("""<p>The profiling data could not be"""

--- a/eric7/Debugger/BreakPointViewer.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Debugger/BreakPointViewer.py	Sat May 22 18:51:46 2021 +0200
@@ -14,7 +14,7 @@
     QTreeView, QAbstractItemView, QHeaderView, QMenu, QDialog
 )
 
-from E5Gui.E5Application import e5App
+from E5Gui.EricApplication import ericApp
 
 from Globals import recentNameBreakpointFiles, recentNameBreakpointConditions
 
@@ -490,7 +490,7 @@
         """
         Private method to open the configuration dialog.
         """
-        e5App().getObject("UserInterface").showPreferences(
+        ericApp().getObject("UserInterface").showPreferences(
             "debuggerGeneralPage")
     
     def __loadRecent(self):

--- a/eric7/Debugger/CallStackViewer.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Debugger/CallStackViewer.py	Sat May 22 18:51:46 2021 +0200
@@ -12,8 +12,8 @@
     QTreeWidget, QTreeWidgetItem, QMenu, QWidget, QVBoxLayout, QLabel
 )
 
-from E5Gui.E5Application import e5App
-from E5Gui import E5FileDialog, E5MessageBox
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricFileDialog, EricMessageBox
 
 import Utilities
 
@@ -101,7 +101,7 @@
         """
         self.__projectMode = enabled
         if enabled and self.__project is None:
-            self.__project = e5App().getObject("Project")
+            self.__project = ericApp().getObject("Project")
     
     def __showContextMenu(self, coord):
         """
@@ -188,13 +188,13 @@
         Private slot to save the stack trace info to a file.
         """
         if self.__callStackList.topLevelItemCount() > 0:
-            fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+            fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
                 self,
                 self.tr("Save Call Stack Info"),
                 "",
                 self.tr("Text Files (*.txt);;All Files (*)"),
                 None,
-                E5FileDialog.DontConfirmOverwrite)
+                EricFileDialog.DontConfirmOverwrite)
             if fname:
                 ext = QFileInfo(fname).suffix()
                 if not ext:
@@ -202,12 +202,12 @@
                     if ex:
                         fname += ex
                 if QFileInfo(fname).exists():
-                    res = E5MessageBox.yesNo(
+                    res = EricMessageBox.yesNo(
                         self,
                         self.tr("Save Call Stack Info"),
                         self.tr("<p>The 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)
@@ -224,7 +224,7 @@
                             f.write("{0}\n".format(78 * "="))
                             itm = self.__callStackList.itemBelow(itm)
                 except OSError as err:
-                    E5MessageBox.critical(
+                    EricMessageBox.critical(
                         self,
                         self.tr("Error saving Call Stack Info"),
                         self.tr("""<p>The call stack info could not be"""

--- a/eric7/Debugger/CallTraceViewer.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Debugger/CallTraceViewer.py	Sat May 22 18:51:46 2021 +0200
@@ -12,8 +12,8 @@
 from PyQt6.QtCore import pyqtSlot, pyqtSignal, Qt, QFileInfo
 from PyQt6.QtWidgets import QWidget, QTreeWidgetItem
 
-from E5Gui.E5Application import e5App
-from E5Gui import E5FileDialog, E5MessageBox
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricFileDialog, EricMessageBox
 
 from .Ui_CallTraceViewer import Ui_CallTraceViewer
 
@@ -152,13 +152,13 @@
         Private slot to save the call trace info to a file.
         """
         if self.callTrace.topLevelItemCount() > 0:
-            fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+            fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
                 self,
                 self.tr("Save Call Trace Info"),
                 "",
                 self.tr("Text Files (*.txt);;All Files (*)"),
                 None,
-                E5FileDialog.DontConfirmOverwrite)
+                EricFileDialog.DontConfirmOverwrite)
             if fname:
                 ext = QFileInfo(fname).suffix()
                 if not ext:
@@ -166,12 +166,12 @@
                     if ex:
                         fname += ex
                 if QFileInfo(fname).exists():
-                    res = E5MessageBox.yesNo(
+                    res = EricMessageBox.yesNo(
                         self,
                         self.tr("Save Call Trace Info"),
                         self.tr("<p>The 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)
@@ -191,7 +191,7 @@
                                 itm.text(1), itm.text(2)))
                             itm = self.callTrace.itemBelow(itm)
                 except OSError as err:
-                    E5MessageBox.critical(
+                    EricMessageBox.critical(
                         self,
                         self.tr("Error saving Call Trace Info"),
                         self.tr("""<p>The call trace info could not"""
@@ -242,7 +242,7 @@
         """
         self.__projectMode = enabled
         if enabled and self.__project is None:
-            self.__project = e5App().getObject("Project")
+            self.__project = ericApp().getObject("Project")
     
     def __addCallTraceInfo(self, isCall, fromFile, fromLine, fromFunction,
                            toFile, toLine, toFunction, debuggerId):

--- a/eric7/Debugger/DebugServer.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Debugger/DebugServer.py	Sat May 22 18:51:46 2021 +0200
@@ -16,8 +16,8 @@
     QTcpServer, QHostAddress, QHostInfo, QNetworkInterface
 )
 
-from E5Gui.E5Application import e5App
-from E5Gui import E5MessageBox
+from E5Gui.EricApplication import ericApp
+from E5Gui import EricMessageBox
 
 from .BreakPointModel import BreakPointModel
 from .WatchPointModel import WatchPointModel
@@ -353,7 +353,7 @@
         @type bool
         """
         if interfaceName in self.__debuggerInterfaces and not reregister:
-            E5MessageBox.warning(
+            EricMessageBox.warning(
                 None,
                 self.tr("Register Debugger Interface"),
                 self.tr("""<p>The debugger interface <b>{0}</b> has already"""
@@ -534,7 +534,7 @@
             self.__forProject = forProject
             self.__createDebuggerInterface()
             if forProject:
-                project = e5App().getObject("Project")
+                project = ericApp().getObject("Project")
                 if not project.isDebugPropertiesLoaded():
                     self.clientProcess, isNetworked, clientInterpreter = (
                         self.debuggerInterface.startRemote(
@@ -875,14 +875,14 @@
         peerAddress = sock.peerAddress().toString()
         if peerAddress not in Preferences.getDebugger("AllowedHosts"):
             # the peer is not allowed to connect
-            res = E5MessageBox.yesNo(
+            res = EricMessageBox.yesNo(
                 None,
                 self.tr("Connection from illegal host"),
                 self.tr(
                     """<p>A connection was attempted by the illegal host"""
                     """ <b>{0}</b>. Accept this connection?</p>""")
                 .format(peerAddress),
-                icon=E5MessageBox.Warning)
+                icon=EricMessageBox.Warning)
             if not res:
                 sock.abort()
                 return
@@ -993,7 +993,7 @@
         
         if clientType not in self.getSupportedLanguages():
             # a not supported client language was requested
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Start Debugger"),
                 self.tr(
@@ -1061,7 +1061,7 @@
         self.__autoClearShell = autoClearShell
         
         if clientType not in self.getSupportedLanguages():
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Start Debugger"),
                 self.tr(
@@ -1127,7 +1127,7 @@
         
         if clientType not in self.getSupportedLanguages():
             # a not supported client language was requested
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Start Debugger"),
                 self.tr(
@@ -1192,7 +1192,7 @@
         
         if clientType not in self.getSupportedLanguages():
             # a not supported client language was requested
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Start Debugger"),
                 self.tr(
@@ -1560,7 +1560,7 @@
         """
         if clientType and clientType not in self.getSupportedLanguages():
             # a not supported client language was requested
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Start Debugger"),
                 self.tr(
@@ -1624,7 +1624,7 @@
         """
         if clientType and clientType not in self.getSupportedLanguages():
             # a not supported client language was requested
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 None,
                 self.tr("Start Debugger"),
                 self.tr(