-rw-r--r-- | noncore/net/mail/abstractmail.h | 2 | ||||
-rw-r--r-- | noncore/net/mail/accountview.cpp | 76 | ||||
-rw-r--r-- | noncore/net/mail/accountview.h | 6 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/abstractmail.h | 2 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.cpp | 31 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/pop3wrapper.h | 1 | ||||
-rw-r--r-- | noncore/net/mail/pop3wrapper.cpp | 31 | ||||
-rw-r--r-- | noncore/net/mail/pop3wrapper.h | 1 |
8 files changed, 106 insertions, 44 deletions
diff --git a/noncore/net/mail/abstractmail.h b/noncore/net/mail/abstractmail.h index b609aa7..5dc4cab 100644 --- a/noncore/net/mail/abstractmail.h +++ b/noncore/net/mail/abstractmail.h | |||
@@ -31,2 +31,3 @@ public: | |||
31 | virtual int deleteAllMail(const Folder*){return 1;} | 31 | virtual int deleteAllMail(const Folder*){return 1;} |
32 | virtual int deleteMbox(const Folder*){return 1;} | ||
32 | 33 | ||
@@ -38,3 +39,2 @@ public: | |||
38 | virtual int createMbox(const QString&,const Folder*parentfolder=0,const QString& delemiter="/",bool getsubfolder=false){return 0;} | 39 | virtual int createMbox(const QString&,const Folder*parentfolder=0,const QString& delemiter="/",bool getsubfolder=false){return 0;} |
39 | virtual int deleteMbox(const Folder*){return 1;} | ||
40 | 40 | ||
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp index 30765cf..f861c20 100644 --- a/noncore/net/mail/accountview.cpp +++ b/noncore/net/mail/accountview.cpp | |||
@@ -86,2 +86,27 @@ RecBody POP3folderItem::fetchBody(const RecMail&aMail) | |||
86 | 86 | ||
87 | QPopupMenu * POP3folderItem::getContextMenu() | ||
88 | { | ||
89 | QPopupMenu *m = new QPopupMenu(0); | ||
90 | if (m) { | ||
91 | m->insertItem(QObject::tr("Refresh header list",contextName),0); | ||
92 | m->insertItem(QObject::tr("Delete all mails",contextName),1); | ||
93 | } | ||
94 | return m; | ||
95 | } | ||
96 | |||
97 | void POP3folderItem::contextMenuSelected(int which) | ||
98 | { | ||
99 | AccountView * view = (AccountView*)listView(); | ||
100 | switch (which) { | ||
101 | case 0: | ||
102 | view->refreshCurrent(); | ||
103 | break; | ||
104 | case 1: | ||
105 | deleteAllMail(pop3->getWrapper(),folder); | ||
106 | break; | ||
107 | default: | ||
108 | break; | ||
109 | } | ||
110 | } | ||
111 | |||
87 | /** | 112 | /** |
@@ -306,17 +331,2 @@ QPopupMenu * IMAPfolderItem::getContextMenu() | |||
306 | 331 | ||
307 | void IMAPfolderItem::deleteAllMails() | ||
308 | { | ||
309 | int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName), | ||
310 | QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).arg(folder->getDisplayName()), | ||
311 | QObject::tr("Yes",contextName), | ||
312 | QObject::tr("No",contextName),QString::null,1,1); | ||
313 | qDebug("Auswahl: %i",yesno); | ||
314 | if (yesno == 0) { | ||
315 | if (imap->getWrapper()->deleteAllMail(folder)) { | ||
316 | AccountView * view = (AccountView*)listView(); | ||
317 | if (view) view->refreshCurrent(); | ||
318 | } | ||
319 | } | ||
320 | } | ||
321 | |||
322 | void IMAPfolderItem::createNewFolder() | 332 | void IMAPfolderItem::createNewFolder() |
@@ -365,3 +375,3 @@ void IMAPfolderItem::contextMenuSelected(int id) | |||
365 | case 1: | 375 | case 1: |
366 | deleteAllMails(); | 376 | deleteAllMail(imap->getWrapper(),folder); |
367 | break; | 377 | break; |
@@ -384,2 +394,19 @@ const QString AccountViewItem::contextName="AccountViewItem"; | |||
384 | 394 | ||
395 | void AccountViewItem::deleteAllMail(AbstractMail*wrapper,Folder*folder) | ||
396 | { | ||
397 | if (!wrapper) return; | ||
398 | int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName), | ||
399 | QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName). | ||
400 | arg((folder?folder->getDisplayName():"")), | ||
401 | QObject::tr("Yes",contextName), | ||
402 | QObject::tr("No",contextName),QString::null,1,1); | ||
403 | qDebug("Auswahl: %i",yesno); | ||
404 | if (yesno == 0) { | ||
405 | if (wrapper->deleteAllMail(folder)) { | ||
406 | AccountView * view = (AccountView*)listView(); | ||
407 | if (view) view->refreshCurrent(); | ||
408 | } | ||
409 | } | ||
410 | } | ||
411 | |||
385 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) | 412 | AccountView::AccountView( QWidget *parent, const char *name, WFlags flags ) |
@@ -596,17 +623,2 @@ RecBody MBOXfolderItem::fetchBody(const RecMail&aMail) | |||
596 | 623 | ||
597 | void MBOXfolderItem::deleteAllMails() | ||
598 | { | ||
599 | int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName), | ||
600 | QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).arg(folder->getDisplayName()), | ||
601 | QObject::tr("Yes",contextName), | ||
602 | QObject::tr("No",contextName),QString::null,1,1); | ||
603 | qDebug("Auswahl: %i",yesno); | ||
604 | if (yesno == 0) { | ||
605 | if (mbox->getWrapper()->deleteAllMail(folder)) { | ||
606 | AccountView * view = (AccountView*)listView(); | ||
607 | if (view) view->refreshCurrent(); | ||
608 | } | ||
609 | } | ||
610 | } | ||
611 | |||
612 | void MBOXfolderItem::deleteFolder() | 624 | void MBOXfolderItem::deleteFolder() |
@@ -646,3 +658,3 @@ void MBOXfolderItem::contextMenuSelected(int which) | |||
646 | case 0: | 658 | case 0: |
647 | deleteAllMails(); | 659 | deleteAllMail(mbox->getWrapper(),folder); |
648 | break; | 660 | break; |
diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h index 98abf44..361dd86 100644 --- a/noncore/net/mail/accountview.h +++ b/noncore/net/mail/accountview.h | |||
@@ -27,2 +27,3 @@ public: | |||
27 | protected: | 27 | protected: |
28 | virtual void deleteAllMail(AbstractMail*wrapper,Folder*f); | ||
28 | static const QString contextName; | 29 | static const QString contextName; |
@@ -53,2 +54,5 @@ public: | |||
53 | virtual RecBody fetchBody(const RecMail&); | 54 | virtual RecBody fetchBody(const RecMail&); |
55 | virtual QPopupMenu * getContextMenu(); | ||
56 | virtual void contextMenuSelected(int); | ||
57 | |||
54 | private: | 58 | private: |
@@ -98,3 +102,2 @@ protected: | |||
98 | virtual void deleteFolder(); | 102 | virtual void deleteFolder(); |
99 | virtual void deleteAllMails(); | ||
100 | 103 | ||
@@ -142,3 +145,2 @@ public: | |||
142 | protected: | 145 | protected: |
143 | virtual void deleteAllMails(); | ||
144 | virtual void deleteFolder(); | 146 | virtual void deleteFolder(); |
diff --git a/noncore/net/mail/libmailwrapper/abstractmail.h b/noncore/net/mail/libmailwrapper/abstractmail.h index b609aa7..5dc4cab 100644 --- a/noncore/net/mail/libmailwrapper/abstractmail.h +++ b/noncore/net/mail/libmailwrapper/abstractmail.h | |||
@@ -31,2 +31,3 @@ public: | |||
31 | virtual int deleteAllMail(const Folder*){return 1;} | 31 | virtual int deleteAllMail(const Folder*){return 1;} |
32 | virtual int deleteMbox(const Folder*){return 1;} | ||
32 | 33 | ||
@@ -38,3 +39,2 @@ public: | |||
38 | virtual int createMbox(const QString&,const Folder*parentfolder=0,const QString& delemiter="/",bool getsubfolder=false){return 0;} | 39 | virtual int createMbox(const QString&,const Folder*parentfolder=0,const QString& delemiter="/",bool getsubfolder=false){return 0;} |
39 | virtual int deleteMbox(const Folder*){return 1;} | ||
40 | 40 | ||
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp index b85fbf6..2e70dee 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp | |||
@@ -208,5 +208,2 @@ QList<Folder>* POP3wrapper::listFolders() | |||
208 | { | 208 | { |
209 | /* TODO: integrate MH directories | ||
210 | but not before version 0.1 ;) | ||
211 | */ | ||
212 | QList<Folder> * folders = new QList<Folder>(); | 209 | QList<Folder> * folders = new QList<Folder>(); |
@@ -224,3 +221,3 @@ void POP3wrapper::deleteMail(const RecMail&mail) | |||
224 | if (err != MAILPOP3_NO_ERROR) { | 221 | if (err != MAILPOP3_NO_ERROR) { |
225 | qDebug("error deleting mail"); | 222 | Global::statusMessage(tr("error deleting mail")); |
226 | } | 223 | } |
@@ -231 +228,27 @@ void POP3wrapper::answeredMail(const RecMail&) | |||
231 | } | 228 | } |
229 | |||
230 | int POP3wrapper::deleteAllMail(const Folder*) | ||
231 | { | ||
232 | login(); | ||
233 | if (!m_pop3) return 0; | ||
234 | carray * messages = 0; | ||
235 | |||
236 | /* if connected this info is cached! */ | ||
237 | int err = 0; | ||
238 | mailpop3_list( m_pop3, &messages ); | ||
239 | |||
240 | int res = 1; | ||
241 | for (unsigned int i = 0; messages!=0 && i < carray_count(messages);++i) { | ||
242 | mailpop3_msg_info *info; | ||
243 | err = mailpop3_get_msg_info(m_pop3,i+1,&info); | ||
244 | if (info->msg_deleted) | ||
245 | continue; | ||
246 | err = mailpop3_dele(m_pop3,i+1); | ||
247 | if (err != MAILPOP3_NO_ERROR) { | ||
248 | Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); | ||
249 | res = 0; | ||
250 | break; | ||
251 | } | ||
252 | } | ||
253 | return res; | ||
254 | } | ||
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h index 7502720..2efffdd 100644 --- a/noncore/net/mail/libmailwrapper/pop3wrapper.h +++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h | |||
@@ -21,2 +21,3 @@ public: | |||
21 | virtual void answeredMail(const RecMail&mail); | 21 | virtual void answeredMail(const RecMail&mail); |
22 | virtual int deleteAllMail(const Folder*); | ||
22 | 23 | ||
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp index b85fbf6..2e70dee 100644 --- a/noncore/net/mail/pop3wrapper.cpp +++ b/noncore/net/mail/pop3wrapper.cpp | |||
@@ -208,5 +208,2 @@ QList<Folder>* POP3wrapper::listFolders() | |||
208 | { | 208 | { |
209 | /* TODO: integrate MH directories | ||
210 | but not before version 0.1 ;) | ||
211 | */ | ||
212 | QList<Folder> * folders = new QList<Folder>(); | 209 | QList<Folder> * folders = new QList<Folder>(); |
@@ -224,3 +221,3 @@ void POP3wrapper::deleteMail(const RecMail&mail) | |||
224 | if (err != MAILPOP3_NO_ERROR) { | 221 | if (err != MAILPOP3_NO_ERROR) { |
225 | qDebug("error deleting mail"); | 222 | Global::statusMessage(tr("error deleting mail")); |
226 | } | 223 | } |
@@ -231 +228,27 @@ void POP3wrapper::answeredMail(const RecMail&) | |||
231 | } | 228 | } |
229 | |||
230 | int POP3wrapper::deleteAllMail(const Folder*) | ||
231 | { | ||
232 | login(); | ||
233 | if (!m_pop3) return 0; | ||
234 | carray * messages = 0; | ||
235 | |||
236 | /* if connected this info is cached! */ | ||
237 | int err = 0; | ||
238 | mailpop3_list( m_pop3, &messages ); | ||
239 | |||
240 | int res = 1; | ||
241 | for (unsigned int i = 0; messages!=0 && i < carray_count(messages);++i) { | ||
242 | mailpop3_msg_info *info; | ||
243 | err = mailpop3_get_msg_info(m_pop3,i+1,&info); | ||
244 | if (info->msg_deleted) | ||
245 | continue; | ||
246 | err = mailpop3_dele(m_pop3,i+1); | ||
247 | if (err != MAILPOP3_NO_ERROR) { | ||
248 | Global::statusMessage(tr("Error deleting mail %1").arg(i+1)); | ||
249 | res = 0; | ||
250 | break; | ||
251 | } | ||
252 | } | ||
253 | return res; | ||
254 | } | ||
diff --git a/noncore/net/mail/pop3wrapper.h b/noncore/net/mail/pop3wrapper.h index 7502720..2efffdd 100644 --- a/noncore/net/mail/pop3wrapper.h +++ b/noncore/net/mail/pop3wrapper.h | |||
@@ -21,2 +21,3 @@ public: | |||
21 | virtual void answeredMail(const RecMail&mail); | 21 | virtual void answeredMail(const RecMail&mail); |
22 | virtual int deleteAllMail(const Folder*); | ||
22 | 23 | ||