summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-08-17 23:32:26 (UTC)
committer zautrix <zautrix>2005-08-17 23:32:26 (UTC)
commit9de953866db87933c9773b98502f07ac408c8ef7 (patch) (side-by-side diff)
tree34a7ce77ad554c69fb13102b22dcdfcf0178f078
parenta685e90ea183cba87e852d6f6272e54704034347 (diff)
downloadkdepimpi-9de953866db87933c9773b98502f07ac408c8ef7.zip
kdepimpi-9de953866db87933c9773b98502f07ac408c8ef7.tar.gz
kdepimpi-9de953866db87933c9773b98502f07ac408c8ef7.tar.bz2
fix picture kapi
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt4
-rw-r--r--kabc/addresseeview.cpp28
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
@@ -14,6 +14,10 @@ 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 ************
diff --git a/kabc/addresseeview.cpp b/kabc/addresseeview.cpp
index f3cfb23..05d604f 100644
--- a/kabc/addresseeview.cpp
+++ b/kabc/addresseeview.cpp
@@ -390,6 +390,7 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
mText = "";
QString picString = "";
KABC::Picture picture = mAddressee.photo();
+ if (picture.undefined() ) picture = mAddressee.logo();
bool picAvailintern = false;
bool picAvailUrl = false;
if (! picture.undefined() ) {
@@ -400,9 +401,34 @@ void AddresseeView::setAddressee( const KABC::Addressee& mAddressee )
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;