Mercurial Repositories > eric / file diff

--- a/eric7/Preferences/ConfigurationPages/EmailPage.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/Preferences/ConfigurationPages/EmailPage.py	Sat May 22 18:51:46 2021 +0200
@@ -13,9 +13,9 @@
 
 from PyQt6.QtCore import pyqtSlot
 
-from E5Gui import E5MessageBox
-from E5Gui.E5Application import e5App
-from E5Gui.E5OverrideCursor import E5OverrideCursor
+from E5Gui import EricMessageBox
+from E5Gui.EricApplication import ericApp
+from E5Gui.EricOverrideCursor import EricOverrideCursor
 
 from EricNetwork.EricGoogleMailHelpers import getInstallCommand, RequiredPackages
 
@@ -199,7 +199,7 @@
         Private slot to test the mail server login data.
         """
         try:
-            with E5OverrideCursor():
+            with EricOverrideCursor():
                 if self.useSslButton.isChecked():
                     server = smtplib.SMTP_SSL(self.mailServerEdit.text(),
                                               self.portSpin.value(),
@@ -213,7 +213,7 @@
                 server.login(self.mailUserEdit.text(),
                              self.mailPasswordEdit.text())
                 server.quit()
-            E5MessageBox.information(
+            EricMessageBox.information(
                 self,
                 self.tr("Login Test"),
                 self.tr("""The login test succeeded."""))
@@ -229,7 +229,7 @@
                     errorStr = str(e)
             else:
                 errorStr = str(e)
-            E5MessageBox.critical(
+            EricMessageBox.critical(
                 self,
                 self.tr("Login Test"),
                 self.tr(
@@ -251,8 +251,8 @@
                     " Use <code>{0}</code> to install it.</p>"
                 ).format(getInstallCommand())
             
-            from E5Gui.E5SimpleHelpDialog import E5SimpleHelpDialog
-            self.__helpDialog = E5SimpleHelpDialog(
+            from E5Gui.EricSimpleHelpDialog import EricSimpleHelpDialog
+            self.__helpDialog = EricSimpleHelpDialog(
                 title=self.tr("Gmail API Help"),
                 helpStr=helpStr, parent=self)
         
@@ -263,7 +263,7 @@
         """
         Private slot to install the required packages for use of Google Mail.
         """
-        pip = e5App().getObject("Pip")
+        pip = ericApp().getObject("Pip")
         pip.installPackages(RequiredPackages, interpreter=sys.executable)
         self.__checkGoogleMail()