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

diff --git a/korganizer/previewdialog.h b/korganizer/previewdialog.h
new file mode 100644
index 00000000..ed32c5f5
--- /dev/null
+++ b/korganizer/previewdialog.h
@@ -0,0 +1,69 @@
+/*
+    This file is part of KOrganizer.
+
+    Copyright (c) 2003,2004 Cornelius Schumacher <schumacher@kde.org>
+    Copyright (C) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
+
+    Copyright (C) 2010 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.net>
+    Author: Sergio Martins, <sergio.martins@kdab.com>
+
+    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) any later version.
+
+    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, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+    As a special exception, permission is given to link this program
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
+*/
+
+#ifndef PREVIEWDIALOG_H
+#define PREVIEWDIALOG_H
+
+#include <kdialogbase.h>
+#include <kurl.h>
+
+class KOListView;
+
+namespace KCal {
+  class CalendarLocal;
+}
+
+class PreviewDialog : public KDialogBase
+{
+    Q_OBJECT
+  public:
+    PreviewDialog( const KURL &url, TQWidget *parent );
+    ~PreviewDialog();
+    bool loadCalendar();
+
+  public slots:
+    void slotAdd();
+    void slotMerge();
+
+  signals:
+    void dialogFinished( PreviewDialog * );
+    void openURL( const KURL &, bool );
+    void addResource( const KURL & );
+
+  private:
+    // Checks if mOriginalUrl is a temp file, if it is we ask the user a place to 
+    // keep the calendar file
+    bool isTempFile() const;
+  private:
+    KURL mOriginalUrl;
+    KURL *mLocalUrl;
+    KOListView *mListView;
+    KCal::CalendarLocal *mCalendar;
+};
+
+#endif