* 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, 62 insertions, 0 deletions

diff --git a/kmail/archivefolderdialog.h b/kmail/archivefolderdialog.h
new file mode 100644
index 000000000..806d5b127
--- /dev/null
+++ b/kmail/archivefolderdialog.h
@@ -0,0 +1,62 @@
+/* Copyright 2009 Klarälvdalens Datakonsult AB
+
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License as
+   published by the Free Software Foundation; either version 2 of
+   the License or (at your option) version 3 or any later version
+   accepted by the membership of KDE e.V. (or its successor approved
+   by the membership of KDE e.V.), which shall act as a proxy
+   defined in Section 14 of version 3 of the license.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef ARCHIVEFOLDERDIALOG_H
+#define ARCHIVEFOLDERDIALOG_H
+
+#include <kdialogbase.h>
+
+class TQCheckBox;
+class KURLRequester;
+class KComboBox;
+class KMFolder;
+
+namespace KMail
+{
+class FolderRequester;
+
+class ArchiveFolderDialog : public KDialogBase
+{
+  Q_OBJECT
+
+  public:
+
+    ArchiveFolderDialog( TQWidget *parent = 0 );
+    void setFolder( KMFolder *defaultFolder );
+
+  protected slots:
+
+    void slotFixFileExtension();
+    void slotFolderChanged( KMFolder * );
+    void slotUrlChanged( const TQString & );
+
+    /** reimp */
+    virtual void slotOk();
+
+  private:
+
+    TQWidget *mParentWidget;
+    TQCheckBox *mDeleteCheckBox;
+    FolderRequester *mFolderRequester;
+    KComboBox *mFormatComboBox;
+    KURLRequester *mUrlRequester;
+};
+
+}
+
+#endif