summaryrefslogtreecommitdiffabout
path: root/kabc
authorzautrix <zautrix>2005-06-26 11:53:18 (UTC)
committer zautrix <zautrix>2005-06-26 11:53:18 (UTC)
commit095b64dde716ebaac511d413b5b4acdd68eccae5 (patch) (unidiff)
tree0f87898db258734f12e384f0d000ab773a0ea334 /kabc
parentef04711ec84150e67b00ce6dc0b6c6bafd5a537f (diff)
downloadkdepimpi-095b64dde716ebaac511d413b5b4acdd68eccae5.zip
kdepimpi-095b64dde716ebaac511d413b5b4acdd68eccae5.tar.gz
kdepimpi-095b64dde716ebaac511d413b5b4acdd68eccae5.tar.bz2
fixes
Diffstat (limited to 'kabc') (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addresseeview.cpp31
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
@@ -226,24 +226,34 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
226 226
227 QString notes; 227 QString notes;
228 if ( sFullDetailsMode ) { 228 if ( sFullDetailsMode ) {
229 notes = QString( 229 notes = QString(
230 "<tr><td align=\"right\"><b>%1</b></td>" 230 "<tr><td align=\"right\"><b>%1</b></td>"
231 "<td align=\"left\"><a href=\"notAllDetails\">%4</a></td></tr>" ) 231 "<td align=\"left\"><a href=\"notAllDetails\">%4</a></td></tr>" )
232 .arg( i18n("Details:") ) 232 .arg( i18n("Details") )
233 .arg( i18n("Click here to hide!") ); 233 .arg( i18n("Hide!") );
234 234
235 QString tempX = mAddressee.secrecy().asString(); 235 QString tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
236 if ( !tempX.isEmpty() ) {
237 notes += QString(
238 "<tr><td align=\"right\"><b>%1</b></td>"
239 "<td align=\"left\">%2</td></tr>" )
240 .arg( i18n( "" ) )
241 .arg( i18n(tempX) );
242 }
243
244
245 tempX = mAddressee.secrecy().asString();
236 246
237 notes += QString( 247 notes += QString(
238 "<tr><td align=\"right\"><b>%1</b></td>" 248 "<tr><td align=\"right\"><b>%1</b></td>"
239 "<td align=\"left\">%2</td></tr>" ) 249 "<td align=\"left\">%2</td></tr>" )
240 .arg( "" ) 250 .arg( "" )
241 .arg( tempX ); 251 .arg( tempX );
242 252
243 253
244 tempX = mAddressee.categories().join(" - "); 254 tempX = mAddressee.categories().join(" - ");
245 if ( !tempX.isEmpty() ) { 255 if ( !tempX.isEmpty() ) {
246 notes += QString( 256 notes += QString(
247 "<tr><td align=\"right\"><b>%1</b></td>" 257 "<tr><td align=\"right\"><b>%1</b></td>"
248 "<td align=\"left\">%2</td></tr>" ) 258 "<td align=\"left\">%2</td></tr>" )
249 .arg( i18n( "Category" ) ) 259 .arg( i18n( "Category" ) )
@@ -310,20 +320,13 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
310 notes += QString( 320 notes += QString(
311 "<tr><td align=\"right\"><b>%1</b></td>" 321 "<tr><td align=\"right\"><b>%1</b></td>"
312 "<td align=\"left\">%2</td></tr>" ) 322 "<td align=\"left\">%2</td></tr>" )
313 .arg( i18n( "Messanger" ) ) 323 .arg( i18n( "Messanger" ) )
314 .arg( tempX ); 324 .arg( tempX );
315 } 325 }
316 tempX = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); 326
317 if ( !tempX.isEmpty() ) {
318 notes += QString(
319 "<tr><td align=\"right\"><b>%1</b></td>"
320 "<td align=\"left\">%2</td></tr>" )
321 .arg( i18n( "Gender" ) )
322 .arg( i18n(tempX) );
323 }
324 tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" ); 327 tempX = mAddressee.custom( "KADDRESSBOOK", "X-Anniversary" );
325 if ( !tempX.isEmpty() ) { 328 if ( !tempX.isEmpty() ) {
326 QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d"); 329 QDate dt = KGlobal::locale()->readDate( tempX, "%Y-%m-%d");
327 tempX = KGlobal::locale()->formatDate(dt, true); 330 tempX = KGlobal::locale()->formatDate(dt, true);
328 notes += QString( 331 notes += QString(
329 "<tr><td align=\"right\"><b>%1</b></td>" 332 "<tr><td align=\"right\"><b>%1</b></td>"
@@ -359,14 +362,14 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
359 //qDebug("AddresseeView::setAddressee has to be verified."); 362 //qDebug("AddresseeView::setAddressee has to be verified.");
360 } 363 }
361 } else { 364 } else {
362 notes = QString( 365 notes = QString(
363 "<tr><td align=\"right\"><b>%1</b></td>" 366 "<tr><td align=\"right\"><b>%1</b></td>"
364 "<td align=\"left\"><a href=\"allDetails\">%4</a></td></tr>" ) 367 "<td align=\"left\"><a href=\"allDetails\">%4</a></td></tr>" )
365 .arg( i18n("Details:") ) 368 .arg( i18n("Details") )
366 .arg( i18n("Click here to show!") ); 369 .arg( i18n("Show!") );
367 370
368 371
369 } 372 }
370 373
371 QString aRole = ""; 374 QString aRole = "";
372 QString aOrga = ""; 375 QString aOrga = "";