| -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 @@ -229,154 +229,175 @@ QString Address::regionLabel() void Address::setPostalCode( const QString &s ) { mEmpty = false; mPostalCode = s; } QString Address::postalCode() const { return mPostalCode; } QString Address::postalCodeLabel() { return i18n("Postal Code"); } void Address::setCountry( const QString &s ) { mEmpty = false; mCountry = s; } QString Address::country() const { return mCountry; } QString Address::countryLabel() { return i18n("Country"); } void Address::setLabel( const QString &s ) { mEmpty = false; mLabel = s; } QString Address::label() const { return mLabel; } QString Address::labelLabel() { return i18n("Delivery Label"); } Address::TypeList Address::typeList() { TypeList list; list << Dom << Intl << Postal << Parcel << Home << Work << Pref; 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"); break; case Postal: return i18n("Postal"); break; case Parcel: return i18n("Parcel"); break; case Home: return i18n("Home Address", "Home"); break; case Work: return i18n("Work Address", "Work"); break; case Pref: return i18n("Preferred Address"); break; default: return i18n("Other"); break; } +#endif } void Address::dump() const { qDebug("Address::dump() +++++++++++++++++ "); #if 0 kdDebug(5700) << " Address {" << endl; kdDebug(5700) << " Id: " << id() << endl; kdDebug(5700) << " Extended: " << extended() << endl; kdDebug(5700) << " Street: " << street() << endl; kdDebug(5700) << " Postal Code: " << postalCode() << endl; kdDebug(5700) << " Locality: " << locality() << endl; kdDebug(5700) << " }" << endl; #endif } QString Address::formattedAddress( const QString &realName , const QString &orgaName ) const { QString ciso; QString addrTemplate; QString ret; // ************************************************************** // LR: currently we have no iso handling - we will format the address manually here QString text; if ( !street().isEmpty() ) text += street() + "\n"; if ( !postOfficeBox().isEmpty() ) text += postOfficeBox() + "\n"; text += locality() + QString(" ") + region(); if ( !postalCode().isEmpty() ) text += QString(", ") + postalCode(); text += "\n"; if ( !country().isEmpty() ) text += country() + "\n"; text += extended(); return text; // ************************************************************** // FIXME: first check for iso-country-field and prefer that one if ( !country().isEmpty() ) { ciso = countryToISO( country() ); } else { // fall back to our own country ciso = KGlobal::locale()->country(); } //qDebug("ciso %s ",ciso.latin1() ); KSimpleConfig entry( locate( "locale", QString( "l10n/" ) + ciso + QString( "/entry.desktop" ) ) ); entry.setGroup( "KCM Locale" ); // decide whether this needs special business address formatting if ( orgaName.isNull() ) { |