1 files changed, 42 insertions, 6 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index 8f104e0..aa96210 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -254,23 +254,59 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
  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 {
-              static bool setDefaultImage = false;
+              if ( !mAddressee.custom( "KADDRESSBOOK", "X-Children" ).isEmpty() ) {
-              if ( !setDefaultImage ) {
+                  static bool setDefaultImageChildren = false;
-                  qDebug("Setting default pixmap ");
+                  if ( !setDefaultImageChildren ) {
-                  QMimeSourceFactory::defaultFactory()->setPixmap( "defaultPenguin", KGlobal::iconLoader()->loadIcon( "package_toys", KIcon::Desktop, 128 ) );
+                      QMimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) );
-                  setDefaultImage = true;
+                      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( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) );
+                          setDefaultImage = true;
+                      }
+                      picString =  "<img src=\"defaultIcon\" width=\"64\" height=\"64\">";
+                  }
              }
-              picString =  "<img src=\"defaultPenguin\" 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\">"

diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index 8f104e0..aa96210 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp
@@ -254,23 +254,59 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
254	if ( picAvailUrl \|\| picAvailintern \|\| QApplication::desktop()->width() > 320 ) {	254	if ( picAvailUrl \|\| picAvailintern \|\| QApplication::desktop()->width() > 320 ) {
255	picString = "<img src=\"myimage\" width=\"50\" height=\"70\">";	255	picString = "<img src=\"myimage\" width=\"50\" height=\"70\">";
256	if ( picAvailintern ) {	256	if ( picAvailintern ) {
257	QMimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() );	257	QMimeSourceFactory::defaultFactory()->setImage( "myimage", picture.data() );
258	} else {	258	} else {
259	if ( picAvailUrl ) {	259	if ( picAvailUrl ) {
260	QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", QPixmap( picture.url() ));	260	QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", QPixmap( picture.url() ));
261	} else {	261	} else {
262	static bool setDefaultImage = false;	262	if ( !mAddressee.custom( "KADDRESSBOOK", "X-Children" ).isEmpty() ) {
263	if ( !setDefaultImage ) {	263	static bool setDefaultImageChildren = false;
264	qDebug("Setting default pixmap ");	264	if ( !setDefaultImageChildren ) {
265	QMimeSourceFactory::defaultFactory()->setPixmap( "defaultPenguin", KGlobal::iconLoader()->loadIcon( "package_toys", KIcon::Desktop, 128 ) );	265	QMimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) );
266	setDefaultImage = true;	266	setDefaultImageChildren = true;
		267	}
		268	picString = "<img src=\"familyIcon\" width=\"64\" height=\"64\">";
		269
		270	} else if ( !mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ).isEmpty() ) {
		271	static bool setDefaultImagepouses = false;
		272	if ( !setDefaultImagepouses ) {
		273	QMimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) );
		274	setDefaultImagepouses = true;
		275	}
		276	picString = "<img src=\"SpousesIcon\" width=\"64\" height=\"64\">";
		277	} else {
		278	QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
		279	if ( gen == "male" ) {
		280	static bool setDefaultImageMale = false;
		281	if ( !setDefaultImageMale ) {
		282	QMimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) );
		283	setDefaultImageMale = true;
		284	}
		285	picString = "<img src=\"MaleIcon\" width=\"64\" height=\"64\">";
		286
		287	} else if ( gen == "female" ) {
		288	static bool setDefaultImageFemale = false;
		289	if ( !setDefaultImageFemale ) {
		290	QMimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) );
		291	setDefaultImageFemale = true;
		292	}
		293	picString = "<img src=\"FemaleIcon\" width=\"64\" height=\"64\">";
		294
		295	} else {
		296	static bool setDefaultImage = false;
		297	if ( !setDefaultImage ) {
		298	qDebug("Setting default pixmap ");
		299	QMimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) );
		300	setDefaultImage = true;
		301	}
		302	picString = "<img src=\"defaultIcon\" width=\"64\" height=\"64\">";
		303	}
267	}	304	}
268	picString = "<img src=\"defaultPenguin\" width=\"64\" height=\"64\">";
269	}	305	}
270	}	306	}
271	mText = QString::fromLatin1(	307	mText = QString::fromLatin1(
272	"<html>"	308	"<html>"
273	"<body text=\"%1\" bgcolor=\"%2\">" // text and background color	309	"<body text=\"%1\" bgcolor=\"%2\">" // text and background color
274	"<table>"	310	"<table>"
275	"<tr>"	311	"<tr>"
276	"<td rowspan=\"3\" align=\"right\" valign=\"top\">"	312	"<td rowspan=\"3\" align=\"right\" valign=\"top\">"