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

diff --git a/korganizer/actionmanager.h b/korganizer/actionmanager.h
index 25fd6fab..555d4e7d 100644
--- a/korganizer/actionmanager.h
+++ b/korganizer/actionmanager.h
@@ -41,8 +41,7 @@ namespace KCal
   class Incidence;
   class ResourceCalendar;
 }
-namespace KOrg
-{
+namespace KOrg {
   class MainWindow;
 }
 
@@ -59,7 +58,7 @@ class CalendarView;
 class KOrganizer;
 class KONewStuff;
 class KOWindowList;
-class ImportDialog;
+class PreviewDialog;
 class ResourceView;
 class HTMLExportSettings;
 
@@ -152,7 +151,8 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
     */
     virtual bool deleteIncidence( const TQString& uid, bool force = false );
 
-    bool editIncidence( const TQString& uid );
+    bool editIncidence( const TQString &uid );
+    bool editIncidence( const TQString &uid, const TQDate &date );
 
     /**
       Add an incidence to the active calendar.
@@ -194,7 +194,8 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
                          const TQString& uri,
                          const TQString& file,
                          const TQStringList& attendees,
-                         const TQString& attachmentMimetype );
+                         const TQString& attachmentMimetype,
+                         bool isTask );
 
     void openJournalEditor( const TQDate& date );
     void openJournalEditor( const TQString& text, const TQDate& date );
@@ -220,6 +221,8 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
 
     void saveToProfile( const TQString & path ) const;
 
+    bool handleCommandLine();
+
   signals:
     /**
       Emitted when the "New" action is activated.
@@ -251,7 +254,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
 
     void setDestinationPolicy();
 
-    void processIncidenceSelection( Incidence * );
+    void processIncidenceSelection( Incidence *incidence, const TQDate &date );
     void keyBindings();
 
     /**
@@ -342,7 +345,7 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
 
     void updateRedoAction( const TQString & );
 
-    void slotImportDialogFinished( ImportDialog * );
+    void slotPreviewDialogFinished( PreviewDialog * );
 
   protected:
     /** Get URL for saving. Opens FileDialog. */
@@ -367,6 +370,9 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
     void initActions();
     void enableIncidenceActions( bool enable );
 
+    QPair<ResourceCalendar *, TQString> viewSubResourceCalendar();
+    bool isWritable( ResourceCalendar *res, const TQString &subRes, const TQString &contentsType );
+
     KOrg::Part::List mParts; // List of parts loaded
     KURL mURL;      // URL of calendar file
     TQString mFile;  // Local name of calendar file
@@ -401,6 +407,13 @@ class KDE_EXPORT ActionManager : public TQObject, public KCalendarIface
     KAction *mPublishEvent;
     KAction *mForwardEvent;
 
+    KAction *mSendInvitation;
+    KAction *mSendCancel;
+    KAction *mSendStatusUpdate;
+
+    KAction *mRequestChange;
+    KAction *mRequestUpdate;
+
     KAction *mUndoAction;
     KAction *mRedoAction;