Diffstat (limited to 'noncore/net/mailit/writemail.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mailit/writemail.cpp | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/noncore/net/mailit/writemail.cpp b/noncore/net/mailit/writemail.cpp index dcf0c6e..c75494e 100644 --- a/noncore/net/mailit/writemail.cpp +++ b/noncore/net/mailit/writemail.cpp | |||
@@ -22,8 +22,7 @@ | |||
22 | #include "writemail.h" | 22 | #include "writemail.h" |
23 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
24 | 24 | ||
25 | WriteMail::WriteMail( QWidget* parent, const char* name, WFlags fl ) | 25 | WriteMail::WriteMail( QWidget* parent, const char* name, WFlags fl ):QMainWindow( parent, name, fl ) |
26 | : QMainWindow( parent, name, fl ) | ||
27 | { | 26 | { |
28 | showingAddressList = FALSE; | 27 | showingAddressList = FALSE; |
29 | init(); | 28 | init(); |
@@ -259,7 +258,7 @@ void WriteMail::reply(Email replyMail, bool replyAll) | |||
259 | toInput->setText(mail.fromMail); | 258 | toInput->setText(mail.fromMail); |
260 | 259 | ||
261 | if (replyAll) | 260 | if (replyAll) |
262 | { | 261 | { |
263 | for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it) | 262 | for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it) |
264 | { | 263 | { |
265 | ccRecipients.append(*it); | 264 | ccRecipients.append(*it); |
@@ -268,11 +267,17 @@ void WriteMail::reply(Email replyMail, bool replyAll) | |||
268 | ccRecipients.truncate(ccRecipients.length()-1); //no ; at the end | 267 | ccRecipients.truncate(ccRecipients.length()-1); //no ; at the end |
269 | ccInput->setText(ccRecipients); | 268 | ccInput->setText(ccRecipients); |
270 | } | 269 | } |
271 | 270 | else ccInput->clear(); | |
272 | addRecipients(replyAll); | ||
273 | 271 | ||
274 | subjectInput->setText(tr("Re: ") + mail.subject); | 272 | subjectInput->setText(tr("Re: ") + mail.subject); |
275 | 273 | ||
274 | QString citation=mail.fromMail; | ||
275 | citation.append(tr(" wrote on ")); | ||
276 | citation.append(mail.date); | ||
277 | citation.append(":\n"); | ||
278 | |||
279 | |||
280 | //mail.body.insert(0,tr("On")); | ||
276 | pos = 0; | 281 | pos = 0; |
277 | mail.body.insert(pos, ">"); | 282 | mail.body.insert(pos, ">"); |
278 | while (pos != -1) { | 283 | while (pos != -1) { |
@@ -280,7 +285,7 @@ void WriteMail::reply(Email replyMail, bool replyAll) | |||
280 | if (pos != -1) | 285 | if (pos != -1) |
281 | mail.body.insert(++pos, ">>"); | 286 | mail.body.insert(++pos, ">>"); |
282 | } | 287 | } |
283 | 288 | mail.body.insert(0,citation); | |
284 | emailInput->setText(mail.body); | 289 | emailInput->setText(mail.body); |
285 | } | 290 | } |
286 | 291 | ||
@@ -308,9 +313,16 @@ bool WriteMail::getRecipients(bool ccField) | |||
308 | QString str, temp; | 313 | QString str, temp; |
309 | int pos = 0; | 314 | int pos = 0; |
310 | 315 | ||
311 | mail.recipients.clear(); | 316 | if (ccField) |
312 | 317 | { | |
313 | ccField ? temp = ccInput->text() : temp=toInput->text() ; | 318 | mail.carbonCopies.clear(); |
319 | temp = ccInput->text(); | ||
320 | } | ||
321 | else | ||
322 | { | ||
323 | mail.recipients.clear(); | ||
324 | temp=toInput->text() ; | ||
325 | } | ||
314 | 326 | ||
315 | while ( (pos = temp.find(';')) != -1) { | 327 | while ( (pos = temp.find(';')) != -1) { |
316 | str = temp.left(pos).stripWhiteSpace(); | 328 | str = temp.left(pos).stripWhiteSpace(); |
@@ -318,13 +330,13 @@ bool WriteMail::getRecipients(bool ccField) | |||
318 | if ( str.find('@') == -1) | 330 | if ( str.find('@') == -1) |
319 | return false; | 331 | return false; |
320 | ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str); | 332 | ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str); |
321 | addressList->addContact(str, ""); | 333 | //addressList->addContact(str, ""); |
322 | } | 334 | } |
323 | temp = temp.stripWhiteSpace(); | 335 | temp = temp.stripWhiteSpace(); |
324 | if ( temp.find('@') == -1) | 336 | if ( temp.find('@') == -1) |
325 | return false; | 337 | return false; |
326 | ccField ? mail.carbonCopies.append(temp) : mail.recipients.append(temp); | 338 | ccField ? mail.carbonCopies.append(temp) : mail.recipients.append(temp); |
327 | addressList->addContact(temp, ""); | 339 | //addressList->addContact(temp, ""); |
328 | 340 | ||
329 | return TRUE; | 341 | return TRUE; |
330 | } | 342 | } |
@@ -383,6 +395,7 @@ void WriteMail::setRecipient(const QString &recipient) | |||
383 | void WriteMail::newMail() | 395 | void WriteMail::newMail() |
384 | { | 396 | { |
385 | toInput->clear(); | 397 | toInput->clear(); |
398 | ccInput->clear(); | ||
386 | subjectInput->clear(); | 399 | subjectInput->clear(); |
387 | emailInput->clear(); | 400 | emailInput->clear(); |
388 | setAddressList(addressList); | 401 | setAddressList(addressList); |