1 files changed, 77 insertions, 45 deletions

diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index c9084ad..9230b8b 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -439,2 +439,4 @@ QString OContact::toRichText() const
     QString value, comp, state;
+    QString str;
+    bool marker = false;
 
@@ -442,3 +444,3 @@ QString OContact::toRichText() const
     if ( !(value = fullName()).isEmpty() )
-        text += "<b>" + Qtopia::escapeString(value) + "</b><br>";
+        text += "<b><h3>" + Qtopia::escapeString(value) + "</h3></b><br>";
     if ( !(value = jobTitle()).isEmpty() )
@@ -457,2 +459,9 @@ QString OContact::toRichText() const
 
+    QString defEmail = defaultEmail();
+    if ( !defEmail.isEmpty() )
+        text += "<b>" + QObject::tr("Default Email: ") + "</b>"
+                + Qtopia::escapeString(defEmail) + "<br>";
+
+    text += "<hr>";
+
     // business address
@@ -463,2 +472,3 @@ QString OContact::toRichText() const
         text +=  "<br>";
+        marker = true;
     }
@@ -480,2 +490,40 @@ QString OContact::toRichText() const
 
+    // rest of Business data
+    str = office();
+    if ( !str.isEmpty() ){
+        text += "<b>" + QObject::tr("Office: ") + "</b>"
+                + Qtopia::escapeString(str) + "<br>";
+        marker = true;
+    }
+    str = businessWebpage();
+    if ( !str.isEmpty() ){
+        text += "<b>" + QObject::tr("Business Web Page: ") + "</b>"
+                + Qtopia::escapeString(str) + "<br>";
+        marker = true;
+    }
+    str = businessPhone();
+    if ( !str.isEmpty() ){
+        text += "<b>" + QObject::tr("Business Phone: ") + "</b>"
+                + Qtopia::escapeString(str) + "<br>";
+        marker = true;
+    }
+    str = businessFax();
+    if ( !str.isEmpty() ){
+        text += "<b>" + QObject::tr("Business Fax: ") + "</b>"
+                + Qtopia::escapeString(str) + "<br>";
+        marker = true;
+    }
+    str = businessMobile();
+    if ( !str.isEmpty() ){
+        text += "<b>" + QObject::tr("Business Mobile: ") + "</b>"
+                + Qtopia::escapeString(str) + "<br>";
+        marker = true;
+    }
+    str = businessPager();
+    if ( !str.isEmpty() ){
+        text += "<b>" + QObject::tr("Business Pager: ") + "</b>"
+                + Qtopia::escapeString(str) + "<br>";
+        marker = true;
+    }
+
     // home address
@@ -503,51 +551,34 @@ QString OContact::toRichText() const
 
-    // the others...
-    QString str;
-    QString defEmail = defaultEmail();
-    if ( !defEmail.isEmpty() )
-        text += "<b>" + QObject::tr("Default Email: ") + "</b>"
-                + Qtopia::escapeString(defEmail) + "<br>";
-    str = emails();
-    if ( !str.isEmpty() && ( str != defEmail ) )
-        text += "<b>" + QObject::tr("All Emails: ") + "</b>"
+    // rest of Home data
+    str = homeWebpage();
+    if ( !str.isEmpty() ){
+        text += "<b>" + QObject::tr("Home Web Page: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
+        marker = true;
+    }
     str = homePhone();
-    if ( !str.isEmpty() )
+    if ( !str.isEmpty() ){
         text += "<b>" + QObject::tr("Home Phone: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
+        marker = true;
+    }
     str = homeFax();
-    if ( !str.isEmpty() )
+    if ( !str.isEmpty() ){
         text += "<b>" + QObject::tr("Home Fax: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
+        marker = true;
+    }
     str = homeMobile();
-    if ( !str.isEmpty() )
+    if ( !str.isEmpty() ){
         text += "<b>" + QObject::tr("Home Mobile: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
-    str = homeWebpage();
-    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Home Web Page: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
-    str = businessWebpage();
-    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Business Web Page: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
-    str = office();
-    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Office: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
-    str = businessPhone();
-    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Business Phone: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
-    str = businessFax();
-    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Business Fax: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
-    str = businessMobile();
-    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Business Mobile: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
-    str = businessPager();
-    if ( !str.isEmpty() )
-        text += "<b>" + QObject::tr("Business Pager: ") + "</b>"
+        marker = true;
+    }
+
+    if ( marker )
+            text += "<br><hr><br>";
+    // the others...
+    str = emails();
+    if ( !str.isEmpty() && ( str != defEmail ) )
+        text += "<b>" + QObject::tr("All Emails: ") + "</b>"
                 + Qtopia::escapeString(str) + "<br>";
@@ -605,8 +636,9 @@ QString OContact::toRichText() const
     if ( (value = notes()) ) {
-        QRegExp reg("\n");
+            text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> ";
+            QRegExp reg("\n");
 
-        //QString tmp = Qtopia::escapeString(value);
-        QString tmp = QStyleSheet::convertFromPlainText(value);
-        //tmp.replace( reg, "<br>" );
-        text += "<br>" + tmp + "<br>";
+            //QString tmp = Qtopia::escapeString(value);
+            QString tmp = QStyleSheet::convertFromPlainText(value);
+            //tmp.replace( reg, "<br>" );
+            text += "<br>" + tmp + "<br>";
     }