author | zautrix <zautrix> | 2004-07-07 06:29:27 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-07-07 06:29:27 (UTC) |
commit | f2bf08414f8006f0ddedc293804566b3b154428c (patch) (unidiff) | |
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 | |||
@@ -269,74 +269,95 @@ void Address::setLabel( const QString &s ) | |||
269 | mLabel = s; | 269 | mLabel = s; |
270 | } | 270 | } |
271 | 271 | ||
272 | QString Address::label() const | 272 | QString Address::label() const |
273 | { | 273 | { |
274 | return mLabel; | 274 | return mLabel; |
275 | } | 275 | } |
276 | 276 | ||
277 | QString Address::labelLabel() | 277 | QString Address::labelLabel() |
278 | { | 278 | { |
279 | return i18n("Delivery Label"); | 279 | return i18n("Delivery Label"); |
280 | } | 280 | } |
281 | 281 | ||
282 | Address::TypeList Address::typeList() | 282 | Address::TypeList Address::typeList() |
283 | { | 283 | { |
284 | TypeList list; | 284 | TypeList list; |
285 | 285 | ||
286 | list << Dom << Intl << Postal << Parcel << Home << Work << Pref; | 286 | list << Dom << Intl << Postal << Parcel << Home << Work << Pref; |
287 | 287 | ||
288 | return list; | 288 | return list; |
289 | } | 289 | } |
290 | 290 | ||
291 | QString Address::typeLabel( int type ) | 291 | QString Address::typeLabel( int type ) |
292 | { | 292 | { |
293 | QString label; | ||
294 | if ( type & Dom ) | ||
295 | label += i18n("Domestic")+" "; | ||
296 | if ( type & Intl ) | ||
297 | label += i18n("International")+" "; | ||
298 | if ( type & Postal ) | ||
299 | label += i18n("Postal")+" "; | ||
300 | if ( type & Parcel ) | ||
301 | label += i18n("Parcel")+" "; | ||
302 | if ( type & Work ) | ||
303 | label += i18n("Work Address", "Work")+" "; | ||
304 | if ( type & Home ) | ||
305 | label += i18n("Home Address", "Home") +" "; | ||
306 | if ( type & Pref ) | ||
307 | label += i18n("Preferred Address", "(p)"); | ||
308 | if ( label.isEmpty() ) | ||
309 | label = i18n("Other"); | ||
310 | return label; | ||
311 | |||
312 | #if 0 | ||
293 | switch ( type ) { | 313 | switch ( type ) { |
294 | case Dom: | 314 | case Dom: |
295 | return i18n("Domestic"); | 315 | return i18n("Domestic"); |
296 | break; | 316 | break; |
297 | case Intl: | 317 | case Intl: |
298 | return i18n("International"); | 318 | return i18n("International"); |
299 | break; | 319 | break; |
300 | case Postal: | 320 | case Postal: |
301 | return i18n("Postal"); | 321 | return i18n("Postal"); |
302 | break; | 322 | break; |
303 | case Parcel: | 323 | case Parcel: |
304 | return i18n("Parcel"); | 324 | return i18n("Parcel"); |
305 | break; | 325 | break; |
306 | case Home: | 326 | case Home: |
307 | return i18n("Home Address", "Home"); | 327 | return i18n("Home Address", "Home"); |
308 | break; | 328 | break; |
309 | case Work: | 329 | case Work: |
310 | return i18n("Work Address", "Work"); | 330 | return i18n("Work Address", "Work"); |
311 | break; | 331 | break; |
312 | case Pref: | 332 | case Pref: |
313 | return i18n("Preferred Address"); | 333 | return i18n("Preferred Address"); |
314 | break; | 334 | break; |
315 | default: | 335 | default: |
316 | return i18n("Other"); | 336 | return i18n("Other"); |
317 | break; | 337 | break; |
318 | } | 338 | } |
339 | #endif | ||
319 | } | 340 | } |
320 | 341 | ||
321 | void Address::dump() const | 342 | void Address::dump() const |
322 | { | 343 | { |
323 | qDebug("Address::dump() +++++++++++++++++ "); | 344 | qDebug("Address::dump() +++++++++++++++++ "); |
324 | #if 0 | 345 | #if 0 |
325 | kdDebug(5700) << " Address {" << endl; | 346 | kdDebug(5700) << " Address {" << endl; |
326 | kdDebug(5700) << " Id: " << id() << endl; | 347 | kdDebug(5700) << " Id: " << id() << endl; |
327 | kdDebug(5700) << " Extended: " << extended() << endl; | 348 | kdDebug(5700) << " Extended: " << extended() << endl; |
328 | kdDebug(5700) << " Street: " << street() << endl; | 349 | kdDebug(5700) << " Street: " << street() << endl; |
329 | kdDebug(5700) << " Postal Code: " << postalCode() << endl; | 350 | kdDebug(5700) << " Postal Code: " << postalCode() << endl; |
330 | kdDebug(5700) << " Locality: " << locality() << endl; | 351 | kdDebug(5700) << " Locality: " << locality() << endl; |
331 | kdDebug(5700) << " }" << endl; | 352 | kdDebug(5700) << " }" << endl; |
332 | #endif | 353 | #endif |
333 | } | 354 | } |
334 | 355 | ||
335 | 356 | ||
336 | QString Address::formattedAddress( const QString &realName | 357 | QString Address::formattedAddress( const QString &realName |
337 | , const QString &orgaName ) const | 358 | , const QString &orgaName ) const |
338 | { | 359 | { |
339 | QString ciso; | 360 | QString ciso; |
340 | QString addrTemplate; | 361 | QString addrTemplate; |
341 | QString ret; | 362 | QString ret; |
342 | 363 | ||