eric: comparison UI/EmailDialog.py

-:6f4d7d02cb1e
+:944c04cec861
 # Copyright (c) 2003 - 2017 Detlev Offenbach <detlev@die-offenbachs.de>
 #
 """
-Module implementing a dialog to send bug reports.
+Module implementing a dialog to send bug reports or feature requests.
 """
 from __future__ import unicode_literals
 import os
 # WORK AROUND: implement our corrected encoder
 class EmailDialog(QDialog, Ui_EmailDialog):
 """
-Class implementing a dialog to send bug reports.
+Class implementing a dialog to send bug reports or feature requests.
 """
 def __init__(self, mode="bug", parent=None):
 """
 Constructor
 self.sendButton = self.buttonBox.addButton(
 self.tr("Send"), QDialogButtonBox.ActionRole)
 self.sendButton.setEnabled(False)
 self.sendButton.setDefault(True)
+self.googleHelpButton = self.buttonBox.addButton(
+self.tr("Google Mail API Help"), QDialogButtonBox.HelpRole)
 height = self.height()
 self.mainSplitter.setSizes([int(0.7 * height), int(0.3 * height)])
 self.attachments.headerItem().setText(
 self.attachments.columnCount(), "")
 self.message.setTextCursor(cursor)
 self.message.ensureCursorVisible()
 self.__deleteFiles = []
+self.__helpDialog = None
 def keyPressEvent(self, ev):
 """
 Protected method to handle the user pressing the escape key.
 @param ev key event (QKeyEvent)
 @param button button that was clicked (QAbstractButton)
 """
 if button == self.sendButton:
 self.on_sendButton_clicked()
+elif button == self.googleHelpButton:
+self.on_googleHelpButton_clicked()
 def on_buttonBox_rejected(self):
 """
 Private slot to handle the rejected signal of the button box.
 """
 self,
 self.tr("Close dialog"),
 self.tr("""Do you really want to close the dialog?"""))
 if res:
 self.reject()
+@pyqtSlot()
+def on_googleHelpButton_clicked(self):
+"""
+Private slot to show some help text "how to turn on the Gmail API".
+"""
+if self.__helpDialog is None:
+try:
+from E5Network.E5GoogleMail import GoogleMailHelp
+help = GoogleMailHelp()
+except ImportError:
+help = self.tr(
+"<p>The Google Mail Client API is not installed."
+" Use <code>pip install --upgrade google-api-python-client"
+"</code> to install it.</p>")
+from E5Gui.E5SimpleHelpDialog import E5SimpleHelpDialog
+self.__helpDialog = E5SimpleHelpDialog(
+title=self.tr("Gmail API Help"),
+help=help, parent=self)
+self.__helpDialog.show()
 @pyqtSlot()
 def on_sendButton_clicked(self):
 """
 Private slot to send the email message.
 """
 if self.attachments.topLevelItemCount():
 msg = self.__createMultipartMail()
 else:
 msg = self.__createSimpleMail()
-ok = self.__sendmail(msg)
+if Preferences.getUser("UseGoogleMailOAuth2"):
+ok = self.__sendmailGoogle(msg)
+else:
+ok = self.__sendmail(msg.as_string())
 if ok:
 for f in self.__deleteFiles:
 try:
 os.remove(f)
 def __createSimpleMail(self):
 """
 Private method to create a simple mail message.
-@return string containing the mail message
+@return prepared mail message
+@rtype email.mime.text.MIMEText
 """
 msgtext = "{0}\r\n----\r\n{1}----\r\n{2}----\r\n{3}".format(
 self.message.toPlainText(),
 Utilities.generateVersionInfo("\r\n"),
 Utilities.generatePluginsVersionInfo("\r\n"),
 msg['From'] = Preferences.getUser("Email")
 msg['To'] = self.__toAddress
 subject = '[eric6] {0}'.format(self.subject.text())
 msg['Subject'] = self.__encodedHeader(subject)
-return msg.as_string()
+return msg
 def __createMultipartMail(self):
 """
 Private method to create a multipart mail message.
-@return string containing the mail message
+@return prepared mail message
+@rtype email.mime.text.MIMEMultipart
 """
 mpPreamble = ("This is a MIME-encoded message with attachments. "
 "If you see this message, your mail client is not "
 "capable of displaying the attachments.")
 else:
 att = MIMEApplication(open(fname, 'rb').read())
 att.add_header('Content-Disposition', 'attachment', filename=name)
 msg.attach(att)
-return msg.as_string()
+return msg
 def __sendmail(self, msg):
 """
 Private method to actually send the message.
 errorStr = e[1]
 else:
 errorStr = str(e)
 res = E5MessageBox.retryAbort(
 self,
-self.tr("Send bug report"),
+self.tr("Send Message"),
 self.tr(
 """<p>Authentication failed.<br>Reason: {0}</p>""")
 .format(errorStr),
 E5MessageBox.Critical)
 if res:
 errorStr = e.strerror
 else:
 errorStr = str(e)
 res = E5MessageBox.retryAbort(
 self,
-self.tr("Send bug report"),
+self.tr("Send Message"),
 self.tr(
 """<p>Message could not be sent.<br>Reason: {0}</p>""")
 .format(errorStr),
 E5MessageBox.Critical)
 if res:
 return self.__sendmail(msg)
 else:
 return False
 return True
+def __sendmailGoogle(self, msg):
+"""
+Private method to actually send the message via Google Mail.
+@param message email message to be sent
+@type email.mime.text.MIMEBase
+@return flag indicating success
+@rtype bool
+"""
+from E5Network.E5GoogleMail import GoogleMailSendMessage
+QApplication.setOverrideCursor(QCursor(Qt.WaitCursor))
+QApplication.processEvents()
+ok, result = GoogleMailSendMessage(msg)
+QApplication.restoreOverrideCursor()
+if not ok:
+# we got an error
+E5MessageBox.critical(
+self,
+self.tr("Send Message"),
+self.tr(
+"""<p>Message could not be sent.<br>Reason: {0}</p>""")
+.format(result)
+)
+return ok
 @pyqtSlot()
 def on_addButton_clicked(self):
 """
 Private slot to handle the Add... button.
 """

Mercurial Repositories > eric / file comparison

comparison: UI/EmailDialog.py

UI/EmailDialog.py