author | eilers <eilers> | 2003-02-17 14:21:01 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-02-17 14:21:01 (UTC) |
commit | 24344a3c43b20e1cd8b9ecbf73031b744cdf8197 (patch) (side-by-side diff) | |
tree | 5e0520bf19687a8d2685e2ad64b3ccbffb7fe170 /libopie2 | |
parent | 28e1528173b8fc08cc32d44921621e70cb4da968 (diff) | |
download | opie-24344a3c43b20e1cd8b9ecbf73031b744cdf8197.zip opie-24344a3c43b20e1cd8b9ecbf73031b744cdf8197.tar.gz opie-24344a3c43b20e1cd8b9ecbf73031b744cdf8197.tar.bz2 |
Cardview improved ..
-rw-r--r-- | libopie2/opiepim/ocontact.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp index 9230b8b..178559b 100644 --- a/libopie2/opiepim/ocontact.cpp +++ b/libopie2/opiepim/ocontact.cpp @@ -473,21 +473,22 @@ QString OContact::toRichText() const marker = true; } if ( !(value = businessStreet()).isEmpty() ) text += Qtopia::escapeString(value) + "<br>"; state = businessState(); + if ( !(value = businessZip()).isEmpty() ) + text += Qtopia::escapeString(value) + " "; 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() ){ @@ -534,21 +535,21 @@ QString OContact::toRichText() const text += "<br>"; } if ( !(value = homeStreet()).isEmpty() ) text += Qtopia::escapeString(value) + "<br>"; state = homeState(); + if ( !(value = homeZip()).isEmpty() ) + text += Qtopia::escapeString(value) + " "; 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>"; // rest of Home data str = homeWebpage(); if ( !str.isEmpty() ){ @@ -630,13 +631,13 @@ QString OContact::toRichText() const text += "<b>" + QObject::tr( "Category:") + "</b> "; text += categoryNames().join(", "); text += "<br>"; } // notes last - if ( (value = notes()) ) { + if ( !(value = notes()).isEmpty() ) { 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>" ); |