diff -r 27f636beebad -r 2c730d5fd177 eric6/UI/EmailDialog.py
--- a/eric6/UI/EmailDialog.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/UI/EmailDialog.py Tue Mar 02 17:17:09 2021 +0100
@@ -54,9 +54,9 @@
"""
super(EmailDialog, self).__init__(parent)
self.setupUi(self)
- self.setWindowFlags(Qt.Window)
+ self.setWindowFlags(Qt.WindowType.Window)
- self.message.setWordWrapMode(QTextOption.WordWrap)
+ self.message.setWordWrapMode(QTextOption.WrapMode.WordWrap)
self.__mode = mode
if self.__mode == "feature":
@@ -73,12 +73,13 @@
self.__toAddress = BugAddress
self.sendButton = self.buttonBox.addButton(
- self.tr("Send"), QDialogButtonBox.ActionRole)
+ self.tr("Send"), QDialogButtonBox.ButtonRole.ActionRole)
self.sendButton.setEnabled(False)
self.sendButton.setDefault(True)
self.googleHelpButton = self.buttonBox.addButton(
- self.tr("Google Mail API Help"), QDialogButtonBox.HelpRole)
+ self.tr("Google Mail API Help"),
+ QDialogButtonBox.ButtonRole.HelpRole)
height = self.height()
self.mainSplitter.setSizes([int(0.7 * height), int(0.3 * height)])
@@ -86,7 +87,7 @@
self.attachments.headerItem().setText(
self.attachments.columnCount(), "")
self.attachments.header().setSectionResizeMode(
- QHeaderView.Interactive)
+ QHeaderView.ResizeMode.Interactive)
sig = Preferences.getUser("Signature")
if sig:
@@ -107,7 +108,7 @@
@param ev key event (QKeyEvent)
"""
- if ev.key() == Qt.Key_Escape:
+ if ev.key() == Qt.Key.Key_Escape:
res = E5MessageBox.yesNo(
self,
self.tr("Close dialog"),
@@ -322,7 +323,7 @@
self,
self.tr("Mail Server Password"),
self.tr("Enter your mail server password"),
- QLineEdit.Password)
+ QLineEdit.EchoMode.Password)
if not ok:
# abort
return False
@@ -438,7 +439,8 @@
if not mimeType:
mimeType = "application/octet-stream"
QTreeWidgetItem(self.attachments, [fname, mimeType])
- self.attachments.header().resizeSections(QHeaderView.ResizeToContents)
+ self.attachments.header().resizeSections(
+ QHeaderView.ResizeMode.ResizeToContents)
self.attachments.header().setStretchLastSection(True)
if deleteFile:
