Mercurial Repositories > eric / file diff

--- a/eric7/EricNetwork/EricSslCertificatesDialog.py	Sat May 22 17:01:51 2021 +0200
+++ b/eric7/EricNetwork/EricSslCertificatesDialog.py	Sat May 22 18:51:46 2021 +0200
@@ -18,7 +18,7 @@
         QSslCertificate, QSslSocket, QSslConfiguration, QSsl
     )
 
-from E5Gui import E5MessageBox, E5FileDialog
+from E5Gui import EricMessageBox, EricFileDialog
 
 from .Ui_EricSslCertificatesDialog import Ui_EricSslCertificatesDialog
 
@@ -147,7 +147,7 @@
         Private slot to delete the selected server certificate.
         """
         itm = self.serversCertificatesTree.currentItem()
-        res = E5MessageBox.yesNo(
+        res = EricMessageBox.yesNo(
             self,
             self.tr("Delete Server Certificate"),
             self.tr("""<p>Shall the server certificate really be"""
@@ -213,7 +213,7 @@
                     commonStr = ", ".join(
                         cert.subjectInfo(
                             QSslCertificate.SubjectInfo.CommonName))
-                    E5MessageBox.warning(
+                    EricMessageBox.warning(
                         self,
                         self.tr("Import Certificate"),
                         self.tr(
@@ -352,7 +352,7 @@
         Private slot to delete the selected CA certificate.
         """
         itm = self.caCertificatesTree.currentItem()
-        res = E5MessageBox.yesNo(
+        res = EricMessageBox.yesNo(
             self,
             self.tr("Delete CA Certificate"),
             self.tr(
@@ -398,7 +398,7 @@
                     commonStr = ", ".join(
                         cert.subjectInfo(
                             QSslCertificate.SubjectInfo.CommonName))
-                    E5MessageBox.warning(
+                    EricMessageBox.warning(
                         self,
                         self.tr("Import Certificate"),
                         self.tr(
@@ -439,14 +439,14 @@
         @param cert certificate to be exported (QSslCertificate)
         """
         if cert is not None:
-            fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+            fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
                 self,
                 self.tr("Export Certificate"),
                 name,
                 self.tr("Certificate File (PEM) (*.pem);;"
                         "Certificate File (DER) (*.der)"),
                 None,
-                E5FileDialog.DontConfirmOverwrite)
+                EricFileDialog.DontConfirmOverwrite)
             
             if fname:
                 ext = QFileInfo(fname).suffix()
@@ -455,18 +455,18 @@
                     if ex:
                         fname += ex
                 if QFileInfo(fname).exists():
-                    res = E5MessageBox.yesNo(
+                    res = EricMessageBox.yesNo(
                         self,
                         self.tr("Export Certificate"),
                         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
                 
                 f = QFile(fname)
                 if not f.open(QIODevice.OpenModeFlag.WriteOnly):
-                    E5MessageBox.critical(
+                    EricMessageBox.critical(
                         self,
                         self.tr("Export Certificate"),
                         self.tr(
@@ -488,7 +488,7 @@
         
         @return certificates read (list of QSslCertificate)
         """
-        fname = E5FileDialog.getOpenFileName(
+        fname = EricFileDialog.getOpenFileName(
             self,
             self.tr("Import Certificate"),
             "",
@@ -498,7 +498,7 @@
         if fname:
             f = QFile(fname)
             if not f.open(QIODevice.OpenModeFlag.ReadOnly):
-                E5MessageBox.critical(
+                EricMessageBox.critical(
                     self,
                     self.tr("Export Certificate"),
                     self.tr(