summaryrefslogtreecommitdiff
path: root/libopie2/opiepim
authoreilers <eilers>2002-12-27 12:24:32 (UTC)
committer eilers <eilers>2002-12-27 12:24:32 (UTC)
commiteea5575187d95968ad76b49e4334e1165952163c (patch) (unidiff)
treeeee185b3e936f12d07d8d31656f9f61b994172c5 /libopie2/opiepim
parent497a1cbad9b685ba7e08720d4337589dc6b9fbd2 (diff)
downloadopie-eea5575187d95968ad76b49e4334e1165952163c.zip
opie-eea5575187d95968ad76b49e4334e1165952163c.tar.gz
opie-eea5575187d95968ad76b49e4334e1165952163c.tar.bz2
Childrens are now shown in detail view..
Diffstat (limited to 'libopie2/opiepim') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/ocontact.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index 38cba72..c9084ad 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -556,64 +556,69 @@ QString OContact::toRichText() const
556 text += "<b>" + QObject::tr("Profession: ") + "</b>" 556 text += "<b>" + QObject::tr("Profession: ") + "</b>"
557 + Qtopia::escapeString(str) + "<br>"; 557 + Qtopia::escapeString(str) + "<br>";
558 str = assistant(); 558 str = assistant();
559 if ( !str.isEmpty() ) 559 if ( !str.isEmpty() )
560 text += "<b>" + QObject::tr("Assistant: ") + "</b>" 560 text += "<b>" + QObject::tr("Assistant: ") + "</b>"
561 + Qtopia::escapeString(str) + "<br>"; 561 + Qtopia::escapeString(str) + "<br>";
562 str = manager(); 562 str = manager();
563 if ( !str.isEmpty() ) 563 if ( !str.isEmpty() )
564 text += "<b>" + QObject::tr("Manager: ") + "</b>" 564 text += "<b>" + QObject::tr("Manager: ") + "</b>"
565 + Qtopia::escapeString(str) + "<br>"; 565 + Qtopia::escapeString(str) + "<br>";
566 str = gender(); 566 str = gender();
567 if ( !str.isEmpty() && str.toInt() != 0 ) { 567 if ( !str.isEmpty() && str.toInt() != 0 ) {
568 if ( str.toInt() == 1 ) 568 if ( str.toInt() == 1 )
569 str = QObject::tr( "Male" ); 569 str = QObject::tr( "Male" );
570 else if ( str.toInt() == 2 ) 570 else if ( str.toInt() == 2 )
571 str = QObject::tr( "Female" ); 571 str = QObject::tr( "Female" );
572 text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>"; 572 text += "<b>" + QObject::tr("Gender: ") + "</b>" + str + "<br>";
573 } 573 }
574 str = spouse(); 574 str = spouse();
575 if ( !str.isEmpty() ) 575 if ( !str.isEmpty() )
576 text += "<b>" + QObject::tr("Spouse: ") + "</b>" 576 text += "<b>" + QObject::tr("Spouse: ") + "</b>"
577 + Qtopia::escapeString(str) + "<br>"; 577 + Qtopia::escapeString(str) + "<br>";
578 if ( birthday().isValid() ){ 578 if ( birthday().isValid() ){
579 str = TimeString::numberDateString( birthday() ); 579 str = TimeString::numberDateString( birthday() );
580 text += "<b>" + QObject::tr("Birthday: ") + "</b>" 580 text += "<b>" + QObject::tr("Birthday: ") + "</b>"
581 + Qtopia::escapeString(str) + "<br>"; 581 + Qtopia::escapeString(str) + "<br>";
582 } 582 }
583 if ( anniversary().isValid() ){ 583 if ( anniversary().isValid() ){
584 str = TimeString::numberDateString( anniversary() ); 584 str = TimeString::numberDateString( anniversary() );
585 text += "<b>" + QObject::tr("Anniversary: ") + "</b>" 585 text += "<b>" + QObject::tr("Anniversary: ") + "</b>"
586 + Qtopia::escapeString(str) + "<br>"; 586 + Qtopia::escapeString(str) + "<br>";
587 } 587 }
588 str = children();
589 if ( !str.isEmpty() )
590 text += "<b>" + QObject::tr("Children: ") + "</b>"
591 + Qtopia::escapeString(str) + "<br>";
592
588 str = nickname(); 593 str = nickname();
589 if ( !str.isEmpty() ) 594 if ( !str.isEmpty() )
590 text += "<b>" + QObject::tr("Nickname: ") + "</b>" 595 text += "<b>" + QObject::tr("Nickname: ") + "</b>"
591 + Qtopia::escapeString(str) + "<br>"; 596 + Qtopia::escapeString(str) + "<br>";
592 597
593 if ( categoryNames().count() ){ 598 if ( categoryNames().count() ){
594 text += "<b>" + QObject::tr( "Category:") + "</b> "; 599 text += "<b>" + QObject::tr( "Category:") + "</b> ";
595 text += categoryNames().join(", "); 600 text += categoryNames().join(", ");
596 text += "<br>"; 601 text += "<br>";
597 } 602 }
598 603
599 // notes last 604 // notes last
600 if ( (value = notes()) ) { 605 if ( (value = notes()) ) {
601 QRegExp reg("\n"); 606 QRegExp reg("\n");
602 607
603 //QString tmp = Qtopia::escapeString(value); 608 //QString tmp = Qtopia::escapeString(value);
604 QString tmp = QStyleSheet::convertFromPlainText(value); 609 QString tmp = QStyleSheet::convertFromPlainText(value);
605 //tmp.replace( reg, "<br>" ); 610 //tmp.replace( reg, "<br>" );
606 text += "<br>" + tmp + "<br>"; 611 text += "<br>" + tmp + "<br>";
607 } 612 }
608 return text; 613 return text;
609} 614}
610 615
611/*! 616/*!
612 \internal 617 \internal
613*/ 618*/
614void OContact::insert( int key, const QString &v ) 619void OContact::insert( int key, const QString &v )
615{ 620{
616 QString value = v.stripWhiteSpace(); 621 QString value = v.stripWhiteSpace();
617 if ( value.isEmpty() ) 622 if ( value.isEmpty() )
618 mMap.remove( key ); 623 mMap.remove( key );
619 else 624 else