1 files changed, 40 insertions, 31 deletions

diff --git a/noncore/net/mail/accountview.h b/noncore/net/mail/accountview.h
index 7131192..48f52c7 100644
--- a/noncore/net/mail/accountview.h
+++ b/noncore/net/mail/accountview.h
@@ -13,4 +13,6 @@ class RecMail;
 class RecBody;
 class QPopupMenu;
+class Selectstore;
+class AccountView;
 
 class AccountViewItem : public QListViewItem
@@ -18,14 +20,17 @@ class AccountViewItem : public QListViewItem
         
 public:
-    AccountViewItem( QListView *parent ) : QListViewItem( parent ) {}
-    AccountViewItem( QListViewItem *parent) : QListViewItem( parent) {}
-    AccountViewItem( QListViewItem *parent , QListViewItem*after  ) : QListViewItem( parent,after ) {}
+    AccountViewItem( AccountView *parent );
+    AccountViewItem( QListViewItem *parent);
+    AccountViewItem( QListViewItem *parent , QListViewItem*after  );
+    virtual ~AccountViewItem();
     virtual void refresh(QList<RecMail>&)=0;
     virtual RecBody fetchBody(const RecMail&)=0;
     virtual QPopupMenu * getContextMenu(){return 0;};
     virtual void contextMenuSelected(int){}
+    virtual AccountView*accountView();
 protected:
     virtual void deleteAllMail(AbstractMail*wrapper,Folder*f);
     static const QString contextName;
+    AccountView*m_Backlink;
 };
 
@@ -34,13 +39,17 @@ class POP3viewItem : public AccountViewItem
 
 public:
-    POP3viewItem( POP3account *a, QListView *parent );
-    ~POP3viewItem();
+    POP3viewItem( POP3account *a, AccountView *parent );
+    virtual ~POP3viewItem();
     virtual void refresh( QList<RecMail> &target );
     virtual RecBody fetchBody( const RecMail &mail );
     AbstractMail *getWrapper();
-private:
+    virtual QPopupMenu * getContextMenu();
+    virtual void contextMenuSelected(int);
+
+protected:
     POP3account *account;
     AbstractMail *wrapper;
-
+    void disconnect();
+    void setOnOffline();
 };
 
@@ -50,5 +59,5 @@ class POP3folderItem : public AccountViewItem
 public:
     POP3folderItem( Folder *folder, POP3viewItem *parent , QListViewItem*after  );
-    ~POP3folderItem();
+    virtual ~POP3folderItem();
     virtual void refresh(QList<RecMail>&);
     virtual RecBody fetchBody(const RecMail&);
@@ -58,6 +67,4 @@ public:
 protected:
     void downloadMails();
-
-private:
     Folder *folder;
     POP3viewItem *pop3;
@@ -70,6 +77,6 @@ class IMAPviewItem : public AccountViewItem
     friend class IMAPfolderItem;
 public:
-    IMAPviewItem( IMAPaccount *a, QListView *parent );
-    ~IMAPviewItem();
+    IMAPviewItem( IMAPaccount *a, AccountView *parent );
+    virtual ~IMAPviewItem();
     virtual void refresh(QList<RecMail>&);
     virtual RecBody fetchBody(const RecMail&);
@@ -77,14 +84,15 @@ public:
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
+    const QStringList&subFolders();
+    virtual void refreshFolders(bool force=false);
+    bool offline();
 
 protected:
     IMAPfolderItem*findSubItem(const QString&path,IMAPfolderItem*start=0);
-    virtual void refreshFolders(bool force=false);
     virtual void createNewFolder();
     virtual void removeChilds();
-
-private:
     IMAPaccount *account;
     AbstractMail *wrapper;
+    QStringList currentFolders;
 };
 
@@ -95,5 +103,5 @@ public:
     IMAPfolderItem( Folder *folder, IMAPviewItem *parent , QListViewItem*after  );
     IMAPfolderItem( Folder *folder, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master  );
-    ~IMAPfolderItem();
+    virtual ~IMAPfolderItem();
     virtual void refresh(QList<RecMail>&);
     virtual RecBody fetchBody(const RecMail&);
@@ -105,6 +113,5 @@ protected:
     virtual void createNewFolder();
     virtual void deleteFolder();
-    
-private:
+    virtual void downloadMails();
     Folder *folder;
     IMAPviewItem *imap;
@@ -116,7 +123,6 @@ class MBOXviewItem : public AccountViewItem
 
 public:
-//    MBOXviewItem( MBOXaccount *a, QListView *parent );
-    MBOXviewItem( const QString&aMboxPath, QListView *parent );
-    ~MBOXviewItem();
+    MBOXviewItem( const QString&aMboxPath, AccountView *parent );
+    virtual ~MBOXviewItem();
     virtual void refresh( QList<RecMail> &target );
     virtual RecBody fetchBody( const RecMail &mail );
@@ -124,11 +130,9 @@ public:
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
+    QStringList subFolders();
+    virtual void refresh(bool force=false);
 
 protected:
-    virtual void refresh(bool force=false);
     virtual void createFolder();
-
-private:
-//    MBOXaccount *account;
     QString m_Path;
     AbstractMail *wrapper;
@@ -141,13 +145,13 @@ class MBOXfolderItem : public AccountViewItem
 public:
     MBOXfolderItem( Folder *folder, MBOXviewItem *parent , QListViewItem*after  );
-    ~MBOXfolderItem();
+    virtual ~MBOXfolderItem();
     virtual void refresh(QList<RecMail>&);
     virtual RecBody fetchBody(const RecMail&);
     virtual QPopupMenu * getContextMenu();
     virtual void contextMenuSelected(int);
+    virtual Folder*getFolder();
 
 protected:
     virtual void deleteFolder();
-private:
     Folder *folder;
     MBOXviewItem *mbox;
@@ -160,6 +164,8 @@ class AccountView : public QListView
 public:
     AccountView( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
-    void populate( QList<Account> list );
-    RecBody fetchBody(const RecMail&aMail);
+    virtual ~AccountView();
+    virtual void populate( QList<Account> list );
+    virtual RecBody fetchBody(const RecMail&aMail);
+    virtual void downloadMails(Folder*fromFolder,AbstractMail*fromWrapper);
 
 public slots:
@@ -169,10 +175,13 @@ public slots:
     virtual void slotHold(int, QListViewItem *,const QPoint&,int);
     virtual void slotContextMenu(int id);
+    void setupFolderselect(Selectstore*sels);
 
 signals:
     void refreshMailview(QList<RecMail>*);  
 
-private: 
-    QListViewItem* m_currentItem; 
+protected: 
+    QListViewItem* m_currentItem;
+    QValueList<IMAPviewItem*> imapAccounts;
+    QValueList<MBOXviewItem*> mboxAccounts;
 };