1 files changed, 44 insertions, 32 deletions

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)
 
+QPopupMenu * POP3folderItem::getContextMenu()
+{
+    QPopupMenu *m = new QPopupMenu(0);
+    if (m) {
+        m->insertItem(QObject::tr("Refresh header list",contextName),0);
+        m->insertItem(QObject::tr("Delete all mails",contextName),1);
+    }
+    return m;
+}
+
+void POP3folderItem::contextMenuSelected(int which)
+{
+    AccountView * view = (AccountView*)listView();
+    switch (which) {
+    case 0:
+        view->refreshCurrent();
+        break;
+    case 1:
+        deleteAllMail(pop3->getWrapper(),folder);
+        break;
+    default:
+        break;
+    }
+}
+
 /**
@@ -306,17 +331,2 @@ QPopupMenu * IMAPfolderItem::getContextMenu()
 
-void IMAPfolderItem::deleteAllMails()
-{
-    int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName),
-        QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).arg(folder->getDisplayName()),
-        QObject::tr("Yes",contextName),
-        QObject::tr("No",contextName),QString::null,1,1);
-    qDebug("Auswahl: %i",yesno);
-    if (yesno == 0) {
-        if (imap->getWrapper()->deleteAllMail(folder)) {
-            AccountView * view = (AccountView*)listView();
-            if (view) view->refreshCurrent();
-        }
-    }
-}
-
 void IMAPfolderItem::createNewFolder()
@@ -365,3 +375,3 @@ void IMAPfolderItem::contextMenuSelected(int id)
     case 1:
-        deleteAllMails();
+        deleteAllMail(imap->getWrapper(),folder);
         break;
@@ -384,2 +394,19 @@ const QString AccountViewItem::contextName="AccountViewItem";
 
+void AccountViewItem::deleteAllMail(AbstractMail*wrapper,Folder*folder)
+{
+    if (!wrapper) return;
+    int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName),
+        QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).
+            arg((folder?folder->getDisplayName():"")),
+        QObject::tr("Yes",contextName),
+        QObject::tr("No",contextName),QString::null,1,1);
+    qDebug("Auswahl: %i",yesno);
+    if (yesno == 0) {
+        if (wrapper->deleteAllMail(folder)) {
+            AccountView * view = (AccountView*)listView();
+            if (view) view->refreshCurrent();
+        }
+    }
+}
+
 AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
@@ -596,17 +623,2 @@ RecBody MBOXfolderItem::fetchBody(const RecMail&aMail)
 
-void MBOXfolderItem::deleteAllMails()
-{
-    int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName),
-        QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).arg(folder->getDisplayName()),
-        QObject::tr("Yes",contextName),
-        QObject::tr("No",contextName),QString::null,1,1);
-    qDebug("Auswahl: %i",yesno);
-    if (yesno == 0) {
-        if (mbox->getWrapper()->deleteAllMail(folder)) {
-            AccountView * view = (AccountView*)listView();
-            if (view) view->refreshCurrent();
-        }
-    }
-}
-
 void MBOXfolderItem::deleteFolder()
@@ -646,3 +658,3 @@ void MBOXfolderItem::contextMenuSelected(int which)
     case 0:
-        deleteAllMails();
+        deleteAllMail(mbox->getWrapper(),folder);
         break;