fix picture kapi

2 files changed, 31 insertions, 1 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index d75ff7e..013c3f8 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,34 +1,38 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.2.1 ************
 
 KO/Pi:
 Fixed a problem displaying very long allday events in agenda view in single day mode.
 Fixed a problem with the default settings for new todos.
 Added an error message dialog if saving of calendar files is not possible.
 Made it impossible to close KO/Pi if saving fails.
 Fixed a problem adding calendars on windows such that these calendars can be used on the memory stick.
 Added config options for conflict detection.
 
 KA/Pi:
 Added a config option to turn on asking before a contact is deleted.
 Fixed a problem with the default view and view selection at startup.
 Formatted name is now set on import, if formatted name is empty.
+Fixed a problem of displaying images in the contact details view:
+Now the wid/hei ratio is not changed. 
+I a picture is larger than 128 pixels in wid or hei it is downscaled to
+max 128 pixels wid/hei.
 
 ********** VERSION 2.2.0 ************
 
 New stable release!
 Fixed some minor usability problems.
 Added writing of next alarm to a file for usage on pdaXrom.
 
 
 *************************************
 
 You can find the complete changelog 
 from version 1.7.7 to  2.2.0 
 in the source package or on 
 
 http://www.pi-sync.net/html/changelog.html
 
 
 
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index f3cfb23..05d604f 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -369,61 +369,87 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
       notes = QString(
             "<tr><td align=\"right\"><b>%1</b></td>"
            "<td align=\"left\"><a href=\"allDetails\">%4</a></td></tr>" )
           .arg( i18n("Details") )
           .arg( i18n("Show!") );
 
 
   }
 
   QString aRole = "";
   QString aOrga = "";
   if ( true /*!mAddressee.role().isEmpty()*/ ) {
       aRole = "<tr>"
           "<td align=\"left\">" + mAddressee.role() + "</td>"
           "</tr>";
   }
   if ( true /*!mAddressee.organization().isEmpty()*/ ) {
       aOrga = "<tr>"
           "<td align=\"left\">" + mAddressee.organization() + "</td>" 
           "</tr>";
   }
   mText = "";
   QString picString = "";
   KABC::Picture picture = mAddressee.photo();
+  if (picture.undefined() ) picture = mAddressee.logo();
   bool picAvailintern = false;
   bool picAvailUrl = false;
   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() );
+          int wid = picture.data().width();
+          int hei = picture.data().height();  
+          if ( wid > 128 || hei > 128 ) {
+              if ( wid > hei ) {
+                  hei = (hei*128)/wid;
+                  wid = 128;
+              } else {
+                  wid = (wid*128)/hei;
+                  hei = 128;
+              }
+          }
+          picString =  QString("<img src=\"myimage\" width=\"%1\" height=\"%2\">").arg(wid).arg(hei);
       } else {
           if ( picAvailUrl ) {
-              QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", QPixmap( picture.url() ));
+              QPixmap picPix( picture.url() );
+              QMimeSourceFactory::defaultFactory()->setPixmap( "myimage", picPix );
+              int wid = picPix.width();
+              int hei = picPix.height();
+              if ( wid > 128 || hei > 128 ) {
+                  if ( wid > hei ) {
+                      hei = (hei*128)/wid;
+                      wid = 128;
+                  } else {
+                      wid = (wid*128)/hei;
+                      hei = 128;
+                  }
+              }
+              picString =  QString("<img src=\"myimage\" width=\"%1\" height=\"%2\">").arg(wid).arg(hei);
           } 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;
                   }