-rw-r--r-- | kmicromail/opiemail.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp index 8d16ae7..af5376f 100644 --- a/kmicromail/opiemail.cpp +++ b/kmicromail/opiemail.cpp | |||
@@ -18,16 +18,17 @@ | |||
18 | #include "selectsmtp.h" | 18 | #include "selectsmtp.h" |
19 | #include "accountitem.h" | 19 | #include "accountitem.h" |
20 | #include "klocale.h" | 20 | #include "klocale.h" |
21 | 21 | ||
22 | #include <qmessagebox.h> | 22 | #include <qmessagebox.h> |
23 | #include <qtimer.h> | 23 | #include <qtimer.h> |
24 | #include <qcursor.h> | 24 | #include <qcursor.h> |
25 | #include <qregexp.h> | 25 | #include <qregexp.h> |
26 | #include <qpe/global.h> | ||
26 | 27 | ||
27 | #ifdef DESKTOP_VERSION | 28 | #ifdef DESKTOP_VERSION |
28 | #include <qapplication.h> | 29 | #include <qapplication.h> |
29 | #else | 30 | #else |
30 | #include <qpe/qpeapplication.h> | 31 | #include <qpe/qpeapplication.h> |
31 | #endif | 32 | #endif |
32 | #include <libmailwrapper/smtpwrapper.h> | 33 | #include <libmailwrapper/smtpwrapper.h> |
33 | #include <libmailwrapper/mailtypes.h> | 34 | #include <libmailwrapper/mailtypes.h> |
@@ -184,16 +185,18 @@ void OpieMail::slotSendQueued() | |||
184 | smtpList.append(smtp); | 185 | smtpList.append(smtp); |
185 | } | 186 | } |
186 | } | 187 | } |
187 | if (smtpList.count()==0) | 188 | if (smtpList.count()==0) |
188 | { | 189 | { |
189 | QMessageBox::information(0,i18n("Info"),i18n("Define a smtp account first!\n")); | 190 | QMessageBox::information(0,i18n("Info"),i18n("Define a smtp account first!\n")); |
190 | return; | 191 | return; |
191 | } | 192 | } |
193 | if ( QMessageBox::warning(this, i18n("Sending all mails"), i18n("Do you really want to send\nall queued mails?" ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No ) | ||
194 | return; | ||
192 | if (smtpList.count()==1) | 195 | if (smtpList.count()==1) |
193 | { | 196 | { |
194 | smtp = smtpList.at(0); | 197 | smtp = smtpList.at(0); |
195 | } | 198 | } |
196 | else | 199 | else |
197 | { | 200 | { |
198 | smtp = 0; | 201 | smtp = 0; |
199 | selectsmtp selsmtp; | 202 | selectsmtp selsmtp; |
@@ -203,23 +206,26 @@ void OpieMail::slotSendQueued() | |||
203 | #endif | 206 | #endif |
204 | if ( selsmtp.exec() == QDialog::Accepted ) | 207 | if ( selsmtp.exec() == QDialog::Accepted ) |
205 | { | 208 | { |
206 | smtp = selsmtp.selected_smtp(); | 209 | smtp = selsmtp.selected_smtp(); |
207 | } | 210 | } |
208 | } | 211 | } |
209 | if (smtp) | 212 | if (smtp) |
210 | { | 213 | { |
214 | |||
215 | Global::statusMessage("Sending mails...!"); | ||
211 | SMTPwrapper * wrap = new SMTPwrapper(smtp); | 216 | SMTPwrapper * wrap = new SMTPwrapper(smtp); |
212 | if ( wrap->flushOutbox() ) | 217 | if ( wrap->flushOutbox() ) |
213 | { | 218 | { |
214 | QMessageBox::information(0,i18n("Info"),i18n("Mail queue flushed")); | 219 | Global::statusMessage("Mails sent!"); |
215 | } | 220 | } |
216 | delete wrap; | 221 | delete wrap; |
217 | } | 222 | } |
223 | // pending refresh list view, if outgoing is displayed | ||
218 | } | 224 | } |
219 | 225 | ||
220 | void OpieMail::slotSearchMails() | 226 | void OpieMail::slotSearchMails() |
221 | { | 227 | { |
222 | qDebug("OpieMail::slotSearchMails():not implemented "); | 228 | qDebug("OpieMail::slotSearchMails():not implemented "); |
223 | } | 229 | } |
224 | 230 | ||
225 | void OpieMail::slotEditSettings() | 231 | void OpieMail::slotEditSettings() |
@@ -425,16 +431,17 @@ void OpieMail::refreshMailView(const QValueList<RecMailP>&list) | |||
425 | 431 | ||
426 | QValueList<RecMailP>::ConstIterator it; | 432 | QValueList<RecMailP>::ConstIterator it; |
427 | for (it = list.begin(); it != list.end();++it) | 433 | for (it = list.begin(); it != list.end();++it) |
428 | { | 434 | { |
429 | item = new MailListViewItem(mailView,item); | 435 | item = new MailListViewItem(mailView,item); |
430 | item->storeData((*it)); | 436 | item->storeData((*it)); |
431 | item->showEntry(); | 437 | item->showEntry(); |
432 | } | 438 | } |
439 | mailView->setSorting ( 4, false ); | ||
433 | } | 440 | } |
434 | 441 | ||
435 | void OpieMail::mailLeftClicked( QListViewItem *item ) | 442 | void OpieMail::mailLeftClicked( QListViewItem *item ) |
436 | { | 443 | { |
437 | mailView->clearSelection(); | 444 | mailView->clearSelection(); |
438 | /* just LEFT button - or tap with stylus on pda */ | 445 | /* just LEFT button - or tap with stylus on pda */ |
439 | //if (button!=1) return; | 446 | //if (button!=1) return; |
440 | if (!item) return; | 447 | if (!item) return; |