2 files changed, 154 insertions, 90 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
@@ -184,684 +184,716 @@ OContact::~OContact()
 */
 /*! \fn void OContact::setBusinessCountry( const QString &str )
  Sets the business country of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessPhone( const QString &str )
  Sets the business phone number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessFax( const QString &str )
  Sets the business fax number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessMobile( const QString &str )
  Sets the business mobile phone number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessPager( const QString &str )
  Sets the business pager number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessWebpage( const QString &str )
  Sets the business webpage of the contact to \a str.
 */
 /*! \fn void OContact::setProfession( const QString &str )
  Sets the profession of the contact to \a str.
 */
 /*! \fn void OContact::setAssistant( const QString &str )
  Sets the assistant of the contact to \a str.
 */
 /*! \fn void OContact::setManager( const QString &str )
  Sets the manager of the contact to \a str.
 */
 /*! \fn void OContact::setSpouse( const QString &str )
  Sets the spouse of the contact to \a str.
 */
 /*! \fn void OContact::setGender( const QString &str )
  Sets the gender of the contact to \a str.
 */
 /*! \fn void OContact::setNickname( const QString &str )
  Sets the nickname of the contact to \a str.
 */
 /*! \fn void OContact::setNotes( const QString &str )
  Sets the notes about the contact to \a str.
 */
 /*! \fn QString OContact::title() const
  Returns the title of the contact.
 */
 /*! \fn QString OContact::firstName() const
  Returns the first name of the contact.
 */
 /*! \fn QString OContact::middleName() const
  Returns the middle name of the contact.
 */
 /*! \fn QString OContact::lastName() const
  Returns the last name of the contact.
 */
 /*! \fn QString OContact::suffix() const
  Returns the suffix of the contact.
 */
 /*! \fn QString OContact::fileAs() const
  Returns the string the contact is filed as.
 */
 /*! \fn QString OContact::defaultEmail() const
  Returns the default email address of the contact.
 */
 /*! \fn QString OContact::emails() const
  Returns the list of email address for a contact separated by ';'s in a single
  string.
 */
 /*! \fn QString OContact::homeStreet() const
  Returns the home street address of the contact.
 */
 /*! \fn QString OContact::homeCity() const
  Returns the home city of the contact.
 */
 /*! \fn QString OContact::homeState() const
  Returns the home state of the contact.
 */
 /*! \fn QString OContact::homeZip() const
  Returns the home zip of the contact.
 */
 /*! \fn QString OContact::homeCountry() const
  Returns the home country of the contact.
 */
 /*! \fn QString OContact::homePhone() const
  Returns the home phone number of the contact.
 */
 /*! \fn QString OContact::homeFax() const
  Returns the home fax number of the contact.
 */
 /*! \fn QString OContact::homeMobile() const
  Returns the home mobile number of the contact.
 */
 /*! \fn QString OContact::homeWebpage() const
  Returns the home webpage of the contact.
 */
 /*! \fn QString OContact::company() const
  Returns the company for the contact.
 */
 /*! \fn QString OContact::department() const
  Returns the department for the contact.
 */
 /*! \fn QString OContact::office() const
  Returns the office for the contact.
 */
 /*! \fn QString OContact::jobTitle() const
  Returns the job title of the contact.
 */
 /*! \fn QString OContact::profession() const
  Returns the profession of the contact.
 */
 /*! \fn QString OContact::assistant() const
  Returns the assistant of the contact.
 */
 /*! \fn QString OContact::manager() const
  Returns the manager of the contact.
 */
 /*! \fn QString OContact::businessStreet() const
  Returns the business street address of the contact.
 */
 /*! \fn QString OContact::businessCity() const
  Returns the business city of the contact.
 */
 /*! \fn QString OContact::businessState() const
  Returns the business state of the contact.
 */
 /*! \fn QString OContact::businessZip() const
  Returns the business zip of the contact.
 */
 /*! \fn QString OContact::businessCountry() const
  Returns the business country of the contact.
 */
 /*! \fn QString OContact::businessPhone() const
  Returns the business phone number of the contact.
 */
 /*! \fn QString OContact::businessFax() const
  Returns the business fax number of the contact.
 */
 /*! \fn QString OContact::businessMobile() const
  Returns the business mobile number of the contact.
 */
 /*! \fn QString OContact::businessPager() const
  Returns the business pager number of the contact.
 */
 /*! \fn QString OContact::businessWebpage() const
  Returns the business webpage of the contact.
 */
 /*! \fn QString OContact::spouse() const
  Returns the spouse of the contact.
 */
 /*! \fn QString OContact::gender() const
  Returns the gender of the contact.
 */
 /*! \fn QString OContact::nickname() const
  Returns the nickname of the contact.
 */
 /*! \fn QString OContact::children() const
  Returns the children of the contact.
 */
 /*! \fn QString OContact::notes() const
  Returns the notes relating to the the contact.
 */
 /*! \fn QString OContact::groups() const
  \internal
  Returns the groups for the contact.
 */
 /*! \fn QStringList OContact::groupList() const
  \internal
 */
 /*! \fn QString OContact::field(int) const
  \internal
 */
 /*! \fn void OContact::saveJournal( journal_action, const QString & = QString::null )
  \internal
 */
 /*! \fn void OContact::setUid( int id )
  \internal
  Sets the uid for this record to \a id.
 */
 /*! \enum OContact::journal_action
  \internal
 */
 /*!
  \internal
 */
 QMap<int, QString> OContact::toMap() const
 {
    QMap<int, QString> map = mMap;
    QString cats = idsToString( categories() );
    if ( !cats.isEmpty() )
        map.insert( Qtopia::AddressCategory, cats );
    return map;
 }
 /*!
  Returns a rich text formatted QString representing the contents the contact.
 */
 QString OContact::toRichText() const
 {
    QString text;
    QString value, comp, state;
+    QString str;
+    bool marker = false;
    // name, jobtitle and company
    if ( !(value = fullName()).isEmpty() )
-        text += "<b>" + Qtopia::escapeString(value) + "</b><br>";
+        text += "<b><h3>" + Qtopia::escapeString(value) + "</h3></b><br>";
    if ( !(value = jobTitle()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    comp = company();
    if ( !(value = department()).isEmpty() ) {
        text += Qtopia::escapeString(value);
        if ( comp )
            text += ", ";
        else
            text += "<br>";
    }
    if ( !comp.isEmpty() )
        text += Qtopia::escapeString(comp) + "<br>";
+    QString defEmail = defaultEmail();
+    if ( !defEmail.isEmpty() )
+        text += "<b>" + QObject::tr("Default Email: ") + "</b>"
+                + Qtopia::escapeString(defEmail) + "<br>";
+    text += "<hr>";
    // business address
    if ( !businessStreet().isEmpty() || !businessCity().isEmpty() ||
         !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
        text += "<br>";
        text += QObject::tr( "<b>Work Address:</b>" );
        text +=  "<br>";
+        marker = true;
    }
    if ( !(value = businessStreet()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    state =  businessState();
    if ( !(value = businessCity()).isEmpty() ) {
        text += Qtopia::escapeString(value);
        if ( state )
            text += ", " + Qtopia::escapeString(state);
        text += "<br>";
    } else if ( !state.isEmpty() )
        text += Qtopia::escapeString(state) + "<br>";
    if ( !(value = businessZip()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    if ( !(value = businessCountry()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
+    // 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
    if ( !homeStreet().isEmpty() || !homeCity().isEmpty() ||
         !homeZip().isEmpty() || !homeCountry().isEmpty() ) {
        text += "<br>";
        text += QObject::tr( "<b>Home Address:</b>" );
        text +=  "<br>";
    }
    if ( !(value = homeStreet()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    state =  homeState();
    if ( !(value = homeCity()).isEmpty() ) {
        text += Qtopia::escapeString(value);
        if ( !state.isEmpty() )
            text += ", " + Qtopia::escapeString(state);
        text += "<br>";
    } else if (!state.isEmpty())
        text += Qtopia::escapeString(state) + "<br>";
    if ( !(value = homeZip()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    if ( !(value = homeCountry()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
-    // the others...
+    // rest of Home data
-    QString str;
+    str = homeWebpage();
-    QString defEmail = defaultEmail();
+    if ( !str.isEmpty() ){
-    if ( !defEmail.isEmpty() )
+        text += "<b>" + QObject::tr("Home Web Page: ") + "</b>"
-        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>"
                + 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();
+        marker = true;
-    if ( !str.isEmpty() )
+    }
-        text += "<b>" + QObject::tr("Home Web Page: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+    if ( marker )
-    str = businessWebpage();
+            text += "<br><hr><br>";
-    if ( !str.isEmpty() )
+    // the others...
-        text += "<b>" + QObject::tr("Business Web Page: ") + "</b>"
+    str = emails();
-                + Qtopia::escapeString(str) + "<br>";
+    if ( !str.isEmpty() && ( str != defEmail ) )
-    str = office();
+        text += "<b>" + QObject::tr("All Emails: ") + "</b>"
-    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>"
                + Qtopia::escapeString(str) + "<br>";
    str = profession();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Profession: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = assistant();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Assistant: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = manager();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Manager: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = gender();
    if ( !str.isEmpty() && str.toInt() != 0 ) {
        if ( str.toInt() == 1 )
            str = QObject::tr( "Male" );
        else if ( str.toInt() == 2 )
            str = QObject::tr( "Female" );
        text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>";
    }
    str = spouse();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Spouse: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    if ( birthday().isValid() ){
            str = TimeString::numberDateString( birthday() );
            text += "<b>" + QObject::tr("Birthday: ") + "</b>"
                    + Qtopia::escapeString(str) + "<br>";
    }
    if ( anniversary().isValid() ){
            str = TimeString::numberDateString( anniversary() );
            text += "<b>" + QObject::tr("Anniversary: ") + "</b>"
                    + Qtopia::escapeString(str) + "<br>";
    }
    str = children();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Children: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = nickname();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Nickname: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    if ( categoryNames().count() ){
            text += "<b>" + QObject::tr( "Category:") + "</b> ";
            text += categoryNames().join(", ");
            text += "<br>";
    }
    // notes last
    if ( (value = notes()) ) {
-        QRegExp reg("\n");
+            text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> ";
+            QRegExp reg("\n");
-        //QString tmp = Qtopia::escapeString(value);
+            //QString tmp = Qtopia::escapeString(value);
-        QString tmp = QStyleSheet::convertFromPlainText(value);
+            QString tmp = QStyleSheet::convertFromPlainText(value);
-        //tmp.replace( reg, "<br>" );
+            //tmp.replace( reg, "<br>" );
-        text += "<br>" + tmp + "<br>";
+            text += "<br>" + tmp + "<br>";
    }
    return text;
 }
 /*!
  \internal
 */
 void OContact::insert( int key, const QString &v )
 {
    QString value = v.stripWhiteSpace();
    if ( value.isEmpty() )
        mMap.remove( key );
    else
        mMap.insert( key, value );
 }
 /*!
  \internal
 */
 void OContact::replace( int key, const QString & v )
 {
    QString value = v.stripWhiteSpace();
    if ( value.isEmpty() )
        mMap.remove( key );
    else
        mMap.replace( key, value );
 }
 /*!
  \internal
 */
 QString OContact::find( int key ) const
 {
    return mMap[key];
 }
 /*!
  \internal
 */
 QString OContact::displayAddress( const QString &street,
                                 const QString &city,
                                 const QString &state,
                                 const QString &zip,
                                 const QString &country ) const
 {
    QString s = street;
    if ( !street.isEmpty() )
        s+= "\n";
    s += city;
    if ( !city.isEmpty() && !state.isEmpty() )
        s += ", ";
    s += state;
    if ( !state.isEmpty() && !zip.isEmpty() )
        s += "  ";
    s += zip;
    if ( !country.isEmpty() && !s.isEmpty() )
        s += "\n";
    s += country;
    return s;
 }
 /*!
  \internal
 */
 QString OContact::displayBusinessAddress() const
 {
    return displayAddress( businessStreet(), businessCity(),
                           businessState(), businessZip(),
                           businessCountry() );
 }
 /*!
  \internal
 */
 QString OContact::displayHomeAddress() const
 {
    return displayAddress( homeStreet(), homeCity(),
                           homeState(), homeZip(),
                           homeCountry() );
 }
 /*!
  Returns the full name of the contact
 */
 QString OContact::fullName() const
 {
    QString title = find( Qtopia::Title );
    QString firstName = find( Qtopia::FirstName );
    QString middleName = find( Qtopia::MiddleName );
    QString lastName = find( Qtopia::LastName );
    QString suffix = find( Qtopia::Suffix );
    QString name = title;
    if ( !firstName.isEmpty() ) {
        if ( !name.isEmpty() )
            name += " ";
        name += firstName;
    }
    if ( !middleName.isEmpty() ) {
        if ( !name.isEmpty() )
            name += " ";
        name += middleName;
    }
    if ( !lastName.isEmpty() ) {
        if ( !name.isEmpty() )
            name += " ";
        name += lastName;
    }
    if ( !suffix.isEmpty() ) {
        if ( !name.isEmpty() )
            name += " ";
        name += suffix;
    }
    return name.simplifyWhiteSpace();
 }
 /*!
  Returns a list of the names of the children of the contact.
 */
 QStringList OContact::childrenList() const
 {
    return QStringList::split( " ", find( Qtopia::Children ) );
 }
 /*! \fn void OContact::insertEmail( const QString &email )
  Insert \a email into the email list. Ensures \a email can only be added
  once. If there is no default email address set, it sets it to the \a email.
 */
 /*! \fn void OContact::removeEmail( const QString &email )
  Removes the \a email from the email list. If the default email was \a email,
  then the default email address is assigned to the first email in the
  email list
 */
 /*! \fn void OContact::clearEmails()
  Clears the email list.
 */
 /*! \fn void OContact::insertEmails( const QStringList &emailList )
  Appends the \a emailList to the exiting email list
 */
 /*!
  Returns a list of email addresses belonging to the contact, including
  the default email address.
 */
 QStringList OContact::emailList() const
 {
    QString emailStr = emails();
    QStringList r;
    if ( !emailStr.isEmpty() ) {
        qDebug(" emailstr ");
        QStringList l = QStringList::split( emailSeparator(), emailStr );
        for ( QStringList::ConstIterator it = l.begin();it != l.end();++it )
            r += (*it).simplifyWhiteSpace();
    }
    return r;
 }
 /*!
  \overload
  Generates the string for the contact to be filed as from the first,
  middle and last name of the contact.
 */
 void OContact::setFileAs()
 {
    QString lastName, firstName, middleName, fileas;
    lastName = find( Qtopia::LastName );
    firstName = find( Qtopia::FirstName );
    middleName = find( Qtopia::MiddleName );
    if ( !lastName.isEmpty() && !firstName.isEmpty()
         && !middleName.isEmpty() )
        fileas = lastName + ", " + firstName + " " + middleName;
    else if ( !lastName.isEmpty() && !firstName.isEmpty() )
        fileas = lastName + ", " + firstName;
    else if ( !lastName.isEmpty() || !firstName.isEmpty() ||
              !middleName.isEmpty() )
        fileas = firstName + ( firstName.isEmpty() ? "" : " " )
                 + middleName + ( middleName.isEmpty() ? "" : " " )
                 + lastName;
    replace( Qtopia::FileAs, fileas );
 }
 /*!
  \internal
  Appends the contact information to \a buf.
 */
 void OContact::save( QString &buf ) const
 {
    static const QStringList SLFIELDS = fields();
    // I'm expecting "<Contact " in front of this...
    for ( QMap<int, QString>::ConstIterator it = mMap.begin();
          it != mMap.end(); ++it ) {
        const QString &value = it.data();
        int key = it.key();
        if ( !value.isEmpty() ) {
            if ( key == Qtopia::AddressCategory || key == Qtopia::AddressUid)
                continue;
            key -= Qtopia::AddressCategory+1;
            buf += SLFIELDS[key];
            buf += "=\"" + Qtopia::escapeString(value) + "\" ";
        }
    }
    buf += customToXml();
    if ( categories().count() > 0 )
        buf += "Categories=\"" + idsToString( categories() ) + "\" ";
    buf += "Uid=\"" + QString::number( uid() ) + "\" ";
    // You need to close this yourself
 }
 /*!
  \internal
  Returns the list of fields belonging to a contact
  Never change order of this list ! It has to be regarding
  enum AddressBookFields !!
 */
 QStringList OContact::fields()
 {
    QStringList list;
    list.append( "Title" );  // Not Used!
    list.append( "FirstName" );
    list.append( "MiddleName" );
    list.append( "LastName" );
    list.append( "Suffix" );
    list.append( "FileAs" );
    list.append( "JobTitle" );
    list.append( "Department" );
    list.append( "Company" );
    list.append( "BusinessPhone" );
    list.append( "BusinessFax" );
    list.append( "BusinessMobile" );
    list.append( "DefaultEmail" );
    list.append( "Emails" );
    list.append( "HomePhone" );
    list.append( "HomeFax" );
    list.append( "HomeMobile" );
    list.append( "BusinessStreet" );
    list.append( "BusinessCity" );
    list.append( "BusinessState" );
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index c9084ad..9230b8b 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -184,684 +184,716 @@ OContact::~OContact()
 */
 /*! \fn void OContact::setBusinessCountry( const QString &str )
  Sets the business country of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessPhone( const QString &str )
  Sets the business phone number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessFax( const QString &str )
  Sets the business fax number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessMobile( const QString &str )
  Sets the business mobile phone number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessPager( const QString &str )
  Sets the business pager number of the contact to \a str.
 */
 /*! \fn void OContact::setBusinessWebpage( const QString &str )
  Sets the business webpage of the contact to \a str.
 */
 /*! \fn void OContact::setProfession( const QString &str )
  Sets the profession of the contact to \a str.
 */
 /*! \fn void OContact::setAssistant( const QString &str )
  Sets the assistant of the contact to \a str.
 */
 /*! \fn void OContact::setManager( const QString &str )
  Sets the manager of the contact to \a str.
 */
 /*! \fn void OContact::setSpouse( const QString &str )
  Sets the spouse of the contact to \a str.
 */
 /*! \fn void OContact::setGender( const QString &str )
  Sets the gender of the contact to \a str.
 */
 /*! \fn void OContact::setNickname( const QString &str )
  Sets the nickname of the contact to \a str.
 */
 /*! \fn void OContact::setNotes( const QString &str )
  Sets the notes about the contact to \a str.
 */
 /*! \fn QString OContact::title() const
  Returns the title of the contact.
 */
 /*! \fn QString OContact::firstName() const
  Returns the first name of the contact.
 */
 /*! \fn QString OContact::middleName() const
  Returns the middle name of the contact.
 */
 /*! \fn QString OContact::lastName() const
  Returns the last name of the contact.
 */
 /*! \fn QString OContact::suffix() const
  Returns the suffix of the contact.
 */
 /*! \fn QString OContact::fileAs() const
  Returns the string the contact is filed as.
 */
 /*! \fn QString OContact::defaultEmail() const
  Returns the default email address of the contact.
 */
 /*! \fn QString OContact::emails() const
  Returns the list of email address for a contact separated by ';'s in a single
  string.
 */
 /*! \fn QString OContact::homeStreet() const
  Returns the home street address of the contact.
 */
 /*! \fn QString OContact::homeCity() const
  Returns the home city of the contact.
 */
 /*! \fn QString OContact::homeState() const
  Returns the home state of the contact.
 */
 /*! \fn QString OContact::homeZip() const
  Returns the home zip of the contact.
 */
 /*! \fn QString OContact::homeCountry() const
  Returns the home country of the contact.
 */
 /*! \fn QString OContact::homePhone() const
  Returns the home phone number of the contact.
 */
 /*! \fn QString OContact::homeFax() const
  Returns the home fax number of the contact.
 */
 /*! \fn QString OContact::homeMobile() const
  Returns the home mobile number of the contact.
 */
 /*! \fn QString OContact::homeWebpage() const
  Returns the home webpage of the contact.
 */
 /*! \fn QString OContact::company() const
  Returns the company for the contact.
 */
 /*! \fn QString OContact::department() const
  Returns the department for the contact.
 */
 /*! \fn QString OContact::office() const
  Returns the office for the contact.
 */
 /*! \fn QString OContact::jobTitle() const
  Returns the job title of the contact.
 */
 /*! \fn QString OContact::profession() const
  Returns the profession of the contact.
 */
 /*! \fn QString OContact::assistant() const
  Returns the assistant of the contact.
 */
 /*! \fn QString OContact::manager() const
  Returns the manager of the contact.
 */
 /*! \fn QString OContact::businessStreet() const
  Returns the business street address of the contact.
 */
 /*! \fn QString OContact::businessCity() const
  Returns the business city of the contact.
 */
 /*! \fn QString OContact::businessState() const
  Returns the business state of the contact.
 */
 /*! \fn QString OContact::businessZip() const
  Returns the business zip of the contact.
 */
 /*! \fn QString OContact::businessCountry() const
  Returns the business country of the contact.
 */
 /*! \fn QString OContact::businessPhone() const
  Returns the business phone number of the contact.
 */
 /*! \fn QString OContact::businessFax() const
  Returns the business fax number of the contact.
 */
 /*! \fn QString OContact::businessMobile() const
  Returns the business mobile number of the contact.
 */
 /*! \fn QString OContact::businessPager() const
  Returns the business pager number of the contact.
 */
 /*! \fn QString OContact::businessWebpage() const
  Returns the business webpage of the contact.
 */
 /*! \fn QString OContact::spouse() const
  Returns the spouse of the contact.
 */
 /*! \fn QString OContact::gender() const
  Returns the gender of the contact.
 */
 /*! \fn QString OContact::nickname() const
  Returns the nickname of the contact.
 */
 /*! \fn QString OContact::children() const
  Returns the children of the contact.
 */
 /*! \fn QString OContact::notes() const
  Returns the notes relating to the the contact.
 */
 /*! \fn QString OContact::groups() const
  \internal
  Returns the groups for the contact.
 */
 /*! \fn QStringList OContact::groupList() const
  \internal
 */
 /*! \fn QString OContact::field(int) const
  \internal
 */
 /*! \fn void OContact::saveJournal( journal_action, const QString & = QString::null )
  \internal
 */
 /*! \fn void OContact::setUid( int id )
  \internal
  Sets the uid for this record to \a id.
 */
 /*! \enum OContact::journal_action
  \internal
 */
 /*!
  \internal
 */
 QMap<int, QString> OContact::toMap() const
 {
    QMap<int, QString> map = mMap;
    QString cats = idsToString( categories() );
    if ( !cats.isEmpty() )
        map.insert( Qtopia::AddressCategory, cats );
    return map;
 }
 /*!
  Returns a rich text formatted QString representing the contents the contact.
 */
 QString OContact::toRichText() const
 {
    QString text;
    QString value, comp, state;
+    QString str;
+    bool marker = false;
    // name, jobtitle and company
    if ( !(value = fullName()).isEmpty() )
-        text += "<b>" + Qtopia::escapeString(value) + "</b><br>";
+        text += "<b><h3>" + Qtopia::escapeString(value) + "</h3></b><br>";
    if ( !(value = jobTitle()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    comp = company();
    if ( !(value = department()).isEmpty() ) {
        text += Qtopia::escapeString(value);
        if ( comp )
            text += ", ";
        else
            text += "<br>";
    }
    if ( !comp.isEmpty() )
        text += Qtopia::escapeString(comp) + "<br>";
+    QString defEmail = defaultEmail();
+    if ( !defEmail.isEmpty() )
+        text += "<b>" + QObject::tr("Default Email: ") + "</b>"
+                + Qtopia::escapeString(defEmail) + "<br>";
+    text += "<hr>";
    // business address
    if ( !businessStreet().isEmpty() || !businessCity().isEmpty() ||
         !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
        text += "<br>";
        text += QObject::tr( "<b>Work Address:</b>" );
        text +=  "<br>";
+        marker = true;
    }
    if ( !(value = businessStreet()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    state =  businessState();
    if ( !(value = businessCity()).isEmpty() ) {
        text += Qtopia::escapeString(value);
        if ( state )
            text += ", " + Qtopia::escapeString(state);
        text += "<br>";
    } else if ( !state.isEmpty() )
        text += Qtopia::escapeString(state) + "<br>";
    if ( !(value = businessZip()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    if ( !(value = businessCountry()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
+    // 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
    if ( !homeStreet().isEmpty() || !homeCity().isEmpty() ||
         !homeZip().isEmpty() || !homeCountry().isEmpty() ) {
        text += "<br>";
        text += QObject::tr( "<b>Home Address:</b>" );
        text +=  "<br>";
    }
    if ( !(value = homeStreet()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    state =  homeState();
    if ( !(value = homeCity()).isEmpty() ) {
        text += Qtopia::escapeString(value);
        if ( !state.isEmpty() )
            text += ", " + Qtopia::escapeString(state);
        text += "<br>";
    } else if (!state.isEmpty())
        text += Qtopia::escapeString(state) + "<br>";
    if ( !(value = homeZip()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
    if ( !(value = homeCountry()).isEmpty() )
        text += Qtopia::escapeString(value) + "<br>";
-    // the others...
+    // rest of Home data
-    QString str;
+    str = homeWebpage();
-    QString defEmail = defaultEmail();
+    if ( !str.isEmpty() ){
-    if ( !defEmail.isEmpty() )
+        text += "<b>" + QObject::tr("Home Web Page: ") + "</b>"
-        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>"
                + 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();
+        marker = true;
-    if ( !str.isEmpty() )
+    }
-        text += "<b>" + QObject::tr("Home Web Page: ") + "</b>"
-                + Qtopia::escapeString(str) + "<br>";
+    if ( marker )
-    str = businessWebpage();
+            text += "<br><hr><br>";
-    if ( !str.isEmpty() )
+    // the others...
-        text += "<b>" + QObject::tr("Business Web Page: ") + "</b>"
+    str = emails();
-                + Qtopia::escapeString(str) + "<br>";
+    if ( !str.isEmpty() && ( str != defEmail ) )
-    str = office();
+        text += "<b>" + QObject::tr("All Emails: ") + "</b>"
-    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>"
                + Qtopia::escapeString(str) + "<br>";
    str = profession();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Profession: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = assistant();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Assistant: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = manager();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Manager: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = gender();
    if ( !str.isEmpty() && str.toInt() != 0 ) {
        if ( str.toInt() == 1 )
            str = QObject::tr( "Male" );
        else if ( str.toInt() == 2 )
            str = QObject::tr( "Female" );
        text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>";
    }
    str = spouse();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Spouse: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    if ( birthday().isValid() ){
            str = TimeString::numberDateString( birthday() );
            text += "<b>" + QObject::tr("Birthday: ") + "</b>"
                    + Qtopia::escapeString(str) + "<br>";
    }
    if ( anniversary().isValid() ){
            str = TimeString::numberDateString( anniversary() );
            text += "<b>" + QObject::tr("Anniversary: ") + "</b>"
                    + Qtopia::escapeString(str) + "<br>";
    }
    str = children();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Children: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = nickname();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Nickname: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    if ( categoryNames().count() ){
            text += "<b>" + QObject::tr( "Category:") + "</b> ";
            text += categoryNames().join(", ");
            text += "<br>";
    }
    // notes last
    if ( (value = notes()) ) {
-        QRegExp reg("\n");
+            text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> ";
+            QRegExp reg("\n");
-        //QString tmp = Qtopia::escapeString(value);
+            //QString tmp = Qtopia::escapeString(value);
-        QString tmp = QStyleSheet::convertFromPlainText(value);
+            QString tmp = QStyleSheet::convertFromPlainText(value);
-        //tmp.replace( reg, "<br>" );
+            //tmp.replace( reg, "<br>" );
-        text += "<br>" + tmp + "<br>";
+            text += "<br>" + tmp + "<br>";
    }
    return text;
 }
 /*!
  \internal
 */
 void OContact::insert( int key, const QString &v )
 {
    QString value = v.stripWhiteSpace();
    if ( value.isEmpty() )
        mMap.remove( key );
    else
        mMap.insert( key, value );
 }
 /*!
  \internal
 */
 void OContact::replace( int key, const QString & v )
 {
    QString value = v.stripWhiteSpace();
    if ( value.isEmpty() )
        mMap.remove( key );
    else
        mMap.replace( key, value );
 }
 /*!
  \internal
 */
 QString OContact::find( int key ) const
 {
    return mMap[key];
 }
 /*!
  \internal
 */
 QString OContact::displayAddress( const QString &street,
                                 const QString &city,
                                 const QString &state,
                                 const QString &zip,
                                 const QString &country ) const
 {
    QString s = street;
    if ( !street.isEmpty() )
        s+= "\n";
    s += city;
    if ( !city.isEmpty() && !state.isEmpty() )
        s += ", ";
    s += state;
    if ( !state.isEmpty() && !zip.isEmpty() )
        s += "  ";
    s += zip;
    if ( !country.isEmpty() && !s.isEmpty() )
        s += "\n";
    s += country;
    return s;
 }
 /*!
  \internal
 */
 QString OContact::displayBusinessAddress() const
 {
    return displayAddress( businessStreet(), businessCity(),
                           businessState(), businessZip(),
                           businessCountry() );
 }
 /*!
  \internal
 */
 QString OContact::displayHomeAddress() const
 {
    return displayAddress( homeStreet(), homeCity(),
                           homeState(), homeZip(),
                           homeCountry() );
 }
 /*!
  Returns the full name of the contact
 */
 QString OContact::fullName() const
 {
    QString title = find( Qtopia::Title );
    QString firstName = find( Qtopia::FirstName );
    QString middleName = find( Qtopia::MiddleName );
    QString lastName = find( Qtopia::LastName );
    QString suffix = find( Qtopia::Suffix );
    QString name = title;
    if ( !firstName.isEmpty() ) {
        if ( !name.isEmpty() )
            name += " ";
        name += firstName;
    }
    if ( !middleName.isEmpty() ) {
        if ( !name.isEmpty() )
            name += " ";
        name += middleName;
    }
    if ( !lastName.isEmpty() ) {
        if ( !name.isEmpty() )
            name += " ";
        name += lastName;
    }
    if ( !suffix.isEmpty() ) {
        if ( !name.isEmpty() )
            name += " ";
        name += suffix;
    }
    return name.simplifyWhiteSpace();
 }
 /*!
  Returns a list of the names of the children of the contact.
 */
 QStringList OContact::childrenList() const
 {
    return QStringList::split( " ", find( Qtopia::Children ) );
 }
 /*! \fn void OContact::insertEmail( const QString &email )
  Insert \a email into the email list. Ensures \a email can only be added
  once. If there is no default email address set, it sets it to the \a email.
 */
 /*! \fn void OContact::removeEmail( const QString &email )
  Removes the \a email from the email list. If the default email was \a email,
  then the default email address is assigned to the first email in the
  email list
 */
 /*! \fn void OContact::clearEmails()
  Clears the email list.
 */
 /*! \fn void OContact::insertEmails( const QStringList &emailList )
  Appends the \a emailList to the exiting email list
 */
 /*!
  Returns a list of email addresses belonging to the contact, including
  the default email address.
 */
 QStringList OContact::emailList() const
 {
    QString emailStr = emails();
    QStringList r;
    if ( !emailStr.isEmpty() ) {
        qDebug(" emailstr ");
        QStringList l = QStringList::split( emailSeparator(), emailStr );
        for ( QStringList::ConstIterator it = l.begin();it != l.end();++it )
            r += (*it).simplifyWhiteSpace();
    }
    return r;
 }
 /*!
  \overload
  Generates the string for the contact to be filed as from the first,
  middle and last name of the contact.
 */
 void OContact::setFileAs()
 {
    QString lastName, firstName, middleName, fileas;
    lastName = find( Qtopia::LastName );
    firstName = find( Qtopia::FirstName );
    middleName = find( Qtopia::MiddleName );
    if ( !lastName.isEmpty() && !firstName.isEmpty()
         && !middleName.isEmpty() )
        fileas = lastName + ", " + firstName + " " + middleName;
    else if ( !lastName.isEmpty() && !firstName.isEmpty() )
        fileas = lastName + ", " + firstName;
    else if ( !lastName.isEmpty() || !firstName.isEmpty() ||
              !middleName.isEmpty() )
        fileas = firstName + ( firstName.isEmpty() ? "" : " " )
                 + middleName + ( middleName.isEmpty() ? "" : " " )
                 + lastName;
    replace( Qtopia::FileAs, fileas );
 }
 /*!
  \internal
  Appends the contact information to \a buf.
 */
 void OContact::save( QString &buf ) const
 {
    static const QStringList SLFIELDS = fields();
    // I'm expecting "<Contact " in front of this...
    for ( QMap<int, QString>::ConstIterator it = mMap.begin();
          it != mMap.end(); ++it ) {
        const QString &value = it.data();
        int key = it.key();
        if ( !value.isEmpty() ) {
            if ( key == Qtopia::AddressCategory || key == Qtopia::AddressUid)
                continue;
            key -= Qtopia::AddressCategory+1;
            buf += SLFIELDS[key];
            buf += "=\"" + Qtopia::escapeString(value) + "\" ";
        }
    }
    buf += customToXml();
    if ( categories().count() > 0 )
        buf += "Categories=\"" + idsToString( categories() ) + "\" ";
    buf += "Uid=\"" + QString::number( uid() ) + "\" ";
    // You need to close this yourself
 }
 /*!
  \internal
  Returns the list of fields belonging to a contact
  Never change order of this list ! It has to be regarding
  enum AddressBookFields !!
 */
 QStringList OContact::fields()
 {
    QStringList list;
    list.append( "Title" );  // Not Used!
    list.append( "FirstName" );
    list.append( "MiddleName" );
    list.append( "LastName" );
    list.append( "Suffix" );
    list.append( "FileAs" );
    list.append( "JobTitle" );
    list.append( "Department" );
    list.append( "Company" );
    list.append( "BusinessPhone" );
    list.append( "BusinessFax" );
    list.append( "BusinessMobile" );
    list.append( "DefaultEmail" );
    list.append( "Emails" );
    list.append( "HomePhone" );
    list.append( "HomeFax" );
    list.append( "HomeMobile" );
    list.append( "BusinessStreet" );
    list.append( "BusinessCity" );
    list.append( "BusinessState" );