| -rw-r--r-- | kabc/addresseeview.cpp | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index 202a718..7c70ab1 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp @@ -228,20 +228,30 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) if ( sFullDetailsMode ) { notes = QString( "<tr><td align=\"right\"><b>%1</b></td>" "<td align=\"left\"><a href=\"notAllDetails\">%4</a></td></tr>" ) - .arg( i18n("Details:") ) - .arg( i18n("Click here to hide!") ); + .arg( i18n("Details") ) + .arg( i18n("Hide!") ); - QString tempX = mAddressee.secrecy().asString(); + QString tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); + if ( !tempX.isEmpty() ) { + notes += QString( + "<tr><td align=\"right\"><b>%1</b></td>" + "<td align=\"left\">%2</td></tr>" ) + .arg( i18n( "" ) ) + .arg( i18n(tempX) ); + } + + + tempX = mAddressee.secrecy().asString(); notes += QString( "<tr><td align=\"right\"><b>%1</b></td>" "<td align=\"left\">%2</td></tr>" ) .arg( "" ) .arg( tempX ); - + tempX = mAddressee.categories().join(" - "); if ( !tempX.isEmpty() ) { notes += QString( "<tr><td align=\"right\"><b>%1</b></td>" @@ -312,16 +322,9 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) "<td align=\"left\">%2</td></tr>" ) .arg( i18n( "Messanger" ) ) .arg( tempX ); } - tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); - if ( !tempX.isEmpty() ) { - notes += QString( - "<tr><td align=\"right\"><b>%1</b></td>" - "<td align=\"left\">%2</td></tr>" ) - .arg( i18n( "Gender" ) ) - .arg( i18n(tempX) ); - } + tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" ); if ( !tempX.isEmpty() ) { QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d"); tempX = KGlobal::locale()->formatDate(dt, true); @@ -361,10 +364,10 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) } else { notes = QString( "<tr><td align=\"right\"><b>%1</b></td>" "<td align=\"left\"><a href=\"allDetails\">%4</a></td></tr>" ) - .arg( i18n("Details:") ) - .arg( i18n("Click here to show!") ); + .arg( i18n("Details") ) + .arg( i18n("Show!") ); } |