author | zautrix <zautrix> | 2004-07-07 06:29:27 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-07-07 06:29:27 (UTC) |
commit | f2bf08414f8006f0ddedc293804566b3b154428c (patch) (side-by-side diff) | |
tree | a611e80fb264c5f2c8551982b1bc6a6da6d8e6d6 /kabc | |
parent | c9c0fefaead651c073318e8242d86675519dbcf6 (diff) | |
download | kdepimpi-f2bf08414f8006f0ddedc293804566b3b154428c.zip kdepimpi-f2bf08414f8006f0ddedc293804566b3b154428c.tar.gz kdepimpi-f2bf08414f8006f0ddedc293804566b3b154428c.tar.bz2 |
Fix of the address type == other problem
-rw-r--r-- | kabc/address.cpp | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/kabc/address.cpp b/kabc/address.cpp index 26e0b6a..c820a6c 100644 --- a/kabc/address.cpp +++ b/kabc/address.cpp @@ -287,12 +287,32 @@ Address::TypeList Address::typeList() return list; } QString Address::typeLabel( int type ) { + QString label; + if ( type & Dom ) + label += i18n("Domestic")+" "; + if ( type & Intl ) + label += i18n("International")+" "; + if ( type & Postal ) + label += i18n("Postal")+" "; + if ( type & Parcel ) + label += i18n("Parcel")+" "; + if ( type & Work ) + label += i18n("Work Address", "Work")+" "; + if ( type & Home ) + label += i18n("Home Address", "Home") +" "; + if ( type & Pref ) + label += i18n("Preferred Address", "(p)"); + if ( label.isEmpty() ) + label = i18n("Other"); + return label; + +#if 0 switch ( type ) { case Dom: return i18n("Domestic"); break; case Intl: return i18n("International"); @@ -313,12 +333,13 @@ QString Address::typeLabel( int type ) return i18n("Preferred Address"); break; default: return i18n("Other"); break; } +#endif } void Address::dump() const { qDebug("Address::dump() +++++++++++++++++ "); #if 0 |