* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch

* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed
* Added journal read support to the CalDAV resource
* Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 12 insertions, 3 deletions

diff --git a/kmail/kmfoldertree.h b/kmail/kmfoldertree.h
index df23116ab..b7244c6c3 100644
--- a/kmail/kmfoldertree.h
+++ b/kmail/kmfoldertree.h
@@ -88,6 +88,7 @@ public slots:
   void slotShowExpiryProperties();
   void slotIconsChanged();
   void slotNameChanged();
+  void slotNoContentChanged();
   void updateCount();
 
 protected:
@@ -115,9 +116,6 @@ public:
   /** Save config options */
   void writeConfig();
 
-  /** Get/refresh the folder tree */
-  virtual void reload(bool openFolders = false);
-
   /** Recusively add folders in a folder directory to a listview item. */
   virtual void addDirectory( KMFolderDir *fdir, KMFolderTreeItem* parent );
 
@@ -178,6 +176,9 @@ signals:
   /** The selected folder has changed to go to an unread message */
   void folderSelectedUnread( KMFolder * );
 
+  /** The sync state of the _selected_ folder has changed */
+  void syncStateChanged();
+
   /** unread/total/size column has changed */
   void columnsChanged();
 
@@ -188,6 +189,9 @@ signals:
   void nameChanged( KMFolderTreeItem * );
 
 public slots:
+  /** Get/refresh the folder tree */
+  virtual void reload(bool openFolders = false);
+
   /** Select the next folder with unread messages */
   void nextUnreadFolder();
 
@@ -231,6 +235,9 @@ public slots:
   /** Pastes a previously copied/cutted folder below the currently selected folder. */
   void pasteFolder();
 
+  /** Reload the folder tree (using a single shot timer) */
+  void delayedReload();
+
 protected slots:
   //  void slotRMB(int, int);
   /** called by the folder-manager when the list of folders changed */
@@ -282,6 +289,8 @@ protected slots:
   /** Updates copy/cut/paste actions */
   void updateCopyActions();
 
+  void slotSyncStateChanged();
+
 protected:
   virtual void contentsMousePressEvent( TQMouseEvent *e );
   virtual void contentsMouseReleaseEvent(TQMouseEvent* me);