1 files changed, 199 insertions, 13 deletions

diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index faa6982..eea021f 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -12,3 +12,3 @@
  */
-POP3viewItem::POP3viewItem( POP3account *a, QListView *parent )
+POP3viewItem::POP3viewItem( POP3account *a, AccountView *parent )
     : AccountViewItem( parent )
@@ -34,2 +34,3 @@ void POP3viewItem::refresh( QList<RecMail> & )
 {
+    if (account->getOffline()) return;
     QList<Folder> *folders = wrapper->listFolders();
@@ -58,2 +59,48 @@ RecBody POP3viewItem::fetchBody( const RecMail &mail )
 
+QPopupMenu * POP3viewItem::getContextMenu()
+{
+    QPopupMenu *m = new QPopupMenu(0);
+    if (m) {
+        if (!account->getOffline()) {
+            m->insertItem(QObject::tr("Disconnect",contextName),0);
+            m->insertItem(QObject::tr("Set offline",contextName),1);
+        } else {
+            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();
+}
+
+void POP3viewItem::contextMenuSelected(int which)
+{
+    switch (which) {
+    case 0:
+        disconnect();
+        break;
+    case 1:
+        setOnOffline();
+        break;
+    }
+}
+
 POP3folderItem::~POP3folderItem()
@@ -93,3 +140,3 @@ QPopupMenu * POP3folderItem::getContextMenu()
         m->insertItem(QObject::tr("Delete all mails",contextName),1);
-        m->insertItem(QObject::tr("Download all mails",contextName),2);
+        m->insertItem(QObject::tr("Move/Copie all mails",contextName),2);
     }
@@ -100,5 +147,5 @@ void POP3folderItem::downloadMails()
 {
-    Selectstore sels;
-    sels.showMaximized();
-    sels.exec();
+    AccountView*bl = pop3->accountView();
+    if (!bl) return;
+    bl->downloadMails(folder,pop3->getWrapper());
 }
@@ -128,3 +175,3 @@ void POP3folderItem::contextMenuSelected(int which)
  */
-IMAPviewItem::IMAPviewItem( IMAPaccount *a, QListView *parent )
+IMAPviewItem::IMAPviewItem( IMAPaccount *a, AccountView *parent )
     : AccountViewItem( parent )
@@ -185,2 +232,7 @@ void IMAPviewItem::removeChilds()
 
+const QStringList&IMAPviewItem::subFolders()
+{
+    return currentFolders;
+}
+
 void IMAPviewItem::refreshFolders(bool force)
@@ -188,5 +240,6 @@ void IMAPviewItem::refreshFolders(bool force)
     if (childCount()>0 && force==false) return;
+    if (account->getOffline()) return;   
     
     removeChilds();
-
+    currentFolders.clear();
     QList<Folder> *folders = wrapper->listFolders();
@@ -211,2 +264,3 @@ void IMAPviewItem::refreshFolders(bool force)
         fname = it->getDisplayName();
+        currentFolders.append(it->getName());
         pos = fname.findRev(it->Separator());
@@ -233,2 +287,3 @@ QPopupMenu * IMAPviewItem::getContextMenu()
     if (m) {
+        if (!account->getOffline()) {
         m->insertItem(QObject::tr("Refresh folder list",contextName),0);
@@ -237,2 +292,6 @@ QPopupMenu * IMAPviewItem::getContextMenu()
         m->insertItem(QObject::tr("Disconnect",contextName),2);
+            m->insertItem(QObject::tr("Set offline",contextName),3);
+        } else {
+            m->insertItem(QObject::tr("Set online",contextName),3);
+        }
     }
@@ -273,2 +332,11 @@ void IMAPviewItem::contextMenuSelected(int id)
         break;
+    case 3:
+        if (account->getOffline()==false) {
+            removeChilds();
+            wrapper->logout();
+        }
+        account->setOffline(!account->getOffline());
+        account->save();
+        refreshFolders(false);
+    break;
     default:
@@ -283,5 +351,5 @@ RecBody IMAPviewItem::fetchBody(const RecMail&)
 
-IMAPfolderItem::~IMAPfolderItem()
+bool IMAPviewItem::offline()
 {
-    delete folder;
+    return account->getOffline();
 }
@@ -314,2 +382,7 @@ IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPfolderItem *parent , QLi
 
+IMAPfolderItem::~IMAPfolderItem()
+{
+    delete folder;
+}
+
 const QString& IMAPfolderItem::Delemiter()const
@@ -344,2 +417,3 @@ QPopupMenu * IMAPfolderItem::getContextMenu()
             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);
@@ -391,2 +465,9 @@ void IMAPfolderItem::deleteFolder()
 
+void IMAPfolderItem::downloadMails()
+{
+    AccountView*bl = imap->accountView();
+    if (!bl) return;
+    bl->downloadMails(folder,imap->getWrapper());
+}
+
 void IMAPfolderItem::contextMenuSelected(int id)
@@ -408,2 +489,5 @@ void IMAPfolderItem::contextMenuSelected(int id)
         break;
+    case 4:
+        downloadMails();
+        break;
     default:
@@ -419,2 +503,29 @@ const QString AccountViewItem::contextName="AccountViewItem";
 
+AccountViewItem::AccountViewItem( AccountView *parent ) 
+    : QListViewItem( parent )
+{
+    m_Backlink = parent;
+}
+
+AccountViewItem::AccountViewItem( QListViewItem *parent)
+    : QListViewItem( parent) 
+{
+    m_Backlink = 0;
+}
+
+AccountViewItem::AccountViewItem( QListViewItem *parent , QListViewItem*after  )
+    :QListViewItem( parent,after )
+{
+    m_Backlink = 0;
+}
+
+AccountViewItem::~AccountViewItem()
+{
+}
+
+AccountView*AccountViewItem::accountView()
+{
+    return m_Backlink;
+}
+
 void AccountViewItem::deleteAllMail(AbstractMail*wrapper,Folder*folder)
@@ -449,2 +560,8 @@ AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
 
+AccountView::~AccountView()
+{
+    imapAccounts.clear();
+    mboxAccounts.clear();
+}
+
 void AccountView::slotContextMenu(int id)
@@ -473,3 +590,6 @@ void AccountView::populate( QList<Account> list )
 
-    (void) new MBOXviewItem(AbstractMail::defaultLocalfolder(),this);
+    imapAccounts.clear();
+    mboxAccounts.clear();
+
+    mboxAccounts.append(new MBOXviewItem(AbstractMail::defaultLocalfolder(),this));
 
@@ -480,3 +600,3 @@ void AccountView::populate( QList<Account> list )
             qDebug( "added IMAP " + imap->getAccountName() );
-            (void) new IMAPviewItem( imap, this );
+            imapAccounts.append(new IMAPviewItem( imap, this ));
         } else if ( it->getType().compare( "POP3" ) == 0 ) {
@@ -484,2 +604,3 @@ void AccountView::populate( QList<Account> list )
             qDebug( "added POP3 " + pop3->getAccountName() );
+            /* must not be hold 'cause it isn't required */
             (void) new POP3viewItem( pop3, this );
@@ -526,2 +647,48 @@ RecBody AccountView::fetchBody(const RecMail&aMail)
 
+void AccountView::setupFolderselect(Selectstore*sels)
+{
+    sels->showMaximized();
+    QStringList sFolders;
+    unsigned int i = 0;
+    for (i=0; i < mboxAccounts.count();++i) {
+        mboxAccounts[i]->refresh(false);
+        sFolders = mboxAccounts[i]->subFolders();
+        sels->addAccounts(mboxAccounts[i]->getWrapper(),sFolders);
+    }
+    for (i=0; i < imapAccounts.count();++i) {
+        if (imapAccounts[i]->offline())
+            continue;
+        imapAccounts[i]->refreshFolders(false);
+        sels->addAccounts(imapAccounts[i]->getWrapper(),imapAccounts[i]->subFolders());
+    }
+}
+
+void AccountView::downloadMails(Folder*fromFolder,AbstractMail*fromWrapper)
+{
+    unsigned int i = 0;
+    AbstractMail*targetMail = 0;
+    QString targetFolder = "";
+    Selectstore sels;
+    setupFolderselect(&sels);
+    if (!sels.exec()) return;
+    targetMail = sels.currentMail();
+    targetFolder = sels.currentFolder();
+    if ( (fromWrapper==targetMail && fromFolder->getName()==targetFolder) ||
+        targetFolder.isEmpty()) {
+        return;
+    }
+
+    QList<RecMail> t;
+    fromWrapper->listMessages(fromFolder->getName(),t);
+    encodedString*st = 0;
+    for (i = 0; i < t.count();++i) {
+        RecMail*r = t.at(i);
+        st = fromWrapper->fetchRawBody(*r);
+        if (st) {
+            targetMail->storeMessage(st->Content(),st->Length(),targetFolder);
+            delete st;
+        }
+    }
+}
+
 /**
@@ -530,3 +697,3 @@ RecBody AccountView::fetchBody(const RecMail&aMail)
 
-MBOXviewItem::MBOXviewItem( const QString&aPath, QListView *parent )
+MBOXviewItem::MBOXviewItem( const QString&aPath, AccountView *parent )
     : AccountViewItem( parent )
@@ -534,3 +701,4 @@ MBOXviewItem::MBOXviewItem( const QString&aPath, QListView *parent )
     m_Path = aPath;
-    wrapper = AbstractMail::getWrapper( m_Path );
+    /* be carefull - the space within settext is wanted - thats why the string twice */
+    wrapper = AbstractMail::getWrapper( m_Path,"Local Folders");
     setPixmap( 0, PIXMAP_LOCALFOLDER );
@@ -604,2 +772,15 @@ void MBOXviewItem::createFolder()
 
+QStringList MBOXviewItem::subFolders()
+{
+    QStringList result;
+    QListViewItem *child = firstChild();
+    while ( child ) {
+        MBOXfolderItem *tmp = (MBOXfolderItem*)child;
+        child = child->nextSibling();
+        result.append(tmp->getFolder()->getName());
+    }
+    qDebug("Size of result: %i",result.count());
+    return result;
+}
+
 void MBOXviewItem::contextMenuSelected(int which)
@@ -638,2 +819,7 @@ MBOXfolderItem::MBOXfolderItem( Folder *folderInit, MBOXviewItem *parent , QList
 
+Folder*MBOXfolderItem::getFolder()
+{
+    return folder;
+}
+
 void MBOXfolderItem::refresh(QList<RecMail>&target)