author | eilers <eilers> | 2003-02-17 14:21:01 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-02-17 14:21:01 (UTC) |
commit | 24344a3c43b20e1cd8b9ecbf73031b744cdf8197 (patch) (unidiff) | |
tree | 5e0520bf19687a8d2685e2ad64b3ccbffb7fe170 /libopie/pim | |
parent | 28e1528173b8fc08cc32d44921621e70cb4da968 (diff) | |
download | opie-24344a3c43b20e1cd8b9ecbf73031b744cdf8197.zip opie-24344a3c43b20e1cd8b9ecbf73031b744cdf8197.tar.gz opie-24344a3c43b20e1cd8b9ecbf73031b744cdf8197.tar.bz2 |
Cardview improved ..
-rw-r--r-- | libopie/pim/ocontact.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp index 9230b8b..178559b 100644 --- a/libopie/pim/ocontact.cpp +++ b/libopie/pim/ocontact.cpp | |||
@@ -477,4 +477,6 @@ QString OContact::toRichText() const | |||
477 | text += Qtopia::escapeString(value) + "<br>"; | 477 | text += Qtopia::escapeString(value) + "<br>"; |
478 | state = businessState(); | 478 | state = businessState(); |
479 | if ( !(value = businessZip()).isEmpty() ) | ||
480 | text += Qtopia::escapeString(value) + " "; | ||
479 | if ( !(value = businessCity()).isEmpty() ) { | 481 | if ( !(value = businessCity()).isEmpty() ) { |
480 | text += Qtopia::escapeString(value); | 482 | text += Qtopia::escapeString(value); |
@@ -484,6 +486,5 @@ QString OContact::toRichText() const | |||
484 | } else if ( !state.isEmpty() ) | 486 | } else if ( !state.isEmpty() ) |
485 | text += Qtopia::escapeString(state) + "<br>"; | 487 | text += Qtopia::escapeString(state) + "<br>"; |
486 | if ( !(value = businessZip()).isEmpty() ) | 488 | |
487 | text += Qtopia::escapeString(value) + "<br>"; | ||
488 | if ( !(value = businessCountry()).isEmpty() ) | 489 | if ( !(value = businessCountry()).isEmpty() ) |
489 | text += Qtopia::escapeString(value) + "<br>"; | 490 | text += Qtopia::escapeString(value) + "<br>"; |
@@ -538,4 +539,6 @@ QString OContact::toRichText() const | |||
538 | text += Qtopia::escapeString(value) + "<br>"; | 539 | text += Qtopia::escapeString(value) + "<br>"; |
539 | state = homeState(); | 540 | state = homeState(); |
541 | if ( !(value = homeZip()).isEmpty() ) | ||
542 | text += Qtopia::escapeString(value) + " "; | ||
540 | if ( !(value = homeCity()).isEmpty() ) { | 543 | if ( !(value = homeCity()).isEmpty() ) { |
541 | text += Qtopia::escapeString(value); | 544 | text += Qtopia::escapeString(value); |
@@ -545,6 +548,4 @@ QString OContact::toRichText() const | |||
545 | } else if (!state.isEmpty()) | 548 | } else if (!state.isEmpty()) |
546 | text += Qtopia::escapeString(state) + "<br>"; | 549 | text += Qtopia::escapeString(state) + "<br>"; |
547 | if ( !(value = homeZip()).isEmpty() ) | ||
548 | text += Qtopia::escapeString(value) + "<br>"; | ||
549 | if ( !(value = homeCountry()).isEmpty() ) | 550 | if ( !(value = homeCountry()).isEmpty() ) |
550 | text += Qtopia::escapeString(value) + "<br>"; | 551 | text += Qtopia::escapeString(value) + "<br>"; |
@@ -634,5 +635,5 @@ QString OContact::toRichText() const | |||
634 | 635 | ||
635 | // notes last | 636 | // notes last |
636 | if ( (value = notes()) ) { | 637 | if ( !(value = notes()).isEmpty() ) { |
637 | text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> "; | 638 | text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> "; |
638 | QRegExp reg("\n"); | 639 | QRegExp reg("\n"); |