5 files changed, 40 insertions, 7 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index d8f8323..e53127c 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -27,4 +27,7 @@ KA/Pi:
 Added the possibility to in/exclude public/private/confidential contacts to a filter.
 If you have already defined filterrules in KA/Pi you have to adjust them all by setting the "include public/private/confidential" property manually. Sorry for that ...
+Added printing of card view and details view on desktop.
+Printing of list view is not working...
+Added button for removing pictures in contact editor.
  
 
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index ae67968..9ea9d04 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -42,5 +42,5 @@ AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) :
     QString name = addressee.familyName()+", "+ addressee.givenName();
     if ( name.length() == 2 )
-        name = addressee.realName();
+        name = addressee.organization();
     setText( Name,name);
     setText( Email, addressee.preferredEmail() );
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index c6993e9..bd32859 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -999,4 +999,14 @@ void AddresseeEditorWidget::load()
   mFormattedNameLabel->setText( mAddressee.formattedName() );
 
+  mAConfig->setUid( mAddressee.uid() );
+  if ( mAConfig->automaticNameParsing() ) {
+      mNameLabel->hide();
+      mNameEdit->show();
+  } else {
+      mNameEdit->hide();
+      mNameLabel->setText( mNameEdit->text() );
+      mNameLabel->show();
+  }
+
   mRoleEdit->setText( mAddressee.role() );
   mOrgEdit->setText( mAddressee.organization() );
@@ -1206,7 +1216,7 @@ void AddresseeEditorWidget::nameTextChanged( const QString &text )
     }
   }
-
   nameBoxChanged();
 
+ 
   emitModified();
 }
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 48370e3..9ee4eac 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -42,4 +42,5 @@
 #include <qlayout.h>
 #include <qpixmap.h>
+#include <qpushbutton.h>
 #include <qapplication.h>
 
@@ -53,5 +54,5 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
 
   QGroupBox *photoBox = new QGroupBox( 0, Qt::Vertical, i18n( "Photo" ), this );
-  QGridLayout *boxLayout = new QGridLayout( photoBox->layout(), 3, 2,
+  QGridLayout *boxLayout = new QGridLayout( photoBox->layout(), 4, 2,
                                             KDialog::spacingHint() );
   boxLayout->setRowStretch( 2, 1 );
@@ -64,5 +65,5 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
   mPhotoLabel->setScaledContents( true );
   mPhotoLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken );
-  boxLayout->addMultiCellWidget( mPhotoLabel, 0, 2, 0, 0 );
+  boxLayout->addMultiCellWidget( mPhotoLabel, 0, 3, 0, 0 );
 
   mPhotoUrl = new KURLRequester( photoBox );
@@ -80,8 +81,13 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
   boxLayout->addWidget( mUsePhotoUrl, 1, 1 );
 
+  QPushButton * pb = new QPushButton( i18n( "Remove" ), photoBox );
+  connect( pb, SIGNAL( clicked() ),this, SLOT( removePhoto() ) );
+  boxLayout->addWidget( pb, 2, 1 );
+  boxLayout->addWidget( new QLabel(  photoBox ), 3, 1 );
+
   topLayout->addWidget( photoBox, 0, 0 );
 
   QGroupBox *logoBox = new QGroupBox( 0, Qt::Vertical, i18n( "Logo" ), this );
-  boxLayout = new QGridLayout( logoBox->layout(), 3, 2, KDialog::spacingHint() );
+  boxLayout = new QGridLayout( logoBox->layout(), 4, 2, KDialog::spacingHint() );
   boxLayout->setRowStretch( 2, 1 );
 
@@ -90,5 +96,5 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
   mLogoLabel->setScaledContents( true );
   mLogoLabel->setFrameStyle( QFrame::Panel | QFrame::Sunken );
-  boxLayout->addMultiCellWidget( mLogoLabel, 0, 2, 0, 0 );
+  boxLayout->addMultiCellWidget( mLogoLabel, 0, 3, 0, 0 );
 
   mLogoUrl = new KURLRequester( logoBox );
@@ -104,4 +110,8 @@ ImageWidget::ImageWidget( QWidget *parent, const char *name )
   boxLayout->addWidget( mUseLogoUrl, 1, 1 );
 
+   pb = new QPushButton( i18n( "Remove" ), logoBox );
+  connect( pb, SIGNAL( clicked() ),this, SLOT( removeLogo() ) );
+  boxLayout->addWidget( pb, 2, 1 );
+  boxLayout->addWidget( new QLabel(  logoBox ), 3, 1 );
   topLayout->addWidget( logoBox, 1, 0 );
 
@@ -239,7 +249,15 @@ KABC::Picture ImageWidget::logo() const
     }
   }
-
   return logo;
 }
+void ImageWidget::removePhoto()
+{
+    setPhoto(KABC::Picture() );
+}
+
+void ImageWidget::removeLogo()
+{
+    setLogo(KABC::Picture() );
+}
 
 void ImageWidget::loadPhoto()
diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h
index b3ca0bd..afb9aa7 100644
--- a/kaddressbook/imagewidget.h
+++ b/kaddressbook/imagewidget.h
@@ -70,4 +70,6 @@ class ImageWidget : public QWidget
     void loadPhoto();
     void loadLogo();
+    void removePhoto();
+    void removeLogo();
     void updateGUI();