2 files changed, 12 insertions, 4 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index efa2777..6aec62e 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -377,259 +377,263 @@ OContact::~OContact()
 /*! \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;
    // name, jobtitle and company
    if ( !(value = fullName()).isEmpty() )
        text += "<b>" + Qtopia::escapeString(value) + "</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>";
    // business address
    if ( !businessStreet().isEmpty() || !businessCity().isEmpty() ||
         !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
        text += "<br>";
        text += QObject::tr( "<b>Work Address:</b>" );
        text +=  "<br>";
    }
    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>";
    // 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...
    QString str;
+    QString defEmail = defaultEmail();
+    if ( !defEmail.isEmpty() )
+        text += "<b>" + QObject::tr("Default Email: ") + "</b>"
+                + Qtopia::escapeString(defEmail) + "<br>";
    str = emails();
-    if ( !str.isEmpty() )
+    if ( !str.isEmpty() && ( str != defEmail ) )
-        text += "<b>" + QObject::tr("Email Addresses: ") + "</b>"
+        text += "<b>" + QObject::tr("All Emails: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = homePhone();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Home Phone: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = homeFax();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Home Fax: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = homeMobile();
    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>"
                + 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 = 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");
        //QString tmp = Qtopia::escapeString(value);
        QString tmp = QStyleSheet::convertFromPlainText(value);
        //tmp.replace( reg, "<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];
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index efa2777..6aec62e 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -377,259 +377,263 @@ OContact::~OContact()
 /*! \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;
    // name, jobtitle and company
    if ( !(value = fullName()).isEmpty() )
        text += "<b>" + Qtopia::escapeString(value) + "</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>";
    // business address
    if ( !businessStreet().isEmpty() || !businessCity().isEmpty() ||
         !businessZip().isEmpty() || !businessCountry().isEmpty() ) {
        text += "<br>";
        text += QObject::tr( "<b>Work Address:</b>" );
        text +=  "<br>";
    }
    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>";
    // 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...
    QString str;
+    QString defEmail = defaultEmail();
+    if ( !defEmail.isEmpty() )
+        text += "<b>" + QObject::tr("Default Email: ") + "</b>"
+                + Qtopia::escapeString(defEmail) + "<br>";
    str = emails();
-    if ( !str.isEmpty() )
+    if ( !str.isEmpty() && ( str != defEmail ) )
-        text += "<b>" + QObject::tr("Email Addresses: ") + "</b>"
+        text += "<b>" + QObject::tr("All Emails: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = homePhone();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Home Phone: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = homeFax();
    if ( !str.isEmpty() )
        text += "<b>" + QObject::tr("Home Fax: ") + "</b>"
                + Qtopia::escapeString(str) + "<br>";
    str = homeMobile();
    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>"
                + 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 = 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");
        //QString tmp = Qtopia::escapeString(value);
        QString tmp = QStyleSheet::convertFromPlainText(value);
        //tmp.replace( reg, "<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];