summaryrefslogtreecommitdiff
authoreilers <eilers>2003-02-17 14:21:01 (UTC)
committer eilers <eilers>2003-02-17 14:21:01 (UTC)
commit24344a3c43b20e1cd8b9ecbf73031b744cdf8197 (patch) (side-by-side diff)
tree5e0520bf19687a8d2685e2ad64b3ccbffb7fe170
parent28e1528173b8fc08cc32d44921621e70cb4da968 (diff)
downloadopie-24344a3c43b20e1cd8b9ecbf73031b744cdf8197.zip
opie-24344a3c43b20e1cd8b9ecbf73031b744cdf8197.tar.gz
opie-24344a3c43b20e1cd8b9ecbf73031b744cdf8197.tar.bz2
Cardview improved ..
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/ocontact.cpp11
-rw-r--r--libopie2/opiepim/ocontact.cpp11
2 files changed, 12 insertions, 10 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
@@ -478,2 +478,4 @@ QString OContact::toRichText() const
state = businessState();
+ if ( !(value = businessZip()).isEmpty() )
+ text += Qtopia::escapeString(value) + " ";
if ( !(value = businessCity()).isEmpty() ) {
@@ -485,4 +487,3 @@ QString OContact::toRichText() const
text += Qtopia::escapeString(state) + "<br>";
- if ( !(value = businessZip()).isEmpty() )
- text += Qtopia::escapeString(value) + "<br>";
+
if ( !(value = businessCountry()).isEmpty() )
@@ -539,2 +540,4 @@ QString OContact::toRichText() const
state = homeState();
+ if ( !(value = homeZip()).isEmpty() )
+ text += Qtopia::escapeString(value) + " ";
if ( !(value = homeCity()).isEmpty() ) {
@@ -546,4 +549,2 @@ QString OContact::toRichText() const
text += Qtopia::escapeString(state) + "<br>";
- if ( !(value = homeZip()).isEmpty() )
- text += Qtopia::escapeString(value) + "<br>";
if ( !(value = homeCountry()).isEmpty() )
@@ -635,3 +636,3 @@ QString OContact::toRichText() const
// notes last
- if ( (value = notes()) ) {
+ if ( !(value = notes()).isEmpty() ) {
text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> ";
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
@@ -478,2 +478,4 @@ QString OContact::toRichText() const
state = businessState();
+ if ( !(value = businessZip()).isEmpty() )
+ text += Qtopia::escapeString(value) + " ";
if ( !(value = businessCity()).isEmpty() ) {
@@ -485,4 +487,3 @@ QString OContact::toRichText() const
text += Qtopia::escapeString(state) + "<br>";
- if ( !(value = businessZip()).isEmpty() )
- text += Qtopia::escapeString(value) + "<br>";
+
if ( !(value = businessCountry()).isEmpty() )
@@ -539,2 +540,4 @@ QString OContact::toRichText() const
state = homeState();
+ if ( !(value = homeZip()).isEmpty() )
+ text += Qtopia::escapeString(value) + " ";
if ( !(value = homeCity()).isEmpty() ) {
@@ -546,4 +549,2 @@ QString OContact::toRichText() const
text += Qtopia::escapeString(state) + "<br>";
- if ( !(value = homeZip()).isEmpty() )
- text += Qtopia::escapeString(value) + "<br>";
if ( !(value = homeCountry()).isEmpty() )
@@ -635,3 +636,3 @@ QString OContact::toRichText() const
// notes last
- if ( (value = notes()) ) {
+ if ( !(value = notes()).isEmpty() ) {
text += "<br><hr><b>" + QObject::tr( "Notes:") + "</b> ";