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

diff --git a/libkcal/incidenceformatter.h b/libkcal/incidenceformatter.h
index ce37b016..b2dcd432 100644
--- a/libkcal/incidenceformatter.h
+++ b/libkcal/incidenceformatter.h
@@ -3,6 +3,7 @@
 
     Copyright (c) 2001-2003 Cornelius Schumacher <schumacher@kde.org>
     Copyright (c) 2004 Reinhold Kainhofer <reinhold@kainhofer.com>
+    Copyright (c) 2009 Klarälvdalens Datakonsult AB, a KDAB Group company <info@kdab.net>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
@@ -22,10 +23,12 @@
 #ifndef KCAL_INCIDENCEFORMATTER_H
 #define KCAL_INCIDENCEFORMATTER_H
 
-#include <tqstring.h>
-
 #include "libkcal_export.h"
 
+#include <tqdatetime.h>
+#include <tqstring.h>
+#include <tqstringlist.h>
+
 namespace KCal {
 class Calendar;
 class Incidence;
@@ -36,7 +39,7 @@ class LIBKCAL_EXPORT InvitationFormatterHelper
   public:
     virtual TQString generateLinkURL( const TQString &id ) { return id; }
     virtual TQString makeLink( const TQString &id, const TQString &text );
-    virtual Calendar* calendar() const { return 0; }
+    virtual Calendar *calendar() const { return 0; }
 };
 
 /**
@@ -49,12 +52,27 @@ class LIBKCAL_EXPORT InvitationFormatterHelper
 class LIBKCAL_EXPORT IncidenceFormatter
 {
   public:
-    static TQString toolTipString( IncidenceBase *incidence, bool richText = true );
+    static TQString KDE_DEPRECATED toolTipString( IncidenceBase *incidence, bool richText = true );
+    static TQString toolTipStr( Calendar *calendar,
+                               IncidenceBase *incidence,
+                               const TQDate &date=TQDate(),
+                               bool richText = true );
     static TQString mailBodyString( IncidenceBase *incidencebase );
-    static TQString extensiveDisplayString( IncidenceBase *incidence );
+    static TQString KDE_DEPRECATED extensiveDisplayString( IncidenceBase *incidence );
+    static TQString extensiveDisplayStr( Calendar *calendar,
+                                        IncidenceBase *incidence,
+                                        const TQDate &date=TQDate() );
 
     static TQString formatICalInvitation( TQString invitation, Calendar *mCalendar,
                                          InvitationFormatterHelper *helper );
+    static TQString KDE_DEPRECATED formatICalInvitationNoHtml( TQString invitation,
+                                                              Calendar *mCalendar,
+                                                              InvitationFormatterHelper *helper );
+    static TQString formatICalInvitationNoHtml( TQString invitation,
+                                               Calendar *mCalendar,
+                                               InvitationFormatterHelper *helper,
+                                               const TQString &sender );
+
     // Format a TNEF attachment to an HTML mail
     static TQString formatTNEFInvitation( const TQByteArray& tnef,
                                          Calendar *mCalendar,
@@ -63,7 +81,44 @@ class LIBKCAL_EXPORT IncidenceFormatter
     static TQString msTNEFToVPart( const TQByteArray& tnef );
 
     static TQString recurrenceString( Incidence *incidence );
+
+    /*
+      Returns a reminder string computed for the specified Incidence.
+      Each item of the returning TQStringList corresponds to a string
+      representation of an reminder belonging to this incidence.
+      @param incidence is a pointer to the Incidence.
+      @param shortfmt if false, a short version of each reminder is printed;
+      else a longer version of each reminder is printed.
+    */
+    static TQStringList reminderStringList( Incidence *incidence, bool shortfmt = true );
+
+    static TQString timeToString( const TQDateTime &date, bool shortfmt = true );
+
+    static TQString dateToString( const TQDateTime &date, bool shortfmt = true );
+
+    static TQString dateTimeToString( const TQDateTime &date,
+                                     bool dateOnly = false,
+                                     bool shortfmt = true );
+    /**
+      Returns a Calendar Resource label name for the specified Incidence.
+      @param calendar is a pointer to the Calendar.
+      @param incidence is a pointer to the Incidence.
+    */
+    static TQString resourceString( Calendar *calendar, Incidence *incidence );
+
+    /**
+      Returns a duration string computed for the specified Incidence.
+      Only makes sense for Events and Todos.
+      @param incidence is a pointer to the Incidence.
+    */
+    static TQString durationString( Incidence *incidence );
+
   private:
+    static TQString formatICalInvitationHelper( TQString invitation,
+                                               Calendar *mCalendar,
+                                               InvitationFormatterHelper *helper,
+                                               bool noHtmlMode,
+                                               const TQString &sender );
     class EventViewerVisitor;
     class ScheduleMessageVisitor;
     class InvitationHeaderVisitor;