| author | zautrix <zautrix> | 2005-07-02 12:29:31 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-07-02 12:29:31 (UTC) |
| commit | 7b7c582bbb9908ec65c778b70baa6b2c2aa457fc (patch) (unidiff) | |
| tree | e1e1fb9e039f804d44317b5743ba5aae00fdcc9a /kabc | |
| parent | 98273ae9af4d39181ace21fe3dfade141e5f8afb (diff) | |
| download | kdepimpi-7b7c582bbb9908ec65c778b70baa6b2c2aa457fc.zip kdepimpi-7b7c582bbb9908ec65c778b70baa6b2c2aa457fc.tar.gz kdepimpi-7b7c582bbb9908ec65c778b70baa6b2c2aa457fc.tar.bz2 | |
Z 5500 fixes
| -rw-r--r-- | kabc/addresseeview.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index 2691d9a..f3cfb23 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp | |||
| @@ -234,11 +234,13 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) | |||
| 234 | 234 | ||
| 235 | QString tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); | 235 | QString tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); |
| 236 | if ( !tempX.isEmpty() ) { | 236 | if ( !tempX.isEmpty() ) { |
| 237 | notes += QString( | 237 | if ( tempX == "male" || tempX == "female" ) { |
| 238 | "<tr><td align=\"right\"><b>%1</b></td>" | 238 | notes += QString( |
| 239 | "<td align=\"left\">%2</td></tr>" ) | 239 | "<tr><td align=\"right\"><b>%1</b></td>" |
| 240 | .arg( i18n( "" ) ) | 240 | "<td align=\"left\">%2</td></tr>" ) |
| 241 | .arg( i18n(tempX) ); | 241 | .arg( i18n( "" ) ) |
| 242 | .arg( i18n(tempX) ); | ||
| 243 | } | ||
| 242 | } | 244 | } |
| 243 | 245 | ||
| 244 | 246 | ||
| @@ -327,12 +329,14 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) | |||
| 327 | tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" ); | 329 | tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" ); |
| 328 | if ( !tempX.isEmpty() ) { | 330 | if ( !tempX.isEmpty() ) { |
| 329 | QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d"); | 331 | QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d"); |
| 330 | tempX = KGlobal::locale()->formatDate(dt, true); | 332 | if ( dt.isValid () ) { |
| 331 | notes += QString( | 333 | tempX = KGlobal::locale()->formatDate(dt, true); |
| 332 | "<tr><td align=\"right\"><b>%1</b></td>" | 334 | notes += QString( |
| 333 | "<td align=\"left\">%2</td></tr>" ) | 335 | "<tr><td align=\"right\"><b>%1</b></td>" |
| 334 | .arg( i18n( "Anniversary" ) ) | 336 | "<td align=\"left\">%2</td></tr>" ) |
| 335 | .arg( tempX ); | 337 | .arg( i18n( "Anniversary" ) ) |
| 338 | .arg( tempX ); | ||
| 339 | } | ||
| 336 | } | 340 | } |
| 337 | tempX = mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ); | 341 | tempX = mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ); |
| 338 | if ( !tempX.isEmpty() ) { | 342 | if ( !tempX.isEmpty() ) { |