diff -r 8a7677a63c8d -r 68ec9c3d4de5 eric7/UI/EmailDialog.py --- a/eric7/UI/EmailDialog.py Sat May 22 17:01:51 2021 +0200 +++ b/eric7/UI/EmailDialog.py Sat May 22 18:51:46 2021 +0200 @@ -19,8 +19,8 @@ QTreeWidgetItem ) -from E5Gui import E5MessageBox, E5FileDialog -from E5Gui.E5OverrideCursor import E5OverrideCursor +from E5Gui import EricMessageBox, EricFileDialog +from E5Gui.EricOverrideCursor import EricOverrideCursor from .Ui_EmailDialog import Ui_EmailDialog @@ -110,7 +110,7 @@ @param ev key event (QKeyEvent) """ if ev.key() == Qt.Key.Key_Escape: - res = E5MessageBox.yesNo( + res = EricMessageBox.yesNo( self, self.tr("Close dialog"), self.tr("""Do you really want to close the dialog?""")) @@ -132,7 +132,7 @@ """ Private slot to handle the rejected signal of the button box. """ - res = E5MessageBox.yesNo( + res = EricMessageBox.yesNo( self, self.tr("Close dialog"), self.tr("""Do you really want to close the dialog?""")) @@ -155,8 +155,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) @@ -342,19 +342,19 @@ errorStr = e[1] else: errorStr = str(e) - res = E5MessageBox.retryAbort( + res = EricMessageBox.retryAbort( self, self.tr("Send Message"), self.tr( """<p>Authentication failed.<br>Reason: {0}</p>""") .format(errorStr), - E5MessageBox.Critical) + EricMessageBox.Critical) if res: return self.__sendmail(msg) else: return False - with E5OverrideCursor(): + with EricOverrideCursor(): server.sendmail(Preferences.getUser("Email"), self.__toAddress, msg) server.quit() @@ -367,13 +367,13 @@ errorStr = e.strerror else: errorStr = str(e) - res = E5MessageBox.retryAbort( + res = EricMessageBox.retryAbort( self, self.tr("Send Message"), self.tr( """<p>Message could not be sent.<br>Reason: {0}</p>""") .format(errorStr), - E5MessageBox.Critical) + EricMessageBox.Critical) if res: return self.__sendmail(msg) else: @@ -411,7 +411,7 @@ self.accept() else: # we got an error - E5MessageBox.critical( + EricMessageBox.critical( self, self.tr("Send Message via Gmail"), self.tr( @@ -424,7 +424,7 @@ """ Private slot to handle the Add... button. """ - fname = E5FileDialog.getOpenFileName( + fname = EricFileDialog.getOpenFileName( self, self.tr("Attach file")) if fname: