summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/unsupported/mail2/TODO5
-rw-r--r--noncore/unsupported/mail2/composer.cpp2
-rw-r--r--noncore/unsupported/mail2/libmail/mailfactory.cpp2
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,10 +1,11 @@
1LISAmail TODO 1Mail TODO
2----------------------------------------------------------------------------- 2-----------------------------------------------------------------------------
3 3
4General stuff: 4General stuff:
5 - This program needs a name!
5 - If password is empty, ask for it during fetch. 6 - If password is empty, ask for it during fetch.
6 - Check if all necessary fields in AccoundEditor are filled. 7 - Check if all necessary fields in AccoundEditor are filled.
7 8
8Protocol related: 9Protocol related:
9 - The IMAP implentation is kinda strange and slow. 10 - The IMAP implentation is kinda strange and slow.
10 - The SMTP implentation is goddamn strange. 11 - The SMTP implentation is goddamn strange.
@@ -24,8 +25,8 @@ Mail management:
24 25
25Testing: 26Testing:
26 I'm using the courier-imap server at my developement site. I didn't have 27 I'm using the courier-imap server at my developement site. I didn't have
27 much opportunity to test on other servers. Giving me test-accounts on other 28 much opportunity to test on other servers. Giving me test-accounts on other
28 servers would be helpfull. 29 servers would be helpfull.
29 30
30If you want something added, drop a mail. Comments are allways welcome. 31If you want something added, drop a mail. Comments are always welcome.
31 32
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
@@ -134,12 +134,14 @@ void Composer::slotSendError(const QString &error)
134 status->setText(tr("<font color=#ff0000>Error occoured during sending.</font>")); 134 status->setText(tr("<font color=#ff0000>Error occoured during sending.</font>"));
135 QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok")); 135 QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok"));
136} 136}
137 137
138void Composer::slotSendFinished() 138void Composer::slotSendFinished()
139{ 139{
140 QMessageBox::information(this, tr("Success"), tr("<p>The mail was sent successfully.</p>"), tr("Ok"));
141
140 status->setText(QString(0)); 142 status->setText(QString(0));
141 abort->setEnabled(false); 143 abort->setEnabled(false);
142} 144}
143 145
144void Composer::slotFillStuff() 146void Composer::slotFillStuff()
145{ 147{
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
@@ -97,13 +97,13 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent)
97 _body += "Content-Disposition: attachment; filename=\"" + (*it).newName() + "\"\n"; 97 _body += "Content-Disposition: attachment; filename=\"" + (*it).newName() + "\"\n";
98 if (!(*it).description().isEmpty()) 98 if (!(*it).description().isEmpty())
99 _body += "Content-Description: " + (*it).description() + "\n"; 99 _body += "Content-Description: " + (*it).description() + "\n";
100 100
101 _body += "\n" + MiscFunctions::encodeBase64(file) + "\n"; 101 _body += "\n" + MiscFunctions::encodeBase64(file) + "\n";
102 } else { 102 } else {
103 int ret = QMessageBox::critical(_parent, tr("Error"), tr("<p>Couldn't attach file '%1'. Continue anyway or abort?</p>"), tr("Continue"), tr("Abort")); 103 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"));
104 if (ret == 1) { 104 if (ret == 1) {
105 it = attachments.end(); 105 it = attachments.end();
106 _abort = true; 106 _abort = true;
107 } 107 }
108 } 108 }
109 } 109 }