1 files changed, 1 insertions, 1 deletions
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index aa96210..9118c3d 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -250,97 +250,97 @@ 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 ");
+                          //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\">";
                  }
              }
          }
      }
    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>"
  "%5"  // role
  "%6"  // organization
  "<td colspan=\"2\">&nbsp;</td>"
  "%7"  // dynamic part
  "%8"  // notes
  "</table>"
  "</body>"
  "</html>")
 //US
  .arg( /*KGlobalSettings::textColor().name()*/ "black" )
 //US
  .arg( /*KGlobalSettings::baseColor().name()*/ "white" )
  .arg( picString )
  .arg( name )
  .arg( aRole )
  .arg( aOrga )
  .arg( dynamicPart )
  .arg( notes );
  } else { // no picture!
 mText = "<table width=\"100%\">\n";
    //mText += "<tr bgcolor=\"#3679AD\"><td><h2>";
 #ifdef DESKTOP_VERSION
    mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>";
    mText += "<font color=\"#FFFFFF\">" + name +"</font></h1>";
 #else
    mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h3>";
    mText += "<font color=\"#FFFFFF\"> " + name +"</font></h3>";
 #endif

diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp index aa96210..9118c3d 100644 --- a/kabc/addresseeview.cpp +++ b/kabc/addresseeview.cpp
@@ -250,97 +250,97 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
250	if (! picture.undefined() ) {	250	if (! picture.undefined() ) {
251	picAvailintern = (picture.isIntern() && !picture.data().isNull());	251	picAvailintern = (picture.isIntern() && !picture.data().isNull());
252	picAvailUrl = !picture.isIntern() && QFile::exists(picture.url() );	252	picAvailUrl = !picture.isIntern() && QFile::exists(picture.url() );
253	}	253	}
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	if ( !mAddressee.custom( "KADDRESSBOOK", "X-Children" ).isEmpty() ) {	262	if ( !mAddressee.custom( "KADDRESSBOOK", "X-Children" ).isEmpty() ) {
263	static bool setDefaultImageChildren = false;	263	static bool setDefaultImageChildren = false;
264	if ( !setDefaultImageChildren ) {	264	if ( !setDefaultImageChildren ) {
265	QMimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) );	265	QMimeSourceFactory::defaultFactory()->setPixmap( "familyIcon", KGlobal::iconLoader()->loadIcon( "ic_kids", KIcon::Desktop, 128 ) );
266	setDefaultImageChildren = true;	266	setDefaultImageChildren = true;
267	}	267	}
268	picString = "<img src=\"familyIcon\" width=\"64\" height=\"64\">";	268	picString = "<img src=\"familyIcon\" width=\"64\" height=\"64\">";
269		269
270	} else if ( !mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ).isEmpty() ) {	270	} else if ( !mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ).isEmpty() ) {
271	static bool setDefaultImagepouses = false;	271	static bool setDefaultImagepouses = false;
272	if ( !setDefaultImagepouses ) {	272	if ( !setDefaultImagepouses ) {
273	QMimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) );	273	QMimeSourceFactory::defaultFactory()->setPixmap( "SpousesIcon", KGlobal::iconLoader()->loadIcon( "ic_family", KIcon::Desktop, 128 ) );
274	setDefaultImagepouses = true;	274	setDefaultImagepouses = true;
275	}	275	}
276	picString = "<img src=\"SpousesIcon\" width=\"64\" height=\"64\">";	276	picString = "<img src=\"SpousesIcon\" width=\"64\" height=\"64\">";
277	} else {	277	} else {
278	QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );	278	QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
279	if ( gen == "male" ) {	279	if ( gen == "male" ) {
280	static bool setDefaultImageMale = false;	280	static bool setDefaultImageMale = false;
281	if ( !setDefaultImageMale ) {	281	if ( !setDefaultImageMale ) {
282	QMimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) );	282	QMimeSourceFactory::defaultFactory()->setPixmap( "MaleIcon", KGlobal::iconLoader()->loadIcon( "ic_male", KIcon::Desktop, 128 ) );
283	setDefaultImageMale = true;	283	setDefaultImageMale = true;
284	}	284	}
285	picString = "<img src=\"MaleIcon\" width=\"64\" height=\"64\">";	285	picString = "<img src=\"MaleIcon\" width=\"64\" height=\"64\">";
286		286
287	} else if ( gen == "female" ) {	287	} else if ( gen == "female" ) {
288	static bool setDefaultImageFemale = false;	288	static bool setDefaultImageFemale = false;
289	if ( !setDefaultImageFemale ) {	289	if ( !setDefaultImageFemale ) {
290	QMimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) );	290	QMimeSourceFactory::defaultFactory()->setPixmap( "FemaleIcon", KGlobal::iconLoader()->loadIcon( "ic_female", KIcon::Desktop, 128 ) );
291	setDefaultImageFemale = true;	291	setDefaultImageFemale = true;
292	}	292	}
293	picString = "<img src=\"FemaleIcon\" width=\"64\" height=\"64\">";	293	picString = "<img src=\"FemaleIcon\" width=\"64\" height=\"64\">";
294		294
295	} else {	295	} else {
296	static bool setDefaultImage = false;	296	static bool setDefaultImage = false;
297	if ( !setDefaultImage ) {	297	if ( !setDefaultImage ) {
298	qDebug("Setting default pixmap ");	298	//qDebug("Setting default pixmap ");
299	QMimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) );	299	QMimeSourceFactory::defaultFactory()->setPixmap( "defaultIcon", KGlobal::iconLoader()->loadIcon( "ic_penguin", KIcon::Desktop, 128 ) );
300	setDefaultImage = true;	300	setDefaultImage = true;
301	}	301	}
302	picString = "<img src=\"defaultIcon\" width=\"64\" height=\"64\">";	302	picString = "<img src=\"defaultIcon\" width=\"64\" height=\"64\">";
303	}	303	}
304	}	304	}
305	}	305	}
306	}	306	}
307	mText = QString::fromLatin1(	307	mText = QString::fromLatin1(
308	"<html>"	308	"<html>"
309	"<body text=\"%1\" bgcolor=\"%2\">" // text and background color	309	"<body text=\"%1\" bgcolor=\"%2\">" // text and background color
310	"<table>"	310	"<table>"
311	"<tr>"	311	"<tr>"
312	"<td rowspan=\"3\" align=\"right\" valign=\"top\">"	312	"<td rowspan=\"3\" align=\"right\" valign=\"top\">"
313	"%3"	313	"%3"
314	"</td>"	314	"</td>"
315	"<td align=\"left\"><font size=\"+2\"><b>%4</b></font></td>" // name	315	"<td align=\"left\"><font size=\"+2\"><b>%4</b></font></td>" // name
316	"</tr>"	316	"</tr>"
317	"%5" // role	317	"%5" // role
318	"%6" // organization	318	"%6" // organization
319	"<td colspan=\"2\"> </td>"	319	"<td colspan=\"2\"> </td>"
320	"%7" // dynamic part	320	"%7" // dynamic part
321	"%8" // notes	321	"%8" // notes
322	"</table>"	322	"</table>"
323	"</body>"	323	"</body>"
324	"</html>")	324	"</html>")
325	//US	325	//US
326	.arg( /KGlobalSettings::textColor().name()/ "black" )	326	.arg( /KGlobalSettings::textColor().name()/ "black" )
327	//US	327	//US
328	.arg( /KGlobalSettings::baseColor().name()/ "white" )	328	.arg( /KGlobalSettings::baseColor().name()/ "white" )
329	.arg( picString )	329	.arg( picString )
330	.arg( name )	330	.arg( name )
331	.arg( aRole )	331	.arg( aRole )
332	.arg( aOrga )	332	.arg( aOrga )
333	.arg( dynamicPart )	333	.arg( dynamicPart )
334	.arg( notes );	334	.arg( notes );
335		335
336	} else { // no picture!	336	} else { // no picture!
337		337
338	mText = "<table width=\"100%\">\n";	338	mText = "<table width=\"100%\">\n";
339	//mText += "<tr bgcolor=\"#3679AD\"><td><h2>";	339	//mText += "<tr bgcolor=\"#3679AD\"><td><h2>";
340	#ifdef DESKTOP_VERSION	340	#ifdef DESKTOP_VERSION
341	mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>";	341	mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h1>";
342	mText += "<font color=\"#FFFFFF\">" + name +"</font></h1>";	342	mText += "<font color=\"#FFFFFF\">" + name +"</font></h1>";
343	#else	343	#else
344	mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h3>";	344	mText += "<tr bgcolor=\"#5699CD\"><td align=\"left\"><h3>";
345	mText += "<font color=\"#FFFFFF\"> " + name +"</font></h3>";	345	mText += "<font color=\"#FFFFFF\"> " + name +"</font></h3>";
346	#endif	346	#endif