8 files changed, 186 insertions, 51 deletions

diff --git a/kmicromail/accountitem.cpp b/kmicromail/accountitem.cpp
index 12d047a..7795055 100644
--- a/kmicromail/accountitem.cpp
+++ b/kmicromail/accountitem.cpp
@@ -47,221 +47,225 @@ POP3viewItem::~POP3viewItem()
 {
     delete wrapper;
 }
 
 AbstractMail *POP3viewItem::getWrapper()
 {
     return wrapper;
 }
 
 void POP3viewItem::refresh(QValueList<Opie::Core::OSmartPointer<RecMail> > & )
 {
     refresh();
 }
 
 void POP3viewItem::refresh()
 {
     if (account->getOffline()) return;
     QValueList<FolderP> *folders = wrapper->listFolders();
     QListViewItem *child = firstChild();
     while ( child )
     {
         QListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
     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());
     account->save();
     SETPIX(PIXMAP_POP3FOLDER);
     refresh();
 }
 
 void POP3viewItem::contextMenuSelected(int which)
 {
     switch (which)
     {
     case 0:
         disconnect();
         break;
     case 1:
         setOnOffline();
         break;
     case GET_NEW_MAILS: // daunlood 
         if (account->getOffline())
             setOnOffline();
         AccountView*bl = accountView();
         if (!bl) return;
         AccountViewItem* in = findSubItem( "inbox" , 0);
         if ( ! in )
             return;
         bl->downloadMailsInbox(in->getFolder() ,getWrapper());
         setOnOffline();
         break;
     }
 }
 
 POP3folderItem::~POP3folderItem()
 {}
 
 POP3folderItem::POP3folderItem( const FolderP&folderInit, POP3viewItem *parent , QListViewItem*after  )
         : AccountViewItem(folderInit,parent,after )
 {
     pop3 = parent;
     if (folder->getDisplayName().lower()!="inbox")
     {
         setPixmap( 0, PIXMAP_POP3FOLDER );
     }
     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 );
     }
 #endif
     setText( 0, account->getAccountName() );
     setOpen( true );
 }
 
 NNTPviewItem::~NNTPviewItem()
 {
     delete wrapper;
 }
 
 AbstractMail *NNTPviewItem::getWrapper()
 {
     return wrapper;
 }
 
 void NNTPviewItem::refresh( QValueList<RecMailP> & )
 {
     refresh();
 }
 
 void NNTPviewItem::refresh()
 {
     if (account->getOffline()) return;
     QValueList<FolderP> *folders = wrapper->listFolders();
@@ -468,109 +472,108 @@ void IMAPviewItem::refreshFolders(bool force)
     QValueList<FolderP>::Iterator it;
     QListViewItem*item = 0;
     QListViewItem*titem = 0;
     QString fname,del,search;
     int pos;
 
     for ( it = folders->begin(); it!=folders->end(); ++it)
     {
         if ((*it)->getDisplayName().lower()=="inbox")
         {
             item = new IMAPfolderItem( (*it), this , item );
             folders->remove(it);
             break;
         }
     }
     for ( it = folders->begin(); it!=folders->end(); ++it)
     {
         fname = (*it)->getDisplayName();
         currentFolders.append((*it)->getName());
         pos = fname.findRev((*it)->Separator());
         if (pos != -1)
         {
             fname = fname.left(pos);
         }
         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);
         }
     }
 }
 
 void IMAPviewItem::contextMenuSelected(int id)
 {
    
     switch (id)
     {
     case 0:
         refreshFolders(true);
         break;
     case 1:
         createNewFolder();
         break;
     case 2:
         removeChilds();
         wrapper->logout();
         break;
     case 3:
         if (account->getOffline()==false)
         {
             removeChilds();
             wrapper->logout();
         }
@@ -624,180 +627,188 @@ IMAPfolderItem::IMAPfolderItem( const FolderP& folderInit, IMAPviewItem *parent
 
 IMAPfolderItem::IMAPfolderItem(const FolderP &folderInit, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master  )
         : AccountViewItem(folderInit, parent,after )
 {
     imap = master;
     if (folder->getDisplayName().lower()!="inbox")
     {
         setPixmap( 0, PIXMAP_IMAPFOLDER );
     }
     else
     {
         setPixmap( 0, PIXMAP_INBOXFOLDER);
     }
     setText( 0, folder->getDisplayName() );
 }
 
 IMAPfolderItem::~IMAPfolderItem()
 {}
 
 const QString& IMAPfolderItem::Delemiter()const
 {
     return folder->Separator();
 }
 
 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();
         QString delemiter = Delemiter();
         if (imap->wrapper->createMbox(ndir,folder,delemiter,makesubs))
         {
             imap->refreshFolders(true);
         }
     }
 }
 
 void 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);
    
     if (yesno == 0)
     {
         if (imap->getWrapper()->deleteMbox(folder))
         {
             QListView*v=listView();
             IMAPviewItem * box = imap;
             /* be carefull - after that this object is destroyd so don't use
              * any member of it after that call!!*/
             imap->refreshFolders(true);
             if (v)
             {
                 v->setSelected(box,true);
             }
         }
     }
 }
 
 void IMAPfolderItem::downloadMails()
 {
     AccountView*bl = imap->accountView();
     if (!bl) return;
     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()
 {
     delete wrapper;
 }
 
 AbstractMail *MHviewItem::getWrapper()
 {
     return wrapper;
 }
 
 void MHviewItem::refresh( QValueList<RecMailP> & target)
 {
     refresh(false);
     getWrapper()->listMessages( "",target );
 }
 
 void MHviewItem::refresh(bool force)
 {
     if (childCount()>0 && force==false) return;
     removeChilds();
     currentFolders.clear();
     QValueList<FolderP> *folders = wrapper->listFolders();
     QValueList<FolderP>::ConstIterator it;
     MHfolderItem*item = 0;
     MHfolderItem*pmaster = 0;
     QString fname = "";
diff --git a/kmicromail/editaccounts.cpp b/kmicromail/editaccounts.cpp
index d43d23b..733e38a 100644
--- a/kmicromail/editaccounts.cpp
+++ b/kmicromail/editaccounts.cpp
@@ -493,129 +493,169 @@ void SMTPconfig::slotConnectionToggle( int index )
     }
     else if (  index == 3 )
     {
         portLine->setText( SMTP_PORT );
         CommandEdit->show();
     }
     else
     {
         portLine->setText( SMTP_PORT );
     }
 }
 
 void SMTPconfig::fillValues()
 {
     accountLine->setText( data->getAccountName() );
     serverLine->setText( data->getServer() );
     portLine->setText( data->getPort() );
     ComboBox1->setCurrentItem( data->ConnectionType() );
     loginBox->setChecked( data->getLogin() );
     userLine->setText( data->getUser() );
     passLine->setText( data->getPassword() );
 }
 
 void SMTPconfig::accept()
 {
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
     data->setPort( portLine->text() );
     data->setConnectionType( ComboBox1->currentItem() );
     data->setLogin( loginBox->isChecked() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );
 
     QDialog::accept();
 }
 
 /**
  * NNTPconfig
  */
 
 NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
         : NNTPconfigUI( parent, name, modal, flags )
 {
     data = account;
 
     connect( loginBox, SIGNAL( toggled(bool) ), userLine, SLOT( setEnabled(bool) ) );
     connect( loginBox, SIGNAL( toggled(bool) ), passLine, SLOT( setEnabled(bool) ) );
     connect( GetNGButton,  SIGNAL( clicked() ), this, SLOT( slotGetNG() ) );
+    connect( ShowSubcribed,  SIGNAL( clicked() ), this, SLOT( slotShowSub() ) );
+    connect( FilterButton,  SIGNAL( clicked() ), this, SLOT( slotShowFilter() ) );
     fillValues();
 
     connect( sslBox, SIGNAL( toggled(bool) ), SLOT( slotSSL(bool) ) );
 }
 
+void NNTPconfig::slotShowSub()
+{
+    save();
+    data->save();
+    ListViewGroups->clear();
+    for ( QStringList::Iterator it = subscribedGroups.begin(); it != subscribedGroups.end(); ++it ) {
+         QCheckListItem *item;
+         item = new QCheckListItem( ListViewGroups, (*it), QCheckListItem::CheckBox );
+         item->setOn( true );
+    }
+    topLevelWidget()->setCaption( tr("%1 groups subscribed").arg( subscribedGroups.count()));
+}
+void NNTPconfig::slotShowFilter()
+{
+    save();
+    data->save();
+    ListViewGroups->clear();
+    int count = 0;
+    for ( QStringList::Iterator it = allGroups.begin(); it != allGroups.end(); ++it ) {
+        QCheckListItem *item;
+        if ( GroupFilter->text().isEmpty() || (*it).find( GroupFilter->text() ) >= 0 ) {
+            item = new QCheckListItem( ListViewGroups, (*it), QCheckListItem::CheckBox );
+            ++count;
+            if ( subscribedGroups.contains( (*it) ) >= 1 ) {
+                item->setOn( true );
+            }
+        }
+    }
+    topLevelWidget()->setCaption( tr("Filter found %1 groups").arg( count));
+}
 void NNTPconfig::slotGetNG() {
     save();
     data->save();
+    topLevelWidget()->setCaption( tr("Fetching group list..."));
+    qApp->processEvents();
     NNTPwrapper* tmp = new NNTPwrapper( data );
-    QStringList list =  tmp->listAllNewsgroups();
+    allGroups =  tmp->listAllNewsgroups();
+    topLevelWidget()->setCaption( tr("Downloaded %1 group names").arg( allGroups.count()));
     
     ListViewGroups->clear();
 
-    for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
-         QCheckListItem *item;
-         item = new QCheckListItem( ListViewGroups, (*it), QCheckListItem::CheckBox );
-         if ( subscribedGroups.contains( (*it) ) >= 1 ) {
-             item->setOn( true );
-         }
+    for ( QStringList::Iterator it = allGroups.begin(); it != allGroups.end(); ++it ) {
+        QCheckListItem *item;
+        item = new QCheckListItem( ListViewGroups, (*it), QCheckListItem::CheckBox );
+        if ( subscribedGroups.contains( (*it) ) >= 1 ) {
+            item->setOn( true );
+            
+        }
     }
+    delete tmp;
 }
 
 void NNTPconfig::slotSSL( bool enabled )
 {
     if ( enabled )
     {
         portLine->setText( NNTP_SSL_PORT );
     }
     else
     {
         portLine->setText( NNTP_PORT );
     }
 }
 
 void NNTPconfig::fillValues()
 {
     accountLine->setText( data->getAccountName() );
     serverLine->setText( data->getServer() );
     portLine->setText( data->getPort() );
     sslBox->setChecked( data->getSSL() );
     loginBox->setChecked( data->getLogin() );
     userLine->setText( data->getUser() );
     passLine->setText( data->getPassword() );
     subscribedGroups = data->getGroups();
     /* don't forget that - you will overwrite values if user clicks cancel! */
     for ( QStringList::Iterator it = subscribedGroups.begin(); it != subscribedGroups.end(); ++it ) {
          QCheckListItem *item;
          item = new QCheckListItem( ListViewGroups, (*it), QCheckListItem::CheckBox );
          item->setOn( true );
     }
 }
 
 void NNTPconfig::save()
 {
     data->setAccountName( accountLine->text() );
     data->setServer( serverLine->text() );
     data->setPort( portLine->text() );
     data->setSSL( sslBox->isChecked() );
     data->setLogin( loginBox->isChecked() );
     data->setUser( userLine->text() );
     data->setPassword( passLine->text() );
 
-   QListViewItemIterator list_it( ListViewGroups );
+    QListViewItemIterator list_it( ListViewGroups );
 
-       QStringList groupList;
-   for ( ; list_it.current(); ++list_it ) {
+    for ( ; list_it.current(); ++list_it ) {
 
-       if ( ( (QCheckListItem*)list_it.current() )->isOn() ) {
-          groupList.append(  list_it.current()->text(0) );
-      }
+        if ( ( (QCheckListItem*)list_it.current() )->isOn() ) {
+             if ( subscribedGroups.contains( list_it.current()->text(0) ) < 1 ) 
+                 subscribedGroups.append(  list_it.current()->text(0) );
+        } else {
+             if ( subscribedGroups.contains( list_it.current()->text(0) ) >= 1 ) 
+                 subscribedGroups.remove(  list_it.current()->text(0) );
+        }
 
-  }
-      data->setGroups( groupList );
+    }
+    data->setGroups( subscribedGroups );
 }
 
 void NNTPconfig::accept()
 {
     save();
     QDialog::accept();
 }
 
diff --git a/kmicromail/editaccounts.h b/kmicromail/editaccounts.h
index a9eb19f..6cf842e 100644
--- a/kmicromail/editaccounts.h
+++ b/kmicromail/editaccounts.h
@@ -96,58 +96,61 @@ class POP3config : public POP3configUI
 public:
     POP3config( POP3account *account, QWidget *parent = 0, const char *name = 0, bool modal = 0, WFlags flags = 0 );
     
 public slots:
     void fillValues();
 
 protected slots:
     void slotConnectionToggle( int index );
     void accept();
 
 private:
     POP3account *data;
 
 };
 
 class SMTPconfig : public SMTPconfigUI
 {
     Q_OBJECT
 
 public:
     SMTPconfig( SMTPaccount *account, QWidget *parent = 0, const char *name = 0, bool modal = 0, WFlags flags = 0 );
 
 public slots:
     void fillValues();
 
 protected slots:
     void slotConnectionToggle( int index );
     void accept();
 
 private:
     SMTPaccount *data;
 
 };
 
 class NNTPconfig : public NNTPconfigUI
 {
     Q_OBJECT
 
 public:
     NNTPconfig( NNTPaccount *account, QWidget *parent = 0, const char *name = 0, bool modal = 0, WFlags flags = 0 );
 
 public slots:
     void fillValues();
 
 protected slots:
     void slotSSL( bool enabled );
     void accept();
     void slotGetNG();
+    void slotShowSub();
+    void slotShowFilter();
 
 private:
     QStringList subscribedGroups;
+    QStringList allGroups;
     void save();
     NNTPaccount *data;
     clist* list;
 
 };
 
 #endif
diff --git a/kmicromail/mainwindow.cpp b/kmicromail/mainwindow.cpp
index d130317..2a67e39 100644
--- a/kmicromail/mainwindow.cpp
+++ b/kmicromail/mainwindow.cpp
@@ -1,86 +1,91 @@
 
 // CHANGED 2004-08-06 Lutz Rogowski
 #include <qlabel.h>
 #include <qvbox.h>
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlayout.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <kapplication.h>
 
 #ifndef DESKTOP_VERSION
 #include <qpe/qpeapplication.h>
 #endif
 #include "defines.h"
 #include "mainwindow.h"
 #include <KDGanttMinimizeSplitter.h>
 
 
 #include <kabc/stdaddressbook.h>
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     : QMainWindow( parent, name ) //, flags )
 {
     setCaption( tr( "KOpieMail/Pi" ) );
     setToolBarsMovable( false ); 
     //KABC::StdAddressBook::self();
     toolBar = new QToolBar( this );
     menuBar = new QPEMenuBar( toolBar );
     mailMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( tr( "Mail" ), mailMenu );
     settingsMenu = new QPopupMenu( menuBar );
     menuBar->insertItem( tr( "Settings" ), settingsMenu );
 
     addToolBar( toolBar );
     toolBar->setHorizontalStretchable( true );
+    QAction* getMail = new QAction( tr( "Get all new mails" ), SmallIcon("add"),
+                               0, 0, this );
+    connect(getMail, SIGNAL( activated() ),
+            SLOT( slotGetAllMail() ) );
+    getMail->addTo( mailMenu );
 
-    QAction* getMail = new QAction( tr( "Get new mail" ), SmallIcon("add"),
+    getMail = new QAction( tr( "Get new messages" ), SmallIcon("add"),
                                0, 0, this );
     getMail->addTo( toolBar );
     getMail->addTo( mailMenu );
     connect(getMail, SIGNAL( activated() ),
             SLOT( slotGetMail() ) );
 
     composeMail = new QAction( tr( "Compose new mail" ), SmallIcon("composemail"),
                                0, 0, this );
     composeMail->addTo( toolBar );
     composeMail->addTo( mailMenu );
 
     sendQueued = new QAction( tr( "Send queued mails" ), SmallIcon("sendqueued") ,
                               0, 0, this );
     sendQueued->addTo( toolBar );
     sendQueued->addTo( mailMenu );
 
     /*
     syncFolders = new QAction( tr( "Sync mailfolders" ), ICON_SYNC,
                                0, 0, this );
     syncFolders->addTo( toolBar );
     syncFolders->addTo( mailMenu );
     */
 
     showFolders = new QAction( tr( "Show/Hide folders" ), SmallIcon("showfolders") ,
                                0, 0, this, 0, true );
     showFolders->addTo( toolBar );
     showFolders->addTo( mailMenu );
     showFolders->setOn( true );
     connect(showFolders, SIGNAL( toggled(bool) ),
             SLOT( slotShowFolders(bool) ) );
 
     /*
       searchMails = new QAction( tr( "Search mails" ), SmallIcon("find") ),
                                0, 0, this );
     searchMails->addTo( toolBar );
     searchMails->addTo( mailMenu );
     */
 
     deleteMails = new QAction(tr("Delete Mail"),  SmallIcon("trash"), 0, 0, this);
     deleteMails->addTo( toolBar );
     deleteMails->addTo( mailMenu );
     connect( deleteMails, SIGNAL( activated() ),
              SLOT( slotDeleteMail() ) );
 
     editSettings = new QAction( tr( "Edit settings" ), SmallIcon("SettingsIcon")  ,
                                 0, 0, this );
     editSettings->addTo( settingsMenu );
     connect( editSettings, SIGNAL( activated() ),
diff --git a/kmicromail/mainwindow.h b/kmicromail/mainwindow.h
index ff0ff20..35b9c8c 100644
--- a/kmicromail/mainwindow.h
+++ b/kmicromail/mainwindow.h
@@ -1,66 +1,67 @@
 
 // CHANGED 2004-08-06 Lutz Rogowski
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
 #include <qlistview.h>
 #include <qaction.h>
 
 #include <qtoolbar.h>
 #ifdef DESKTOP_VERSION
 #include <qmenubar.h>
 #else
 #include <qpe/qpemenubar.h>
 #endif
 
 #include "accountview.h"
 #include "statuswidget.h"
 
 #include <libmailwrapper/mailtypes.h>
 #include <opie2/osmartpointer.h>
 
 class RecMail;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
 public:
     MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
     virtual ~MainWindow();
 
 public slots:
     virtual void slotAdjustColumns();
     virtual void appMessage(const QCString &msg, const QByteArray &data);
     virtual void slotComposeMail();
 
 protected slots:
     virtual void slotSendQueued();
     virtual void slotEditAccounts();
     virtual void slotShowFolders( bool show );
     virtual void refreshMailView(const QValueList<RecMailP>&);
     virtual void displayMail();
     virtual void slotGetMail() = 0;
+    virtual void slotGetAllMail() = 0;
     virtual void slotDeleteMail();
     virtual void mailHold(int, QListViewItem *,const QPoint&,int);
     virtual void slotAdjustLayout();
     virtual void slotEditSettings();
     virtual void mailLeftClicked( QListViewItem * );
     void showLicence();
     void showAbout();
     void showEtpanLicence(); 
 
 protected:
     QToolBar *toolBar;
     StatusWidget *statusWidget;
     QPEMenuBar *menuBar;
     QPopupMenu *mailMenu, *settingsMenu;
     QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails,
             *editSettings, *editAccounts, *syncFolders;
     AccountView *folderView;
     QListView *mailView;
     //QBoxLayout *layout;
 };
 
 #endif
diff --git a/kmicromail/nntpconfigui.ui b/kmicromail/nntpconfigui.ui
index 25d564e..16ff6fc 100644
--- a/kmicromail/nntpconfigui.ui
+++ b/kmicromail/nntpconfigui.ui
@@ -1,79 +1,79 @@
 <!DOCTYPE UI><UI>
 <class>NNTPconfigUI</class>
 <widget>
     <class>QDialog</class>
     <property stdset="1">
         <name>name</name>
         <cstring>NNTPconfigUI</cstring>
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>409</width>
-            <height>520</height>
+            <width>268</width>
+            <height>347</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Configure NNTP</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
     <vbox>
         <property stdset="1">
             <name>margin</name>
-            <number>3</number>
+            <number>2</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
             <number>3</number>
         </property>
         <widget>
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>TabWidget2</cstring>
             </property>
             <property>
                 <name>layoutMargin</name>
             </property>
             <property>
                 <name>layoutSpacing</name>
             </property>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Account</string>
                 </attribute>
                 <grid>
                     <property stdset="1">
                         <name>margin</name>
                         <number>3</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>3</number>
                     </property>
                     <widget row="2"  column="1" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>serverLine</cstring>
                         </property>
                     </widget>
                     <widget row="3"  column="0" >
                         <class>QLabel</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>portLabel</cstring>
@@ -244,101 +244,167 @@
                             <cstring>loginBox</cstring>
                         </property>
                         <property stdset="1">
                             <name>text</name>
                             <string>Use Login</string>
                         </property>
                     </widget>
                     <widget row="7"  column="1" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>userLine</cstring>
                         </property>
                         <property stdset="1">
                             <name>enabled</name>
                             <bool>false</bool>
                         </property>
                     </widget>
                     <widget row="8"  column="1" >
                         <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
                             <cstring>passLine</cstring>
                         </property>
                         <property stdset="1">
                             <name>enabled</name>
                             <bool>false</bool>
                         </property>
                         <property stdset="1">
                             <name>echoMode</name>
                             <enum>Password</enum>
                         </property>
                     </widget>
                 </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Groups</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>3</number>
+                        <number>2</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>3</number>
                     </property>
                     <widget>
-                        <class>QListView</class>
-                        <column>
-                            <property>
-                                <name>text</name>
-                                <string>Newsgroup</string>
-                            </property>
-                            <property>
-                                <name>clickable</name>
-                                <bool>true</bool>
-                            </property>
-                            <property>
-                                <name>resizeable</name>
-                                <bool>true</bool>
-                            </property>
-                        </column>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>ListViewGroups</cstring>
-                        </property>
-                    </widget>
-                    <widget>
-                        <class>QPushButton</class>
+                        <class>QLayoutWidget</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>GetNGButton</cstring>
+                            <cstring>Layout10</cstring>
                         </property>
-                        <property stdset="1">
-                            <name>text</name>
-                            <string>Get newsgroup list from server</string>
+                        <property>
+                            <name>layoutSpacing</name>
                         </property>
+                        <vbox>
+                            <property stdset="1">
+                                <name>margin</name>
+                                <number>0</number>
+                            </property>
+                            <property stdset="1">
+                                <name>spacing</name>
+                                <number>3</number>
+                            </property>
+                            <widget>
+                                <class>QListView</class>
+                                <column>
+                                    <property>
+                                        <name>text</name>
+                                        <string>Newsgroup</string>
+                                    </property>
+                                    <property>
+                                        <name>clickable</name>
+                                        <bool>true</bool>
+                                    </property>
+                                    <property>
+                                        <name>resizeable</name>
+                                        <bool>true</bool>
+                                    </property>
+                                </column>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>ListViewGroups</cstring>
+                                </property>
+                            </widget>
+                            <widget>
+                                <class>QPushButton</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>GetNGButton</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Get newsgroup list from server</string>
+                                </property>
+                            </widget>
+                            <widget>
+                                <class>QLayoutWidget</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>Layout9</cstring>
+                                </property>
+                                <hbox>
+                                    <property stdset="1">
+                                        <name>margin</name>
+                                        <number>0</number>
+                                    </property>
+                                    <property stdset="1">
+                                        <name>spacing</name>
+                                        <number>6</number>
+                                    </property>
+                                    <widget>
+                                        <class>QPushButton</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>FilterButton</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>Filter:</string>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QLineEdit</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>GroupFilter</cstring>
+                                        </property>
+                                    </widget>
+                                    <widget>
+                                        <class>QPushButton</class>
+                                        <property stdset="1">
+                                            <name>name</name>
+                                            <cstring>ShowSubcribed</cstring>
+                                        </property>
+                                        <property stdset="1">
+                                            <name>text</name>
+                                            <string>Show subscribed</string>
+                                        </property>
+                                    </widget>
+                                </hbox>
+                            </widget>
+                        </vbox>
                     </widget>
                 </vbox>
             </widget>
         </widget>
     </vbox>
 </widget>
 <tabstops>
     <tabstop>accountLine</tabstop>
     <tabstop>serverLine</tabstop>
     <tabstop>portLine</tabstop>
     <tabstop>sslBox</tabstop>
     <tabstop>loginBox</tabstop>
     <tabstop>userLine</tabstop>
     <tabstop>passLine</tabstop>
 </tabstops>
 </UI>
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index 4e7c6be..7ccfb65 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -208,96 +208,104 @@ void OpieMail::slotSearchMails()
     qDebug("OpieMail::slotSearchMails():not implemented ");
 }
 
 void OpieMail::slotEditSettings()
 {
 #if 0
     SettingsDialog settingsDialog( this,  0, true,  WStyle_ContextHelp );
     settingsDialog.showMaximized();
     settingsDialog.exec();
 #endif
     KOPrefsDialog settingsDialog( this,  "koprefs", true );
     settingsDialog.showMaximized();
     settingsDialog.exec();
 }
 
 void OpieMail::slotEditAccounts()
 {
     EditAccounts eaDialog( settings, this, 0, true );
     eaDialog.slotAdjustColumns();
     eaDialog.showMaximized();
     eaDialog.exec();
     if ( settings ) delete settings;
     settings = new Settings();
 
     folderView->populate( settings->getAccounts() );
 }
 
 void OpieMail::displayMail()
 {
     QListViewItem*item = mailView->currentItem();
     if (!item) return;
     RecMailP mail = ((MailListViewItem*)item)->data();
     RecBodyP body = folderView->fetchBody(mail);
     ViewMail readMail( this,"", Qt::WType_Modal   );
     readMail.setBody( body );
     readMail.setMail( mail );
     readMail.showMaximized();
     readMail.exec();
 
     if (  readMail.deleted )
     {
         folderView->refreshCurrent();
     }
     else
     {
         ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
     }
 }
+void OpieMail::slotGetAllMail()
+{
+    QListViewItem * item = folderView->firstChild();
+    while ( item ){
+        ((AccountViewItem *)item)->contextMenuSelected( 101 );
+        item = item->nextSibling ();
+    }
+}
 void OpieMail::slotGetMail()
 {
     QListViewItem * item = folderView->currentItem();
     if ( ! item ) return;
     while ( item->parent () )
         item = item->parent ();
     ((AccountViewItem *)item)->contextMenuSelected( 101 );
 }
 void OpieMail::slotDeleteMail()
 {
     if (!mailView->currentItem()) return;
     RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
     if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + mail->getFrom() + " - " + mail->getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
     {
         mail->Wrapper()->deleteMail( mail );
         folderView->refreshCurrent();
     }
 }
 void OpieMail::slotDeleteAllMail()
 {
 
     QValueList<RecMailP> t;
     if ( QMessageBox::warning(this, tr("Delete All Mails"), tr("Do you really want to delete\nall selected mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
         {
             MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
             while ( item ) {
                 if ( item->isSelected() ) {
                     t.append( item->data() );
                 }
                 item = (MailListViewItem*)item->nextSibling();
             }
         }
     else
         return;
     if ( t.count() == 0 )
         return;
     RecMailP mail = t.first();
     mail->Wrapper()->deleteMailList(t);
     folderView->refreshCurrent();
 
 
 }
 void OpieMail::clearSelection()
 {
     mailView->clearSelection();
   
 }
 
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index 47264e4..9de95f8 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -1,54 +1,55 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 #ifndef OPIEMAIL_H
 #define OPIEMAIL_H
 
 #include "mainwindow.h"
 #include <libmailwrapper/settings.h>
 
 #include <opie2/osmartpointer.h>
 #include <libmailwrapper/mailtypes.h>
 
 class OpieMail : public MainWindow
 {
     Q_OBJECT
 
 public:
     OpieMail( QWidget *parent = 0, const char *name = 0 );
     virtual ~OpieMail();
     static QString appName() { return QString::fromLatin1("kopiemail"); }
 
 public slots:
     virtual void slotwriteMail(const QString&name,const QString&email);
     virtual void slotwriteMail2(const QString&nameemail);
     virtual void slotComposeMail();
     virtual void slotExtAppHandler();
     virtual void appMessage(const QCString &msg, const QByteArray &data);
     virtual void message(const QCString &msg, const QByteArray &data);
 protected slots:
     virtual void slotSendQueued();
     virtual void slotSearchMails();
     virtual void slotEditSettings();
     virtual void slotEditAccounts();
     virtual void displayMail();
     virtual void slotDeleteMail();
     virtual void slotGetMail();
+    virtual void slotGetAllMail();
     virtual void slotDeleteAllMail();
     virtual void mailHold(int, QListViewItem *,const QPoint&,int);
     virtual void slotShowFolders( bool show );
     virtual void refreshMailView(const QValueList<RecMailP>&);
     virtual void mailLeftClicked(  QListViewItem * );
     virtual void slotMoveCopyMail();
     virtual void slotMoveCopyAllMail();
     virtual void reEditMail();
     void clearSelection();
 
 private:
     QString mPendingEmail;
     QString mPendingName;
     QByteArray mPendingData;
     QCString mPendingMessage;
     Settings *settings;
 
 };
 
 #endif