1 files changed, 126 insertions, 114 deletions

diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp
index 10db2c6..f7fdccd 100644
--- a/noncore/net/mail/accountitem.cpp
+++ b/noncore/net/mail/accountitem.cpp
@@ -80,28 +80,22 @@ void POP3viewItem::refresh()
 RECBODYP POP3viewItem::fetchBody( const RecMailP &mail )
 {
     odebug << "POP3 fetchBody" << oendl;
     return wrapper->fetchBody( mail );
 }
 
-QPopupMenu * POP3viewItem::getContextMenu()
+QMap<int,QString> POP3viewItem::serverMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
-    if (m)
-    {
-        if (!account->getOffline())
-        {
-            m->insertItem(QObject::tr("Disconnect",contextName),SERVER_MENU_DISCONNECT);
-            m->insertItem(QObject::tr("Set offline",contextName),SERVER_MENU_OFFLINE);
-        }
-        else
-        {
-            m->insertItem(QObject::tr("Set online",contextName),SERVER_MENU_OFFLINE);
-        }
+    QMap<int,QString> _entries;
+    if (!account->getOffline()) {
+        _entries[SERVER_MENU_DISCONNECT]=QObject::tr("Disconnect",contextName);
+        _entries[SERVER_MENU_OFFLINE]=QObject::tr("Set offline",contextName);
+    } else {
+        _entries[SERVER_MENU_OFFLINE]=QObject::tr("Set online",contextName);
     }
-    return m;
+    return _entries;
 }
 
 void POP3viewItem::disconnect()
 {
     QListViewItem *child = firstChild();
     while ( child )
@@ -122,23 +116,24 @@ void POP3viewItem::setOnOffline()
     account->setOffline(!account->getOffline());
     account->save();
     SETPIX(PIXMAP_POP3FOLDER);
     refresh();
 }
 
-void POP3viewItem::contextMenuSelected(int which)
+bool POP3viewItem::contextMenuSelected(int which)
 {
     switch (which)
     {
     case SERVER_MENU_DISCONNECT:
         disconnect();
         break;
     case SERVER_MENU_OFFLINE:
         setOnOffline();
         break;
     }
+    return false;
 }
 
 POP3folderItem::~POP3folderItem()
 {}
 
 POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , QListViewItem*after  )
@@ -164,32 +159,29 @@ void POP3folderItem::refresh(QValueList<RecMailP>&target)
 
 RECBODYP POP3folderItem::fetchBody(const RecMailP&aMail)
 {
     return pop3->getWrapper()->fetchBody(aMail);
 }
 
-QPopupMenu * POP3folderItem::getContextMenu()
+QMap<int,QString> POP3folderItem::folderMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
-    if (m)
-    {
-        m->insertItem(QObject::tr("Refresh header list",contextName),FOLDER_MENU_REFRESH_HEADER);
-        m->insertItem(QObject::tr("Delete all mails",contextName),FOLDER_MENU_DELETE_ALL_MAILS);
-        m->insertItem(QObject::tr("Move/Copie all mails",contextName),FOLDER_MENU_MOVE_MAILS);
-    }
-    return m;
+    QMap<int,QString> _entries;
+    _entries[FOLDER_MENU_REFRESH_HEADER]=QObject::tr("Refresh header list",contextName);
+    _entries[FOLDER_MENU_DELETE_ALL_MAILS]=QObject::tr("Delete all mails",contextName);
+    _entries[FOLDER_MENU_MOVE_MAILS]=QObject::tr("Move/Copie all mails",contextName);
+    return _entries;
 }
 
 void POP3folderItem::downloadMails()
 {
     AccountView*bl = pop3->accountView();
     if (!bl) return;
     bl->downloadMails(folder,pop3->getWrapper());
 }
 
-void POP3folderItem::contextMenuSelected(int which)
+bool POP3folderItem::contextMenuSelected(int which)
 {
     AccountView * view = (AccountView*)listView();
     switch (which)
     {
     case FOLDER_MENU_REFRESH_HEADER:
         /* must be 'cause pop3 lists are cached */
@@ -202,12 +194,13 @@ void POP3folderItem::contextMenuSelected(int which)
     case FOLDER_MENU_MOVE_MAILS:
         downloadMails();
         break;
     default:
         break;
     }
+    return false;
 }
 
 /**
  * NNTP Account stuff
  */
 NNTPviewItem::NNTPviewItem( NNTPaccount *a, AccountView *parent )
@@ -271,29 +264,24 @@ void NNTPviewItem::refresh()
 RECBODYP NNTPviewItem::fetchBody( const RecMailP &mail )
 {
     odebug << "NNTP fetchBody" << oendl;
     return wrapper->fetchBody( mail );
 }
 
-QPopupMenu * NNTPviewItem::getContextMenu()
+QMap<int,QString> NNTPviewItem::serverMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
-    if (m)
+    QMap<int,QString> _entries;
+    if (!account->getOffline())
     {
-        if (!account->getOffline())
-        {
-            m->insertItem(QObject::tr("Disconnect",contextName),SERVER_MENU_DISCONNECT);
-            m->insertItem(QObject::tr("Set offline",contextName),SERVER_MENU_OFFLINE);
-            m->insertItem(QObject::tr("(Un-)Subscribe groups",contextName),SERVER_MENU_SUBSCRIBE);
-        }
-        else
-        {
-            m->insertItem(QObject::tr("Set online",contextName),SERVER_MENU_OFFLINE);
-        }
+        _entries[SERVER_MENU_DISCONNECT]=QObject::tr("Disconnect",contextName);
+        _entries[SERVER_MENU_OFFLINE]=QObject::tr("Set offline",contextName);
+        _entries[SERVER_MENU_SUBSCRIBE]=QObject::tr("(Un-)Subscribe groups",contextName);
+    } else {
+        _entries[SERVER_MENU_OFFLINE]=QObject::tr("Set online",contextName);
     }
-    return m;
+    return _entries;
 }
 
 void NNTPviewItem::subscribeGroups()
 {
     NNTPGroupsDlg dlg(account);
     if (QPEApplication::execDialog(&dlg)== QDialog::Accepted ){
@@ -323,13 +311,13 @@ void NNTPviewItem::setOnOffline()
     account->save();
    //FIXME
     SETPIX(PIXMAP_POP3FOLDER);
     refresh();
 }
 
-void NNTPviewItem::contextMenuSelected(int which)
+bool NNTPviewItem::contextMenuSelected(int which)
 {
     switch (which)
     {
     case SERVER_MENU_DISCONNECT:
         disconnect();
         break;
@@ -337,12 +325,13 @@ void NNTPviewItem::contextMenuSelected(int which)
         setOnOffline();
         break;
     case SERVER_MENU_SUBSCRIBE:
         subscribeGroups();
         break;
     }
+    return false;
 }
 
 NNTPfolderItem::~NNTPfolderItem()
 {}
 
 NNTPfolderItem::NNTPfolderItem( const FolderP &folderInit, NNTPviewItem *parent , QListViewItem*after  )
@@ -368,31 +357,28 @@ void NNTPfolderItem::refresh(QValueList<RecMailP>&target)
 
 RECBODYP NNTPfolderItem::fetchBody(const RecMailP&aMail)
 {
     return nntp->getWrapper()->fetchBody(aMail);
 }
 
-QPopupMenu * NNTPfolderItem::getContextMenu()
+QMap<int,QString> NNTPfolderItem::folderMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
-    if (m)
-    {
-        m->insertItem(QObject::tr("Refresh header list",contextName),FOLDER_MENU_REFRESH_HEADER);
-        m->insertItem(QObject::tr("Copy all postings",contextName),FOLDER_MENU_MOVE_MAILS);
-    }
-    return m;
+    QMap<int,QString> _entries;
+    _entries[FOLDER_MENU_REFRESH_HEADER]=QObject::tr("Refresh header list",contextName);
+    _entries[FOLDER_MENU_MOVE_MAILS]=QObject::tr("Copy all postings",contextName);
+    return _entries;
 }
 
 void NNTPfolderItem::downloadMails()
 {
     AccountView*bl = nntp->accountView();
     if (!bl) return;
     bl->downloadMails(folder,nntp->getWrapper());
 }
 
-void NNTPfolderItem::contextMenuSelected(int which)
+bool NNTPfolderItem::contextMenuSelected(int which)
 {
     AccountView * view = (AccountView*)listView();
     switch (which)
     {
     case FOLDER_MENU_REFRESH_HEADER:
         /* must be 'cause nntp lists are cached */
@@ -402,12 +388,13 @@ void NNTPfolderItem::contextMenuSelected(int which)
     case FOLDER_MENU_MOVE_MAILS:
         downloadMails();
         break;
     default:
         break;
     }
+    return false;
 }
 
 /**
  * IMAP Account stuff
  */
 IMAPviewItem::IMAPviewItem( IMAPaccount *a, AccountView *parent )
@@ -488,31 +475,24 @@ void IMAPviewItem::refreshFolders(bool force)
             item = new IMAPfolderItem( (*it), this , item );
         }
     }
     delete folders;
 }
 
-QPopupMenu * IMAPviewItem::getContextMenu()
+QMap<int,QString> IMAPviewItem::serverMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
-    if (m)
-    {
-        if (!account->getOffline())
-        {
-            m->insertItem(QObject::tr("Disconnect",contextName),SERVER_MENU_DISCONNECT);
-            m->insertItem(QObject::tr("Set offline",contextName),SERVER_MENU_OFFLINE);
-            m->insertSeparator();
-            m->insertItem(QObject::tr("Refresh folder list",contextName),SERVER_MENU_REFRESH_FOLDER);
-            m->insertItem(QObject::tr("Create new folder",contextName),SERVER_MENU_CREATE_FOLDER);
-        }
-        else
-        {
-            m->insertItem(QObject::tr("Set online",contextName),SERVER_MENU_OFFLINE);
-        }
+    QMap<int,QString> e;
+    if (!account->getOffline()) {
+        e[SERVER_MENU_DISCONNECT]=QObject::tr("Disconnect",contextName);
+        e[SERVER_MENU_OFFLINE]=QObject::tr("Set offline",contextName);
+        e[SERVER_MENU_REFRESH_FOLDER]=QObject::tr("Refresh folder list",contextName);
+        e[SERVER_MENU_CREATE_FOLDER]=QObject::tr("Create new folder",contextName);
+    } else {
+        e[SERVER_MENU_OFFLINE]=QObject::tr("Set online",contextName);
     }
-    return m;
+    return e;
 }
 
 void IMAPviewItem::createNewFolder()
 {
     Newmdirdlg ndirdlg;
     if ( QPEApplication::execDialog( &ndirdlg ))
@@ -529,13 +509,13 @@ void IMAPviewItem::createNewFolder()
         {
             refreshFolders(true);
         }
     }
 }
 
-void IMAPviewItem::contextMenuSelected(int id)
+bool IMAPviewItem::contextMenuSelected(int id)
 {
     odebug << "Id selected: " << id << "" << oendl;
     switch (id)
     {
     case SERVER_MENU_REFRESH_FOLDER:
         refreshFolders(true);
@@ -558,12 +538,13 @@ void IMAPviewItem::contextMenuSelected(int id)
         SETPIX(PIXMAP_IMAPFOLDER);
         refreshFolders(false);
         break;
     default:
         break;
     }
+    return false;
 }
 
 RECBODYP IMAPviewItem::fetchBody(const RecMailP&)
 {
     return new RecBody();
 }
@@ -625,33 +606,27 @@ void IMAPfolderItem::refresh(QValueList<RecMailP>&target)
 
 RECBODYP IMAPfolderItem::fetchBody(const RecMailP&aMail)
 {
     return imap->getWrapper()->fetchBody(aMail);
 }
 
-QPopupMenu * IMAPfolderItem::getContextMenu()
+QMap<int,QString> IMAPfolderItem::folderMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
-    if (m)
-    {
-        if (folder->may_select())
-        {
-            m->insertItem(QObject::tr("Refresh header list",contextName),FOLDER_MENU_REFRESH_HEADER);
-            m->insertItem(QObject::tr("Move/Copy all mails",contextName),FOLDER_MENU_MOVE_MAILS);
-            m->insertItem(QObject::tr("Delete all mails",contextName),FOLDER_MENU_DELETE_ALL_MAILS);
-        }
-        if (folder->no_inferior()==false)
-        {
-            m->insertItem(QObject::tr("Create new subfolder",contextName),FOLDER_MENU_NEW_SUBFOLDER);
-        }
-        if (folder->getDisplayName().lower()!="inbox")
-        {
-            m->insertItem(QObject::tr("Delete folder",contextName),FOLDER_MENU_DELETE_FOLDER);
-        }
+    QMap<int,QString> e;
+    if (folder->may_select()) {
+        e[FOLDER_MENU_REFRESH_HEADER]=QObject::tr("Refresh header list",contextName);
+        e[FOLDER_MENU_MOVE_MAILS]=QObject::tr("Move/Copy all mails",contextName);
+        e[FOLDER_MENU_DELETE_ALL_MAILS]=QObject::tr("Delete all mails",contextName);
     }
-    return m;
+    if (folder->no_inferior()==false) {
+        e[FOLDER_MENU_NEW_SUBFOLDER]=QObject::tr("Create new subfolder",contextName);
+    }
+    if (folder->getDisplayName().lower()!="inbox") {
+        e[FOLDER_MENU_DELETE_FOLDER]=QObject::tr("Delete folder",contextName);
+    }
+    return e;
 }
 
 void IMAPfolderItem::createNewFolder()
 {
     Newmdirdlg ndirdlg;
     if ( QPEApplication::execDialog( &ndirdlg ) )
@@ -663,13 +638,13 @@ void IMAPfolderItem::createNewFolder()
         {
             imap->refreshFolders(true);
         }
     }
 }
 
-void IMAPfolderItem::deleteFolder()
+bool IMAPfolderItem::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);
     odebug << "Auswahl: " << yesno << "" << oendl;
@@ -683,24 +658,26 @@ void IMAPfolderItem::deleteFolder()
              * any member of it after that call!!*/
             imap->refreshFolders(true);
             if (v)
             {
                 v->setSelected(box,true);
             }
+            return true;
         }
     }
+    return false;
 }
 
 void IMAPfolderItem::downloadMails()
 {
     AccountView*bl = imap->accountView();
     if (!bl) return;
     bl->downloadMails(folder,imap->getWrapper());
 }
 
-void IMAPfolderItem::contextMenuSelected(int id)
+bool IMAPfolderItem::contextMenuSelected(int id)
 {
     odebug << "Selected id: " << id << "" << oendl;
     AccountView * view = (AccountView*)listView();
     switch(id)
     {
     case FOLDER_MENU_REFRESH_HEADER:
@@ -713,21 +690,22 @@ void IMAPfolderItem::contextMenuSelected(int id)
         if (folder->no_inferior()==false) {
             createNewFolder();
         }
         break;
     case FOLDER_MENU_DELETE_FOLDER:
         if (folder->getDisplayName().lower()!="inbox") {
-            deleteFolder();
+            return deleteFolder();
         }
         break;
     case FOLDER_MENU_MOVE_MAILS:
         downloadMails();
         break;
     default:
         break;
     }
+    return false;
 }
 
 /**
  * MH Account stuff
  */
 /* MH is a little bit different - the top folder can contains messages other than in IMAP and
@@ -809,23 +787,27 @@ void MHviewItem::refresh(bool force)
 RECBODYP MHviewItem::fetchBody( const RecMailP &mail )
 {
     odebug << "MH fetchBody" << oendl;
     return wrapper->fetchBody( mail );
 }
 
-QPopupMenu * MHviewItem::getContextMenu()
+QMap<int,QString> MHviewItem::serverMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
-    if (m)
-    {
-        m->insertItem(QObject::tr("Refresh folder list",contextName),SERVER_MENU_REFRESH_FOLDER);
-        m->insertItem(QObject::tr("Create new folder",contextName),FOLDER_MENU_NEW_SUBFOLDER);
-        m->insertItem(QObject::tr("Delete all mails",contextName),FOLDER_MENU_DELETE_ALL_MAILS);
-        m->insertItem(QObject::tr("Move/Copie all mails",contextName),FOLDER_MENU_MOVE_MAILS);
-    }
-    return m;
+    QMap<int,QString> e;
+    e[SERVER_MENU_REFRESH_FOLDER]=QObject::tr("Refresh folder list",contextName);
+    return e;
+}
+
+QMap<int,QString> MHviewItem::folderMenu()
+{
+    QMap<int,QString> e;
+    e[FOLDER_MENU_REFRESH_HEADER]=QObject::tr("Refresh header list",contextName);
+    e[FOLDER_MENU_NEW_SUBFOLDER]=QObject::tr("Create new folder",contextName);
+    e[FOLDER_MENU_DELETE_ALL_MAILS]=QObject::tr("Delete all mails",contextName);
+    e[FOLDER_MENU_MOVE_MAILS]=QObject::tr("Move/Copie all mails",contextName);
+    return e;
 }
 
 void MHviewItem::createFolder()
 {
     Newmdirdlg ndirdlg(0,0,true);
     if ( QPEApplication::execDialog( &ndirdlg ) )
@@ -847,13 +829,13 @@ void MHviewItem::downloadMails()
 
 QStringList MHviewItem::subFolders()
 {
     return currentFolders;
 }
 
-void MHviewItem::contextMenuSelected(int which)
+bool MHviewItem::contextMenuSelected(int which)
 {
     AccountView*view = 0;
 
     switch (which)
     {
     case SERVER_MENU_REFRESH_FOLDER:
@@ -872,12 +854,13 @@ void MHviewItem::contextMenuSelected(int which)
         view = (AccountView*)listView();
         if (view) view->refreshCurrent();
         break;
     default:
         break;
     }
+    return false;
 }
 
 MHfolderItem::~MHfolderItem()
 {}
 
 MHfolderItem::MHfolderItem( const FolderP &folderInit, MHviewItem *parent , QListViewItem*after  )
@@ -935,13 +918,13 @@ void MHfolderItem::refresh(QValueList<RecMailP>&target)
 
 RECBODYP MHfolderItem::fetchBody(const RecMailP&aMail)
 {
     return mbox->getWrapper()->fetchBody(aMail);
 }
 
-void MHfolderItem::deleteFolder()
+bool MHfolderItem::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);
     odebug << "Auswahl: " << yesno << "" << oendl;
@@ -955,28 +938,27 @@ void MHfolderItem::deleteFolder()
              * any member of it after that call!!*/
             mbox->refresh(true);
             if (v)
             {
                 v->setSelected(box,true);
             }
+            return true;
         }
     }
+    return false;
 }
 
-QPopupMenu * MHfolderItem::getContextMenu()
+QMap<int,QString> MHfolderItem::folderMenu()
 {
-    QPopupMenu *m = new QPopupMenu(0);
-    if (m)
-    {
-        m->insertItem(QObject::tr("Create new subfolder",contextName),FOLDER_MENU_NEW_SUBFOLDER);
-        m->insertItem(QObject::tr("Refresh header list",contextName),FOLDER_MENU_REFRESH_HEADER);
-        m->insertItem(QObject::tr("Move/Copie all mails",contextName),FOLDER_MENU_MOVE_MAILS);
-        m->insertItem(QObject::tr("Delete all mails",contextName),FOLDER_MENU_DELETE_ALL_MAILS);
-        m->insertItem(QObject::tr("Delete folder",contextName),FOLDER_MENU_DELETE_FOLDER);
-    }
-    return m;
+    QMap<int,QString> e;
+    e[FOLDER_MENU_NEW_SUBFOLDER]=QObject::tr("Create new subfolder",contextName);
+    e[FOLDER_MENU_REFRESH_HEADER]=QObject::tr("Refresh header list",contextName);
+    e[FOLDER_MENU_MOVE_MAILS]=QObject::tr("Move/Copie all mails",contextName);
+    e[FOLDER_MENU_DELETE_ALL_MAILS]=QObject::tr("Delete all mails",contextName);
+    e[FOLDER_MENU_DELETE_FOLDER]=QObject::tr("Delete folder",contextName);
+    return e;
 }
 
 void MHfolderItem::downloadMails()
 {
     AccountView*bl = mbox->accountView();
     if (!bl) return;
@@ -1001,22 +983,22 @@ void MHfolderItem::createFolder()
                 v->setSelected(box,true);
             }
         }
     }
 }
 
-void MHfolderItem::contextMenuSelected(int which)
+bool MHfolderItem::contextMenuSelected(int which)
 {
     AccountView*view = 0;
     switch(which)
     {
     case FOLDER_MENU_DELETE_ALL_MAILS:
         deleteAllMail(mbox->getWrapper(),folder);
         break;
     case FOLDER_MENU_DELETE_FOLDER:
-        deleteFolder();
+        return deleteFolder();
         break;
     case FOLDER_MENU_MOVE_MAILS:
         downloadMails();
         break;
     case FOLDER_MENU_NEW_SUBFOLDER:
         createFolder();
@@ -1025,12 +1007,13 @@ void MHfolderItem::contextMenuSelected(int which)
         view = (AccountView*)listView();
         if (view) view->refreshCurrent();
         break;
     default:
         break;
     }
+    return false;
 }
 
 bool MHfolderItem::isDraftfolder()
 {
     if (folder && folder->getName()==AbstractMail::defaultLocalfolder()+"/"+AbstractMail::draftFolder()) return true;
     return false;
@@ -1147,6 +1130,35 @@ AccountViewItem*AccountViewItem::findSubItem(const QString&path,AccountViewItem*
 }
 
 bool AccountViewItem::isDraftfolder()
 {
     return false;
 }
+
+QMap<int,QString> AccountViewItem::serverMenu()
+{
+    return QMap<int,QString>();
+}
+
+QMap<int,QString> AccountViewItem::folderMenu()
+{
+    return QMap<int,QString>();
+}
+
+QPopupMenu * AccountViewItem::getContextMenu()
+{
+    QPopupMenu *m = new QPopupMenu(0);
+    if (m)
+    {
+        QMap<int,QString> entries;
+        entries = folderMenu();
+        QMap<int,QString>::Iterator it;
+        for (it=entries.begin();it!=entries.end();++it) {
+            m->insertItem(it.data(),it.key());
+        }
+        entries = serverMenu();
+        for (it=entries.begin();it!=entries.end();++it) {
+            m->insertItem(it.data(),it.key());
+        }
+    }
+    return m;
+}