fixes

2 files changed, 29 insertions, 6 deletions

diff --git a/libkcal/kincidenceformatter.cpp b/libkcal/kincidenceformatter.cpp
index cc3088a..1751ae3 100644
--- a/libkcal/kincidenceformatter.cpp
+++ b/libkcal/kincidenceformatter.cpp
@@ -7,19 +7,22 @@
 #define size count
 #endif
 
 KIncidenceFormatter* KIncidenceFormatter::mInstance = 0;
 static KStaticDeleter<KIncidenceFormatter> insd;
 
-QString KIncidenceFormatter::getFormattedText( Incidence * inc )
+QString KIncidenceFormatter::getFormattedText( Incidence * inc, bool details, bool created , bool modified  )
 {
 // #ifndef QT_NO_INPUTDIALOG
 //   return QInputDialog::getItem( caption, label, items, current, editable );
 // #else
 //   return QString::null;
 // #endif
+    mDetails = details;
+    mCreated = created ;
+    mModified = modified;
     mText = "";
     if ( inc->type() == "Event" )
         setEvent((Event *) inc );
     else if ( inc->type() == "Todo" )
         setTodo((Todo *) inc );
     return mText;
@@ -135,21 +138,32 @@ void KIncidenceFormatter::setEvent(Event *event)
         //addTag("p",s);
     }
 
     addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
     // mText.append(event->secrecyStr()+"<br>");
     formatCategories(event);
+    if ( mDetails  ) {
     if (!event->description().isEmpty()) {
         addTag("p",i18n("<b>Details: </b>"));
         addTag("p",event->description());
     }
-
+    }
 
     formatReadOnly(event);
     formatAttendees(event);
 
+    if ( mCreated ) {
+        addTag("p",i18n("<b>Created: ")  +" </b>");
+        addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
+        
+    }
+    if ( mModified ) {
+        addTag("p",i18n("<b>Last modified: ")  +" </b>");
+        addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
+        
+    }
  
 }
 
 void KIncidenceFormatter::setTodo(Todo *event )
 {
     int mode = 0;
@@ -209,23 +223,31 @@ void KIncidenceFormatter::setTodo(Todo *event )
     }
     mText.append(i18n("<p><b>Priority:</b> %2</p>")
                  .arg(QString::number(event->priority())));
   
     addTag("p",i18n("<b>Access: </b>") +event->secrecyStr() );
     formatCategories(event);
+    if ( mDetails  ) {
     if (!event->description().isEmpty()) {
         addTag("p",i18n("<b>Details: </b>"));
         addTag("p",event->description());
     }
-
-
-
+    }
     formatReadOnly(event);
     formatAttendees(event);
+    if ( mCreated ) {
+        addTag("p",i18n("<b>Created: ")  +" </b>");
+        addTag("p", KGlobal::locale()->formatDateTime( event->created(), shortDate ));
 
 }
+    if ( mModified ) {
+        addTag("p",i18n("<b>Last modified: ")  +" </b>");
+        addTag("p", KGlobal::locale()->formatDateTime( event->lastModified(), shortDate ));
+        
+    }
+}
 
 void KIncidenceFormatter::setJournal(Journal*  )
 {
 
 }
 
diff --git a/libkcal/kincidenceformatter.h b/libkcal/kincidenceformatter.h
index 6165a9f..068e6d2 100644
--- a/libkcal/kincidenceformatter.h
+++ b/libkcal/kincidenceformatter.h
@@ -14,13 +14,13 @@ using namespace KCal;
 class KIncidenceFormatter : public QObject
 {
   public:
     static KIncidenceFormatter* instance();
     KIncidenceFormatter();
     ~KIncidenceFormatter();
-    QString getFormattedText( Incidence * inc );
+    QString getFormattedText( Incidence * inc , bool details = false, bool created = false, bool modified = false );
  
     void setEvent(Event *event);
     void setTodo(Todo *event );
     void setJournal(Journal*  );
 
   protected:
@@ -30,12 +30,13 @@ class KIncidenceFormatter : public QObject
     void formatCategories(Incidence *event);
     void formatAttendees(Incidence *event);
     void formatReadOnly(Incidence *event);
 
   private:
     bool mSyncMode;
+    bool mDetails, mCreated ,mModified;
 
     QString mText;
     Incidence* mCurrentIncidence; 
     static KIncidenceFormatter* mInstance; 
 };