Mercurial Repositories > eric / file comparison
comparison: UI/EmailDialog.py
UI/EmailDialog.py
- changeset 432
- 497e188ee86e
- parent 120
- c0ef4b5e679a
- child 537
- 72b32daeb8d6
equal
deleted
inserted
replaced
| 431:96cc7d322f89 | 432:497e188ee86e |
|---|---|
| 189 """ | 189 """ |
| 190 Private method to create a simple mail message. | 190 Private method to create a simple mail message. |
| 191 | 191 |
| 192 @return string containing the mail message | 192 @return string containing the mail message |
| 193 """ | 193 """ |
| 194 msgtext = "%s\r\n----\r\n%s----\r\n%s----\r\n%s" % \ | 194 msgtext = "{0}\r\n----\r\n{1}----\r\n{2}----\r\n{3}".format( |
| 195 (self.message.toPlainText(), | 195 self.message.toPlainText(), |
| 196 Utilities.generateVersionInfo("\r\n"), | 196 Utilities.generateVersionInfo("\r\n"), |
| 197 Utilities.generatePluginsVersionInfo("\r\n"), | 197 Utilities.generatePluginsVersionInfo("\r\n"), |
| 198 Utilities.generateDistroInfo("\r\n")) | 198 Utilities.generateDistroInfo("\r\n")) |
| 199 | 199 |
| 200 msg = self.__encodedText(msgtext) | 200 msg = self.__encodedText(msgtext) |
| 201 msg['From'] = Preferences.getUser("Email") | 201 msg['From'] = Preferences.getUser("Email") |
| 202 msg['To'] = self.__toAddress | 202 msg['To'] = self.__toAddress |
| 203 subject = '[eric5] %s' % self.subject.text() | 203 subject = '[eric5] {0}'.format(self.subject.text()) |
| 204 msg['Subject'] = self.__encodedHeader(subject) | 204 msg['Subject'] = self.__encodedHeader(subject) |
| 205 | 205 |
| 206 return msg.as_string() | 206 return msg.as_string() |
| 207 | 207 |
| 208 def __createMultipartMail(self): | 208 def __createMultipartMail(self): |
| 213 """ | 213 """ |
| 214 mpPreamble = ("This is a MIME-encoded message with attachments. " | 214 mpPreamble = ("This is a MIME-encoded message with attachments. " |
| 215 "If you see this message, your mail client is not " | 215 "If you see this message, your mail client is not " |
| 216 "capable of displaying the attachments.") | 216 "capable of displaying the attachments.") |
| 217 | 217 |
| 218 msgtext = "%s\r\n----\r\n%s----\r\n%s----\r\n%s" % \ | 218 msgtext = "{0}\r\n----\r\n{1}----\r\n{2}----\r\n{3}".format( |
| 219 (self.message.toPlainText(), | 219 self.message.toPlainText(), |
| 220 Utilities.generateVersionInfo("\r\n"), | 220 Utilities.generateVersionInfo("\r\n"), |
| 221 Utilities.generatePluginsVersionInfo("\r\n"), | 221 Utilities.generatePluginsVersionInfo("\r\n"), |
| 222 Utilities.generateDistroInfo("\r\n")) | 222 Utilities.generateDistroInfo("\r\n")) |
| 223 | 223 |
| 224 # first part of multipart mail explains format | 224 # first part of multipart mail explains format |
| 225 msg = MIMEMultipart() | 225 msg = MIMEMultipart() |
| 226 msg['From'] = Preferences.getUser("Email") | 226 msg['From'] = Preferences.getUser("Email") |
| 227 msg['To'] = self.__toAddress | 227 msg['To'] = self.__toAddress |
| 228 subject = '[eric5] %s' % self.subject.text() | 228 subject = '[eric5] {0}'.format(self.subject.text()) |
| 229 msg['Subject'] = self.__encodedHeader(subject) | 229 msg['Subject'] = self.__encodedHeader(subject) |
| 230 msg.preamble = mpPreamble | 230 msg.preamble = mpPreamble |
| 231 msg.epilogue = '' | 231 msg.epilogue = '' |
| 232 | 232 |
| 233 # second part is intended to be read | 233 # second part is intended to be read |
