| author | eilers <eilers> | 2002-12-09 15:08:30 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2002-12-09 15:08:30 (UTC) |
| commit | e487238141c57df63252e41a47b409cbb1f9ae83 (patch) (unidiff) | |
| tree | 6b98869056d5444d65432f3ba313a46273387118 | |
| parent | 9aa7570be3c5417314f5c865344b948a90450b48 (diff) | |
| download | opie-e487238141c57df63252e41a47b409cbb1f9ae83.zip opie-e487238141c57df63252e41a47b409cbb1f9ae83.tar.gz opie-e487238141c57df63252e41a47b409cbb1f9ae83.tar.bz2 | |
Added preview for default email and all email
| -rw-r--r-- | libopie/pim/ocontact.cpp | 8 | ||||
| -rw-r--r-- | libopie2/opiepim/ocontact.cpp | 8 |
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 | |||
| @@ -502,9 +502,13 @@ QString OContact::toRichText() const | |||
| 502 | 502 | ||
| 503 | // the others... | 503 | // the others... |
| 504 | QString str; | 504 | QString str; |
| 505 | QString defEmail = defaultEmail(); | ||
| 506 | if ( !defEmail.isEmpty() ) | ||
| 507 | text += "<b>" + QObject::tr("Default Email: ") + "</b>" | ||
| 508 | + Qtopia::escapeString(defEmail) + "<br>"; | ||
| 505 | str = emails(); | 509 | str = emails(); |
| 506 | if ( !str.isEmpty() ) | 510 | if ( !str.isEmpty() && ( str != defEmail ) ) |
| 507 | text += "<b>" + QObject::tr("Email Addresses: ") + "</b>" | 511 | text += "<b>" + QObject::tr("All Emails: ") + "</b>" |
| 508 | + Qtopia::escapeString(str) + "<br>"; | 512 | + Qtopia::escapeString(str) + "<br>"; |
| 509 | str = homePhone(); | 513 | str = homePhone(); |
| 510 | if ( !str.isEmpty() ) | 514 | if ( !str.isEmpty() ) |
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 | |||
| @@ -502,9 +502,13 @@ QString OContact::toRichText() const | |||
| 502 | 502 | ||
| 503 | // the others... | 503 | // the others... |
| 504 | QString str; | 504 | QString str; |
| 505 | QString defEmail = defaultEmail(); | ||
| 506 | if ( !defEmail.isEmpty() ) | ||
| 507 | text += "<b>" + QObject::tr("Default Email: ") + "</b>" | ||
| 508 | + Qtopia::escapeString(defEmail) + "<br>"; | ||
| 505 | str = emails(); | 509 | str = emails(); |
| 506 | if ( !str.isEmpty() ) | 510 | if ( !str.isEmpty() && ( str != defEmail ) ) |
| 507 | text += "<b>" + QObject::tr("Email Addresses: ") + "</b>" | 511 | text += "<b>" + QObject::tr("All Emails: ") + "</b>" |
| 508 | + Qtopia::escapeString(str) + "<br>"; | 512 | + Qtopia::escapeString(str) + "<br>"; |
| 509 | str = homePhone(); | 513 | str = homePhone(); |
| 510 | if ( !str.isEmpty() ) | 514 | if ( !str.isEmpty() ) |