| author | eilers <eilers> | 2003-08-06 12:21:16 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2003-08-06 12:21:16 (UTC) |
| commit | ba25812361114b7cf059a3a1fb3aed42f8a7ebde (patch) (side-by-side diff) | |
| tree | a3f2fa10c70a2e4697ae4298260b4f5da54750f0 | |
| parent | f1d5295227f5f15ad5e2a9d180fdbce18568cb71 (diff) | |
| download | opie-ba25812361114b7cf059a3a1fb3aed42f8a7ebde.zip opie-ba25812361114b7cf059a3a1fb3aed42f8a7ebde.tar.gz opie-ba25812361114b7cf059a3a1fb3aed42f8a7ebde.tar.bz2 | |
Cardview update: It is more compressed. Pending: Add pricture for work- and home address..
| -rw-r--r-- | libopie/pim/ocontact.cpp | 18 | ||||
| -rw-r--r-- | libopie2/opiepim/ocontact.cpp | 18 |
2 files changed, 18 insertions, 18 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp index 3473baa..e34feeb 100644 --- a/libopie/pim/ocontact.cpp +++ b/libopie/pim/ocontact.cpp @@ -473,9 +473,9 @@ QString OContact::toRichText() const // business address if ( !businessStreet().isEmpty() || !businessCity().isEmpty() || !businessZip().isEmpty() || !businessCountry().isEmpty() ) { - text += QObject::tr( "<br><br><b>Work Address:</b>" ); + text += QObject::tr( "<br><b>Work Address:</b>" ); marker = true; } if ( !(value = businessStreet()).isEmpty() ){ @@ -489,13 +489,13 @@ QString OContact::toRichText() const if ( !(value = businessZip()).isEmpty() ){ text += "<br>" + Qtopia::escapeString(value) + " "; marker = true; - } else - text += "<br>"; - + } if ( !(value = businessCity()).isEmpty() ) { marker = true; + if ( businessZip().isEmpty() && !businessStreet().isEmpty() ) + text += "<br>"; text += Qtopia::escapeString(value); if ( state ) text += ", " + Qtopia::escapeString(state); } else if ( !state.isEmpty() ){ @@ -565,14 +565,14 @@ QString OContact::toRichText() const + Qtopia::escapeString(str); marker = true; } - text += "<br>"; + // text += "<br>"; // home address if ( !homeStreet().isEmpty() || !homeCity().isEmpty() || !homeZip().isEmpty() || !homeCountry().isEmpty() ) { - text += QObject::tr( "<br><br><b>Home Address:</b>" ); + text += QObject::tr( "<br><b>Home Address:</b>" ); marker = true; } if ( !(value = homeStreet()).isEmpty() ){ @@ -585,13 +585,13 @@ QString OContact::toRichText() const state = homeState(); if ( !(value = homeZip()).isEmpty() ){ text += "<br>" + Qtopia::escapeString(value) + " "; marker = true; - } else - text += "<br>"; - + } if ( !(value = homeCity()).isEmpty() ) { marker = true; + if ( homeZip().isEmpty() && !homeStreet().isEmpty() ) + text += "<br>"; text += Qtopia::escapeString(value); if ( !state.isEmpty() ) text += ", " + Qtopia::escapeString(state); } else if (!state.isEmpty()) { diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp index 3473baa..e34feeb 100644 --- a/libopie2/opiepim/ocontact.cpp +++ b/libopie2/opiepim/ocontact.cpp @@ -473,9 +473,9 @@ QString OContact::toRichText() const // business address if ( !businessStreet().isEmpty() || !businessCity().isEmpty() || !businessZip().isEmpty() || !businessCountry().isEmpty() ) { - text += QObject::tr( "<br><br><b>Work Address:</b>" ); + text += QObject::tr( "<br><b>Work Address:</b>" ); marker = true; } if ( !(value = businessStreet()).isEmpty() ){ @@ -489,13 +489,13 @@ QString OContact::toRichText() const if ( !(value = businessZip()).isEmpty() ){ text += "<br>" + Qtopia::escapeString(value) + " "; marker = true; - } else - text += "<br>"; - + } if ( !(value = businessCity()).isEmpty() ) { marker = true; + if ( businessZip().isEmpty() && !businessStreet().isEmpty() ) + text += "<br>"; text += Qtopia::escapeString(value); if ( state ) text += ", " + Qtopia::escapeString(state); } else if ( !state.isEmpty() ){ @@ -565,14 +565,14 @@ QString OContact::toRichText() const + Qtopia::escapeString(str); marker = true; } - text += "<br>"; + // text += "<br>"; // home address if ( !homeStreet().isEmpty() || !homeCity().isEmpty() || !homeZip().isEmpty() || !homeCountry().isEmpty() ) { - text += QObject::tr( "<br><br><b>Home Address:</b>" ); + text += QObject::tr( "<br><b>Home Address:</b>" ); marker = true; } if ( !(value = homeStreet()).isEmpty() ){ @@ -585,13 +585,13 @@ QString OContact::toRichText() const state = homeState(); if ( !(value = homeZip()).isEmpty() ){ text += "<br>" + Qtopia::escapeString(value) + " "; marker = true; - } else - text += "<br>"; - + } if ( !(value = homeCity()).isEmpty() ) { marker = true; + if ( homeZip().isEmpty() && !homeStreet().isEmpty() ) + text += "<br>"; text += Qtopia::escapeString(value); if ( !state.isEmpty() ) text += ", " + Qtopia::escapeString(state); } else if (!state.isEmpty()) { |