basic folder handling for pop3 accounts

some code dups reduced

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
@@ -26,20 +26,20 @@ public:
     virtual encodedString* fetchRawPart(const RecMail&mail,const RecPart&part)=0;
 
     virtual void deleteMail(const RecMail&mail)=0;
     virtual void answeredMail(const RecMail&mail)=0;
     virtual void cleanMimeCache(){};
     virtual int deleteAllMail(const Folder*){return 1;}
+    virtual int deleteMbox(const Folder*){return 1;}
     
     /* mail box methods */
     /* parameter is the box to create.
      * if the implementing subclass has prefixes, 
      * them has to be appended automatic.
      */
     virtual int createMbox(const QString&,const Folder*parentfolder=0,const QString& delemiter="/",bool getsubfolder=false){return 0;}
-    virtual int deleteMbox(const Folder*){return 1;}
 
     static AbstractMail* getWrapper(IMAPaccount *a);
     static AbstractMail* getWrapper(POP3account *a);
     /* mbox only! */
     static AbstractMail* getWrapper(const QString&a);
 
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
@@ -81,12 +81,37 @@ void POP3folderItem::refresh(QList<RecMail>&target)
 
 RecBody POP3folderItem::fetchBody(const RecMail&aMail)
 {
     return pop3->getWrapper()->fetchBody(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;
+    }
+}
+
 /**
  * IMAP Account stuff
  */
 IMAPviewItem::IMAPviewItem( IMAPaccount *a, QListView *parent )
     : AccountViewItem( parent )
 {
@@ -301,27 +326,12 @@ QPopupMenu * IMAPfolderItem::getContextMenu()
             m->insertItem(QObject::tr("Delete folder",contextName),3);
         }
     }
     return m;
 }
 
-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()
 {
     Newmdirdlg ndirdlg;
     ndirdlg.showMaximized();
     if (ndirdlg.exec()) {
         QString ndir = ndirdlg.Newdir();
@@ -360,13 +370,13 @@ void IMAPfolderItem::contextMenuSelected(int id)
     AccountView * view = (AccountView*)listView();
     switch(id) {
     case 0:
         view->refreshCurrent();
         break;
     case 1:
-        deleteAllMails();
+        deleteAllMail(imap->getWrapper(),folder);
         break;
     case 2:
         createNewFolder();
         break;
     case 3:
         deleteFolder();
@@ -379,12 +389,29 @@ void IMAPfolderItem::contextMenuSelected(int id)
 /**
  * Generic stuff
  */
 
 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 )
     : QListView( parent, name, flags )
 {
     connect( this, SIGNAL( selectionChanged( QListViewItem * ) ),
             SLOT( refresh( QListViewItem * ) ) );
     connect( this, SIGNAL( mouseButtonPressed(int, QListViewItem *,const QPoint&,int  ) ),this,
@@ -591,27 +618,12 @@ void MBOXfolderItem::refresh(QList<RecMail>&target)
 
 RecBody MBOXfolderItem::fetchBody(const RecMail&aMail)
 {
     return mbox->getWrapper()->fetchBody(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()
 {
     int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),
         QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
         QObject::tr("Yes",contextName),
         QObject::tr("No",contextName),QString::null,1,1);
@@ -641,13 +653,13 @@ QPopupMenu * MBOXfolderItem::getContextMenu()
 }
 
 void MBOXfolderItem::contextMenuSelected(int which)
 {
     switch(which) {
     case 0:
-        deleteAllMails();
+        deleteAllMail(mbox->getWrapper(),folder);
         break;
     case 1:
         deleteFolder();
         break;
     default:
         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
@@ -22,12 +22,13 @@ public:
     AccountViewItem( QListViewItem *parent , QListViewItem*after  ) : QListViewItem( parent,after ) {}
     virtual void refresh(QList<RecMail>&)=0;
     virtual RecBody fetchBody(const RecMail&)=0;
     virtual QPopupMenu * getContextMenu(){return 0;};
     virtual void contextMenuSelected(int){}
 protected:
+    virtual void deleteAllMail(AbstractMail*wrapper,Folder*f);
     static const QString contextName;
 };
 
 class POP3viewItem : public AccountViewItem
 {
 
@@ -48,12 +49,15 @@ class POP3folderItem : public AccountViewItem
 
 public:
     POP3folderItem( Folder *folder, POP3viewItem *parent , QListViewItem*after  );
     ~POP3folderItem();
     virtual void refresh(QList<RecMail>&);
     virtual RecBody fetchBody(const RecMail&);
+    virtual QPopupMenu * getContextMenu();
+    virtual void contextMenuSelected(int);
+
 private:
     Folder *folder;
     POP3viewItem *pop3;
 };
 
 class IMAPfolderItem;
@@ -93,13 +97,12 @@ public:
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
     virtual const QString& Delemiter()const;
 protected:
     virtual void createNewFolder();
     virtual void deleteFolder();
-    virtual void deleteAllMails();    
     
 private:
     Folder *folder;
     IMAPviewItem *imap;
 };
 
@@ -137,13 +140,12 @@ public:
     virtual void refresh(QList<RecMail>&);
     virtual RecBody fetchBody(const RecMail&);
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
 
 protected:
-    virtual void deleteAllMails();
     virtual void deleteFolder();
 private:
     Folder *folder;
     MBOXviewItem *mbox;
 };
 
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
@@ -26,20 +26,20 @@ public:
     virtual encodedString* fetchRawPart(const RecMail&mail,const RecPart&part)=0;
 
     virtual void deleteMail(const RecMail&mail)=0;
     virtual void answeredMail(const RecMail&mail)=0;
     virtual void cleanMimeCache(){};
     virtual int deleteAllMail(const Folder*){return 1;}
+    virtual int deleteMbox(const Folder*){return 1;}
     
     /* mail box methods */
     /* parameter is the box to create.
      * if the implementing subclass has prefixes, 
      * them has to be appended automatic.
      */
     virtual int createMbox(const QString&,const Folder*parentfolder=0,const QString& delemiter="/",bool getsubfolder=false){return 0;}
-    virtual int deleteMbox(const Folder*){return 1;}
 
     static AbstractMail* getWrapper(IMAPaccount *a);
     static AbstractMail* getWrapper(POP3account *a);
     /* mbox only! */
     static AbstractMail* getWrapper(const QString&a);
 
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
@@ -203,15 +203,12 @@ void POP3wrapper::logout()
     m_pop3 = NULL;
 }
 
 
 QList<Folder>* POP3wrapper::listFolders()
 {
-    /* TODO: integrate MH directories 
-       but not before version 0.1 ;)
-    */
     QList<Folder> * folders = new QList<Folder>();
     folders->setAutoDelete( false );
     Folder*inb=new Folder("INBOX","/");
     folders->append(inb);
     return folders;
 }
@@ -219,13 +216,39 @@ QList<Folder>* POP3wrapper::listFolders()
 void POP3wrapper::deleteMail(const RecMail&mail)
 {
     login();
     if (!m_pop3) return;
     int err = mailpop3_dele(m_pop3,mail.getNumber());
     if (err != MAILPOP3_NO_ERROR) {
-        qDebug("error deleting mail");
+        Global::statusMessage(tr("error deleting mail"));
     }
 }
 
 void POP3wrapper::answeredMail(const RecMail&)
 {
 }
+
+int POP3wrapper::deleteAllMail(const Folder*)
+{
+    login();
+    if (!m_pop3) return 0;
+    carray * messages = 0;
+    
+    /* if connected this info is cached! */
+    int err = 0;
+    mailpop3_list( m_pop3, &messages );
+    
+    int res = 1;
+    for (unsigned int i = 0; messages!=0 && i < carray_count(messages);++i) {
+        mailpop3_msg_info *info;
+        err = mailpop3_get_msg_info(m_pop3,i+1,&info);
+        if (info->msg_deleted)
+            continue;
+        err = mailpop3_dele(m_pop3,i+1);
+        if (err != MAILPOP3_NO_ERROR) {
+            Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
+            res = 0;
+            break;
+        }
+    }
+    return res;
+}
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
@@ -16,12 +16,13 @@ public:
     /* mailbox will be ignored */
     virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
     virtual QList<Folder>* listFolders();
 
     virtual void deleteMail(const RecMail&mail);
     virtual void answeredMail(const RecMail&mail);
+    virtual int deleteAllMail(const Folder*);
 
     virtual RecBody fetchBody( const RecMail &mail );
     static void pop3_progress( size_t current, size_t maximum );
 
 protected:
     void login();
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
@@ -203,15 +203,12 @@ void POP3wrapper::logout()
     m_pop3 = NULL;
 }
 
 
 QList<Folder>* POP3wrapper::listFolders()
 {
-    /* TODO: integrate MH directories 
-       but not before version 0.1 ;)
-    */
     QList<Folder> * folders = new QList<Folder>();
     folders->setAutoDelete( false );
     Folder*inb=new Folder("INBOX","/");
     folders->append(inb);
     return folders;
 }
@@ -219,13 +216,39 @@ QList<Folder>* POP3wrapper::listFolders()
 void POP3wrapper::deleteMail(const RecMail&mail)
 {
     login();
     if (!m_pop3) return;
     int err = mailpop3_dele(m_pop3,mail.getNumber());
     if (err != MAILPOP3_NO_ERROR) {
-        qDebug("error deleting mail");
+        Global::statusMessage(tr("error deleting mail"));
     }
 }
 
 void POP3wrapper::answeredMail(const RecMail&)
 {
 }
+
+int POP3wrapper::deleteAllMail(const Folder*)
+{
+    login();
+    if (!m_pop3) return 0;
+    carray * messages = 0;
+    
+    /* if connected this info is cached! */
+    int err = 0;
+    mailpop3_list( m_pop3, &messages );
+    
+    int res = 1;
+    for (unsigned int i = 0; messages!=0 && i < carray_count(messages);++i) {
+        mailpop3_msg_info *info;
+        err = mailpop3_get_msg_info(m_pop3,i+1,&info);
+        if (info->msg_deleted)
+            continue;
+        err = mailpop3_dele(m_pop3,i+1);
+        if (err != MAILPOP3_NO_ERROR) {
+            Global::statusMessage(tr("Error deleting mail %1").arg(i+1));
+            res = 0;
+            break;
+        }
+    }
+    return res;
+}
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
@@ -16,12 +16,13 @@ public:
     /* mailbox will be ignored */
     virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
     virtual QList<Folder>* listFolders();
 
     virtual void deleteMail(const RecMail&mail);
     virtual void answeredMail(const RecMail&mail);
+    virtual int deleteAllMail(const Folder*);
 
     virtual RecBody fetchBody( const RecMail &mail );
     static void pop3_progress( size_t current, size_t maximum );
 
 protected:
     void login();