--- a/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Sat May 22 17:01:51 2021 +0200 +++ b/eric7/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Sat May 22 18:51:46 2021 +0200 @@ -10,7 +10,7 @@ from PyQt6.QtWidgets import QApplication, QDialog, QWidget -from E5Gui.E5OverrideCursor import E5OverridenCursor +from E5Gui.EricOverrideCursor import EricOverridenCursor class SvnDialogMixin: @@ -64,7 +64,7 @@ """ from .SvnLoginDialog import SvnLoginDialog - with E5OverridenCursor(): + with EricOverridenCursor(): parent = isinstance(self, QWidget) and self or None dlg = SvnLoginDialog(realm, username, may_save, parent) res = dlg.exec() @@ -86,12 +86,12 @@ acceptedFailures should indicate the accepted certificate failures and save should be True, if subversion should save the certificate. """ - from E5Gui import E5MessageBox + from E5Gui import EricMessageBox - with E5OverridenCursor(): + with EricOverridenCursor(): parent = isinstance(self, QWidget) and self or None - msgBox = E5MessageBox.E5MessageBox( - E5MessageBox.Question, + msgBox = EricMessageBox.EricMessageBox( + EricMessageBox.Question, self.tr("Subversion SSL Server Certificate"), self.tr("""<p>Accept the following SSL certificate?</p>""" """<table>""" @@ -110,10 +110,10 @@ trust_dict["issuer_dname"]), modal=True, parent=parent) permButton = msgBox.addButton(self.tr("&Permanent accept"), - E5MessageBox.AcceptRole) + EricMessageBox.AcceptRole) tempButton = msgBox.addButton(self.tr("&Temporary accept"), - E5MessageBox.AcceptRole) - msgBox.addButton(self.tr("&Reject"), E5MessageBox.RejectRole) + EricMessageBox.AcceptRole) + msgBox.addButton(self.tr("&Reject"), EricMessageBox.RejectRole) msgBox.exec() if msgBox.clickedButton() == permButton: