From 586dea6e61c766da49ba6cb55dd71851c0fafad3 Mon Sep 17 00:00:00 2001
From: drw <drw>
Date: Sun, 18 May 2003 23:20:25 +0000
Subject: Updates to ocontact, oevent & otodo's toRichText() implementations

---
(limited to 'libopie/pim/oevent.cpp')

diff --git a/libopie/pim/oevent.cpp b/libopie/pim/oevent.cpp
index 83b191f..e4f5d92 100644
--- a/libopie/pim/oevent.cpp
+++ b/libopie/pim/oevent.cpp
@@ -235,22 +235,54 @@ bool OEvent::match( const QRegExp& re )const {
     return false;
 }
 QString OEvent::toRichText()const {
-    QString text;
+    QString text, value;
+    
+    // description
+    text += "<b><h3><img src=\"datebook/DateBook\">";
     if ( !description().isEmpty() ) {
-        text += "<b>" + QObject::tr( "Description:") + "</b><br>";
-        text += Qtopia::escapeString(description() ).
-                replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+        text += Qtopia::escapeString(description() ).replace(QRegExp( "[\n]"),  "" );
+    }
+    text += "</h3></b><br><hr><br>";
+    
+    // location
+    if ( !(value = location()).isEmpty() ) {
+        text += "<b>" + QObject::tr( "Location:" ) + "</b> ";
+        text += Qtopia::escapeString(value) + "<br>";
+    }
+
+    // all day event
+    if ( isAllDay() ) {
+        text += "<b><i>" + QObject::tr( "This is an all day event" ) + "</i></b><br>";
     }
-    if ( startDateTime().isValid() ) {
-        text += "<b>" + QObject::tr( "Start:") + "</b> ";
-        text += Qtopia::escapeString(startDateTime().toString() ).
-                replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+    // multiple day event
+    else if ( isMultipleDay () ) {
+        text += "<b><i>" + QObject::tr( "This is a multiple day event" ) + "</i></b><br>";
+    }
+    // start & end times
+    else {
+        // start time
+        if ( startDateTime().isValid() ) {
+            text += "<b>" + QObject::tr( "Start:") + "</b> ";
+            text += Qtopia::escapeString(startDateTime().toString() ).
+                    replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+        }
+
+        // end time
+        if ( endDateTime().isValid() ) {
+            text += "<b>" + QObject::tr( "End:") + "</b> ";
+            text += Qtopia::escapeString(endDateTime().toString() ).
+                    replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+        }
     }
-    if ( endDateTime().isValid() ) {
-        text += "<b>" + QObject::tr( "End:") + "</b> ";
-        text += Qtopia::escapeString(endDateTime().toString() ).
-                replace(QRegExp( "[\n]"),  "<br>" ) + "<br>";
+    
+    // categories
+    if ( categoryNames("Calendar").count() ){
+	    text += "<b>" + QObject::tr( "Category:") + "</b> ";
+	    text += categoryNames("Calendar").join(", ");
+	    text += "<br>";
     }
+    
+    //notes
     if ( !note().isEmpty() ) {
         text += "<b>" + QObject::tr( "Note:") + "</b><br>";
         text += note();
--
cgit v0.9.0.2