| -rw-r--r-- | kabc/addresseeview.cpp | 40 | ||||
| -rw-r--r-- | kaddressbook/kabcore.cpp | 2 |
2 files changed, 39 insertions, 3 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index 8f104e0..aa96210 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp @@ -250,31 +250,67 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee ) if (! picture.undefined() ) { picAvailintern = (picture.isIntern() && !picture.data().isNull()); picAvailUrl = !picture.isIntern() && QFile::exists(picture.url() ); } if ( picAvailUrl || picAvailintern || QApplication::desktop()->width() > 320 ) { picString = "<img src=\"myimage\" width=\"50\" height=\"70\">"; if ( picAvailintern ) { QMimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() ); } else { if ( picAvailUrl ) { QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", QPixmap( picture.url() )); } else { + if ( !mAddressee.custom( "KADDRESSBOOK", "X-Children" ).isEmpty() ) { + static bool setDefaultImageChildren = false; + if ( !setDefaultImageChildren ) { + QMimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) ); + setDefaultImageChildren = true; + } + picString = "<img src=\"familyIcon\" width=\"64\" height=\"64\">"; + + } else if ( !mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ).isEmpty() ) { + static bool setDefaultImagepouses = false; + if ( !setDefaultImagepouses ) { + QMimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) ); + setDefaultImagepouses = true; + } + picString = "<img src=\"SpousesIcon\" width=\"64\" height=\"64\">"; + } else { + QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" ); + if ( gen == "male" ) { + static bool setDefaultImageMale = false; + if ( !setDefaultImageMale ) { + QMimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) ); + setDefaultImageMale = true; + } + picString = "<img src=\"MaleIcon\" width=\"64\" height=\"64\">"; + + } else if ( gen == "female" ) { + static bool setDefaultImageFemale = false; + if ( !setDefaultImageFemale ) { + QMimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) ); + setDefaultImageFemale = true; + } + picString = "<img src=\"FemaleIcon\" width=\"64\" height=\"64\">"; + + } else { static bool setDefaultImage = false; if ( !setDefaultImage ) { qDebug("Setting default pixmap "); - QMimeSourceFactory::defaultFactory()->setPixmap( "defaultPenguin", KGlobal::iconLoader()->loadIcon( "package_toys", KIcon::Desktop, 128 ) ); + QMimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) ); setDefaultImage = true; } - picString = "<img src=\"defaultPenguin\" width=\"64\" height=\"64\">"; + picString = "<img src=\"defaultIcon\" width=\"64\" height=\"64\">"; + } + } } } mText = QString::fromLatin1( "<html>" "<body text=\"%1\" bgcolor=\"%2\">" // text and background color "<table>" "<tr>" "<td rowspan=\"3\" align=\"right\" valign=\"top\">" "%3" "</td>" "<td align=\"left\"><font size=\"+2\"><b>%4</b></font></td>" // name "</tr>" diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index e1a490d..3650b20 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp @@ -304,25 +304,25 @@ KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const mIsPart = !parent->inherits( "KAddressBookMain" ); mAddressBook = KABC::StdAddressBook::self(); KABC::StdAddressBook::setAutomaticSave( false ); #ifndef KAB_EMBEDDED mAddressBook->setErrorHandler( new KABC::GUIErrorHandler ); #endif //KAB_EMBEDDED connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook * ) ), SLOT( addressBookChanged() ) ); #if 0 - // LP moved to addressbook init method + // LR moved to addressbook init method mAddressBook->addCustomField( i18n( "Department" ), KABC::Field::Organization, "X-Department", "KADDRESSBOOK" ); mAddressBook->addCustomField( i18n( "Profession" ), KABC::Field::Organization, "X-Profession", "KADDRESSBOOK" ); mAddressBook->addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization, "X-AssistantsName", "KADDRESSBOOK" ); mAddressBook->addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization, "X-ManagersName", "KADDRESSBOOK" ); mAddressBook->addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal, "X-SpousesName", "KADDRESSBOOK" ); mAddressBook->addCustomField( i18n( "Office" ), KABC::Field::Personal, "X-Office", "KADDRESSBOOK" ); |