| -rw-r--r-- | noncore/unsupported/mail2/TODO | 5 | ||||
| -rw-r--r-- | noncore/unsupported/mail2/composer.cpp | 2 | ||||
| -rw-r--r-- | noncore/unsupported/mail2/libmail/mailfactory.cpp | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/noncore/unsupported/mail2/TODO b/noncore/unsupported/mail2/TODO index ef596dc..5873615 100644 --- a/noncore/unsupported/mail2/TODO +++ b/noncore/unsupported/mail2/TODO @@ -1,31 +1,32 @@ -LISAmail TODO +Mail TODO ----------------------------------------------------------------------------- General stuff: + - This program needs a name! - If password is empty, ask for it during fetch. - Check if all necessary fields in AccoundEditor are filled. Protocol related: - The IMAP implentation is kinda strange and slow. - The SMTP implentation is goddamn strange. - POP3 support would be nice. - NNTP would be kinda neat, too. - Implent a plugin system. Security related: - GnuPG support. This will require a seperate gpg managing utility in the settings tab. - sMIME? maybe in the distant future. Mail management: - Header caching - Sieve filtering support? - Enqueueing/Draft support both on the IMAP server and local. Testing: I'm using the courier-imap server at my developement site. I didn't have much opportunity to test on other servers. Giving me test-accounts on other servers would be helpfull. -If you want something added, drop a mail. Comments are allways welcome. +If you want something added, drop a mail. Comments are always welcome. diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp index 2f13604..03d50b6 100644 --- a/noncore/unsupported/mail2/composer.cpp +++ b/noncore/unsupported/mail2/composer.cpp @@ -124,32 +124,34 @@ void Composer::slotSendMail() abort->setEnabled(true); SmtpHandler *handler = new SmtpHandler(header, message, accountsLoaded[from->currentItem()], to->text()); connect(handler, SIGNAL(finished()), SLOT(slotSendFinished())); connect(handler, SIGNAL(error(const QString &)), SLOT(slotSendError(const QString &))); connect(handler, SIGNAL(status(const QString &)), status, SLOT(setText(const QString &))); } void Composer::slotSendError(const QString &error) { status->setText(tr("<font color=#ff0000>Error occoured during sending.</font>")); QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok")); } void Composer::slotSendFinished() { + QMessageBox::information(this, tr("Success"), tr("<p>The mail was sent successfully.</p>"), tr("Ok")); + status->setText(QString(0)); abort->setEnabled(false); } void Composer::slotFillStuff() { QValueList<Account> accounts = ConfigFile::getAccounts(); int i = 0; QValueList<Account>::Iterator it; for (it = accounts.begin(); it != accounts.end(); it++) { if (!(*it).email().isEmpty() && !(*it).smtpServer().isEmpty() && !(*it).smtpPort().isEmpty()) { if (!(*it).realName().isEmpty()) from->insertItem((*it).realName() + " <" + (*it).email() + ">", i); else from->insertItem((*it).email()); diff --git a/noncore/unsupported/mail2/libmail/mailfactory.cpp b/noncore/unsupported/mail2/libmail/mailfactory.cpp index 58cf5f8..427e72c 100644 --- a/noncore/unsupported/mail2/libmail/mailfactory.cpp +++ b/noncore/unsupported/mail2/libmail/mailfactory.cpp @@ -87,33 +87,33 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent) while (!t.atEnd()) file += t.readLine() + "\n"; f.close(); QString mimetype = (new MimeType(*(*it).docLnk()))->id(); _body += "\n--" + boundary + "\n"; _body += "Content-Type: " + mimetype + "; name=\"" + (*it).newName() + "\"\n"; // TODO: Decide which content transfer encoding is best. B64 for binary, QP for text. _body += "Content-Transfer-Encoding: base64\n"; _body += "Content-Disposition: attachment; filename=\"" + (*it).newName() + "\"\n"; if (!(*it).description().isEmpty()) _body += "Content-Description: " + (*it).description() + "\n"; _body += "\n" + MiscFunctions::encodeBase64(file) + "\n"; } else { - int ret = QMessageBox::critical(_parent, tr("Error"), tr("<p>Couldn't attach file '%1'. Continue anyway or abort?</p>"), tr("Continue"), tr("Abort")); + int ret = QMessageBox::critical(_parent, tr("Error"), tr("<p>Couldn't attach file '%1'. Continue anyway or abort?</p>").arg((*it).fileName()), tr("Continue"), tr("Abort")); if (ret == 1) { it = attachments.end(); _abort = true; } } } _body += "\n--" + boundary + "--"; } if (_abort) { _body = QString(0); _header = QString(0); } } // Unfinished GPG code. |