summaryrefslogtreecommitdiffabout
path: root/kabc
authorzautrix <zautrix>2004-07-07 06:29:27 (UTC)
committer zautrix <zautrix>2004-07-07 06:29:27 (UTC)
commitf2bf08414f8006f0ddedc293804566b3b154428c (patch) (side-by-side diff)
treea611e80fb264c5f2c8551982b1bc6a6da6d8e6d6 /kabc
parentc9c0fefaead651c073318e8242d86675519dbcf6 (diff)
downloadkdepimpi-f2bf08414f8006f0ddedc293804566b3b154428c.zip
kdepimpi-f2bf08414f8006f0ddedc293804566b3b154428c.tar.gz
kdepimpi-f2bf08414f8006f0ddedc293804566b3b154428c.tar.bz2
Fix of the address type == other problem
Diffstat (limited to 'kabc') (more/less context) (show whitespace changes)
-rw-r--r--kabc/address.cpp21
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
@@ -245,122 +245,143 @@ QString Address::postalCodeLabel()
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;