* 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, 28 insertions, 5 deletions

diff --git a/kmail/filterimporterexporter.h b/kmail/filterimporterexporter.h
index 75f43d14f..8b9a63bb8 100644
--- a/kmail/filterimporterexporter.h
+++ b/kmail/filterimporterexporter.h
@@ -31,10 +31,11 @@
 #define __FILTERIMPORTEREXPORTER_H__
 
 #include <tqvaluelist.h>
-
+#include <kdialogbase.h>
 class KMFilter;
 class KConfig;
 class TQWidget;
+class KPushButton;
 
 namespace KMail
 {
@@ -48,22 +49,44 @@ class FilterImporterExporter
 public:
       FilterImporterExporter( TQWidget* parent, bool popFilter = false );
       virtual ~FilterImporterExporter();
-      
-      /** Export the given filter rules to a file which 
+
+      /** Export the given filter rules to a file which
        * is asked from the user. The list to export is also
        * presented for confirmation/selection. */
       void exportFilters( const TQValueList<KMFilter*> & );
-      
+
       /** Import filters. Ask the user where to import them from
        * and which filters to import. */
       TQValueList<KMFilter*> importFilters();
-      
+
       static void writeFiltersToConfig( const TQValueList<KMFilter*>& filters, KConfig* config, bool bPopFilter );
       static TQValueList<KMFilter*> readFiltersFromConfig( KConfig* config, bool bPopFilter );
 private:
       TQWidget* mParent;
       bool mPopFilter;
 };
+class FilterSelectionDialog : public KDialogBase
+{
+  Q_OBJECT
+public:
+  FilterSelectionDialog( TQWidget * parent = 0 );
+
+  virtual ~FilterSelectionDialog();
+  virtual void slotCancel();
+  bool cancelled();
+  void setFilters( const TQValueList<KMFilter*>& filters );
+
+  TQValueList<KMFilter*> selectedFilters() const;
+public slots:
+  void slotUnselectAllButton();
+  void slotSelectAllButton();
+private:
+  KListView *filtersListView;
+  TQValueList<KMFilter*> originalFilters;
+  bool wasCancelled;
+  KPushButton *selectAllButton;
+  KPushButton *unselectAllButton;
+};
 
 }