better newsgroup handling

1 files changed, 16 insertions, 5 deletions

diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index 12d047a..7795055 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -71,56 +71,56 @@ void POP3viewItem::refresh()
     }
     QValueList<FolderP>::ConstIterator it;
     QListViewItem*item = 0;
     for ( it = folders->begin(); it!=folders->end(); ++it)
     {
         item = new POP3folderItem( (*it), this , item );
         item->setSelectable( (*it)->may_select());
     }
     delete folders;
 }
 
 RECBODYP POP3viewItem::fetchBody( const RecMailP &mail )
 {
   
     return wrapper->fetchBody( mail );
 }
 
 QPopupMenu * POP3viewItem::getContextMenu()
 {
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
         if (!account->getOffline())
         {
+            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
             m->insertItem(QObject::tr("Disconnect",contextName),0);
             m->insertItem(QObject::tr("Set offline",contextName),1);
-            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
         }
         else
         {
-            m->insertItem(QObject::tr("Set online",contextName),1);
             m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
+            m->insertItem(QObject::tr("Set online",contextName),1);
         }
     }
     return m;
 }
 
 void POP3viewItem::disconnect()
 {
     QListViewItem *child = firstChild();
     while ( child )
     {
         QListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
     wrapper->logout();
 }
 
 void POP3viewItem::setOnOffline()
 {
     if (!account->getOffline())
     {
         disconnect();
     }
     account->setOffline(!account->getOffline());
@@ -166,78 +166,82 @@ POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent ,
     }
     else
     {
         setPixmap( 0, PIXMAP_INBOXFOLDER);
     }
     setText( 0, folder->getDisplayName() );
 }
 
 void POP3folderItem::refresh(QValueList<RecMailP>&target)
 {
     if (folder->may_select())
         pop3->getWrapper()->listMessages( folder->getName(),target );
 }
 
 RECBODYP POP3folderItem::fetchBody(const RecMailP&aMail)
 {
     return pop3->getWrapper()->fetchBody(aMail);
 }
 
 QPopupMenu * POP3folderItem::getContextMenu()
 {
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
+        m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
         m->insertItem(QObject::tr("Refresh header list",contextName),0);
         m->insertItem(QObject::tr("Delete all mails",contextName),1);
         m->insertItem(QObject::tr("Move/Copie all mails",contextName),2);
     }
     return m;
 }
 
 void POP3folderItem::downloadMails()
 {
     AccountView*bl = pop3->accountView();
     if (!bl) return;
     bl->downloadMails(folder,pop3->getWrapper());
 }
 
 void POP3folderItem::contextMenuSelected(int which)
 {
     AccountView * view = (AccountView*)listView();
     switch (which)
     {
     case 0:
         /* must be 'cause pop3 lists are cached */
         pop3->getWrapper()->logout();
         view->refreshCurrent();
         break;
     case 1:
         deleteAllMail(pop3->getWrapper(),folder);
         break;
     case 2:
         downloadMails();
         break;
+    case GET_NEW_MAILS: // daunlood 
+        view->downloadMailsInbox(getFolder() ,pop3->getWrapper());
+        break;
     default:
         break;
     }
 }
 
 /**
  * NNTP Account stuff
  */
 NNTPviewItem::NNTPviewItem( NNTPaccount *a, AccountView *parent )
         : AccountViewItem( parent )
 {
     account = a;
     wrapper = AbstractMail::getWrapper( account );
     //FIXME
     SETPIX(PIXMAP_POP3FOLDER);
 #if 0
     if (!account->getOffline())
     {
         setPixmap( 0,  );
     }
     else
     {
         setPixmap( 0, PIXMAP_OFFLINE );
     }
@@ -492,61 +496,60 @@ void IMAPviewItem::refreshFolders(bool force)
         IMAPfolderItem*pitem = (IMAPfolderItem*)findSubItem(fname);
         if (pitem)
         {
             titem = item;
             item = new IMAPfolderItem( (*it),pitem,pitem->firstChild(),this);
             /* setup the short name */
             item->setText(0,(*it)->getDisplayName().mid(pos+1));
             item = titem;
         }
         else
         {
             item = new IMAPfolderItem( (*it), this , item );
         }
     }
     delete folders;
 }
 
 QPopupMenu * IMAPviewItem::getContextMenu()
 {
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
         if (!account->getOffline())
         {
+            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
             m->insertItem(QObject::tr("Refresh folder list",contextName),0);
             m->insertItem(QObject::tr("Create new folder",contextName),1);
             m->insertSeparator();
             m->insertItem(QObject::tr("Disconnect",contextName),2);
             m->insertItem(QObject::tr("Set offline",contextName),3);
             m->insertSeparator();
-            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
         }
         else
         {
-            m->insertItem(QObject::tr("Set online",contextName),3);
-            m->insertSeparator();
             m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
+            m->insertItem(QObject::tr("Set online",contextName),3);
         }
     }
     return m;
 }
 
 void IMAPviewItem::createNewFolder()
 {
     Newmdirdlg ndirdlg;
 
     ndirdlg.showMaximized();
     if ( ndirdlg.exec() )
     {
         QString ndir = ndirdlg.Newdir();
         bool makesubs = ndirdlg.subpossible();
         QString delemiter = "/";
         IMAPfolderItem*item = (IMAPfolderItem*)firstChild();
         if (item)
         {
             delemiter = item->Delemiter();
         }
         if (wrapper->createMbox(ndir,0,delemiter,makesubs))
         {
             refreshFolders(true);
         }
@@ -648,48 +651,49 @@ const QString& IMAPfolderItem::Delemiter()const
 void IMAPfolderItem::refresh(QValueList<RecMailP>&target)
 {
     if (folder->may_select())
     {
         imap->getWrapper()->listMessages( folder->getName(),target );
     }
     else
     {
         target.clear();
     }
 }
 
 RECBODYP IMAPfolderItem::fetchBody(const RecMailP&aMail)
 {
     return imap->getWrapper()->fetchBody(aMail);
 }
 
 QPopupMenu * IMAPfolderItem::getContextMenu()
 {
     QPopupMenu *m = new QPopupMenu(0);
     if (m)
     {
         if (folder->may_select())
         {
+            m->insertItem(QObject::tr("Get new messages",contextName),GET_NEW_MAILS);
             m->insertItem(QObject::tr("Refresh header list",contextName),0);
             m->insertItem(QObject::tr("Move/Copie all mails",contextName),4);
             m->insertItem(QObject::tr("Delete all mails",contextName),1);
         }
         if (folder->no_inferior()==false)
         {
             m->insertItem(QObject::tr("Create new subfolder",contextName),2);
         }
         if (folder->getDisplayName().lower()!="inbox")
         {
             m->insertItem(QObject::tr("Delete folder",contextName),3);
         }
     }
     return m;
 }
 
 void IMAPfolderItem::createNewFolder()
 {
     Newmdirdlg ndirdlg;
     ndirdlg.showMaximized();
     if ( ndirdlg.exec() )
     {
         QString ndir = ndirdlg.Newdir();
         bool makesubs = ndirdlg.subpossible();
@@ -732,48 +736,55 @@ void IMAPfolderItem::downloadMails()
     bl->downloadMails(folder,imap->getWrapper());
 }
 
 void IMAPfolderItem::contextMenuSelected(int id)
 {
   
     AccountView * view = (AccountView*)listView();
     switch(id)
     {
     case 0:
         view->refreshCurrent();
         break;
     case 1:
         deleteAllMail(imap->getWrapper(),folder);
         break;
     case 2:
         createNewFolder();
         break;
     case 3:
         deleteFolder();
         break;
     case 4:
         downloadMails();
         break;
+    case GET_NEW_MAILS: // daunlood 
+        { 
+            AccountView*bl = accountView();
+            if (!bl) return;
+            bl->downloadMailsInbox(getFolder(),imap->getWrapper()); 
+        }
+        break;
     default:
         break;
     }
 }
 
 /**
  * MH Account stuff
  */
 /* MH is a little bit different - the top folder can contains messages other than in IMAP and
    POP3 and MBOX */
 MHviewItem::MHviewItem( const QString&aPath, AccountView *parent )
         : AccountViewItem( parent )
 {
     m_Path = aPath;
     /* be carefull - the space within settext is wanted - thats why the string twice */
     wrapper = AbstractMail::getWrapper( m_Path,"Local Folders");
     setPixmap( 0, PIXMAP_LOCALFOLDER );
     setText( 0, " Local Folders" );
     setOpen( true );
     folder = 0;
 }
 
 MHviewItem::~MHviewItem()
 {