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
@@ -1,156 +1,159 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 1.9.18 ************
 
 FYI: The VERSION 1.9.17 was a testing release only.
 Please read the changelog of VERSION 1.9.17 as well.
 
 Cleaned up the syncing config dialog.
 Added sync config options for date range for events.
 Added sync config options for filters on incoming data.
 Added sync config options for filters on outgoing data.
 Please read the updated SyncHowTo about the new filter settings.
 These filter settings make it now possible to sync with shared
 calendars without writing back private or confidential data
 (via the outgoing filters).
 To sync only with particular parts of a shared calendar, 
 the incoming filter settings can be used.
 An example can be found in the SyncHowTo.
 
 KO/Pi:
 The timeedit input has a pulldown list for times.
 If opened, this pulldown list should now has the right time highlighted.
 Added the possibility to exclude events/todos/journals in a filter.
 You should exclude journals, if you do not want them to sync with a  public calendar.
 
 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.
  
 
 ********** VERSION 1.9.17 ************
 
 KO/Pi:
 Fixed that tooltips were not updated after moving an item in agenda view.
 Fixed a bug in sorting start date for recurring events in list view.
 Changed the left button in todo viewer from "Agenda" to "Set completed".
 This makes it possible to change a todo in the What's Next View quickly to the completed state without leaving the What's Next View.
 Added more info in the todo viewer: Startdate, parent/sub todos.
  
 
 KA/Pi:
 All fields search does now actually search all the (possible) fields, 
 not only those listed in the contact list.
 Made is possible to inline a picture in a vcard on the Z.
 This was only possible on the desktop, now is it possible on the Z as well.
 Fixed of missing save settings after filter configuration.
 Made saving of addressbook much faster.
 Fixed extension widget layout problem.
 Fixed saving of default formatted name settings.
 Fixed formatted name handling in edit dialog.
 Added an option for changing formatted names of many contacts
 (menu: File - Change - Set formatted name).
 
 QWhatsThis was not working on the Z ( only black rectangle was shown).
 This is Fixed.
 
 KDE-Sync:
 Now readonly KDE resources are synced as well.
 (They are not changed in KDE itself, of course).
 
  
 
 ********** VERSION 1.9.16 ************
 
 KO/Pi:
 Fixed search dialog size on Z 6000 (480x640 display).
 Added setting to hide/show time in agenda items.
 Added setting to hide not running todos in todo view.
 Added columns for start date/time in todo view.
 Replaced the solid half-hour lines in agenda view by dot lines.
 Added possibility of printing the What's Next View on the desktop
 (i.e. Windows and Linux).
 Fixed a crash in KO/Pi when starting KO/Pi with What's Next view.
 Added tooltips in month view.(Tooltips only available on desktop)
 
 Fixed a strange problem in KO/Pi alarm applet.
 Did not find the actual problem, 
 such that now Qtopia reboots again if deinstalling the alarm applet.
 But the alarm applet should work again.
 
 KA/Pi:
 Fixed the problem, that internal pictures were not saved.
 
 Fixed a problem in the pi-sync mode by increasing the timeout for data transfer from 20 seconds to 5 minutes.
 
 Fixed some minor problems. (Like word wrap in help text windows).
 
 Fixed a compiling problem in microkde/kresources.
 
 KO/Pi is using zdbat (renamed to db2file) for syncing with Sharp DTM.
 This version now includes zdbat 1.0.0 (old version was zdbat 0.2.9)
 such that now syncing KO/Pi with Sharp DTM should work on the 
 Zaurus C 3000 model.
 
 ********** VERSION 1.9.15 ************
 
 Usebilty enhancements in KO/Pi:
 When clicking on the date in a month view cell, the day view is shown.
 Old behaviour was, that the "new event" dialog popped up.
 
 Added a one step "undo delete" in KO/Pi (Accessable in the "Action" menu). 
 That means, you can restore the latest
 event/todo/journal you have deleted.
 A journal is deleted, if you clear all the text of the journal.
 
 Fixed the bug of the editor dialogs in KO/Pi of version 1.9.14.
 
 KA/Pi  starting in 480x640 resolution:
 Hide the filter action in toolbar
 and added icons for undo/delete/redo in toolbar.
 
 Change in OM/Pi ViewMail dialog:
 When clicking on the "delete" icon the mail is deleted after confirmation as usual. 
 But the edit dialog is not closed as before, now the next mail in the folder is shown automatically (if there is any).
 
 Fixed a crash when deleting mail-accounts in OM/Pi.
 
 
 ********** VERSION 1.9.14 ************
 
 Fixed some problems with the dialog sizes when switching 
 portrait/landscape mode on 640x480 PDA display.
 
 Fixed some other small bugs in KA/Pi KO/Pi and OM/Pi and PwM/Pi.
 
 Fixed an ugly bug in KOpieMail: 
 KOpieMail was not able to write files (mails) to MSDOS file system, 
 like on an usual preformatted SD card. That should work now.
 To save your mail data on the Sd card do the following:
 Create a dir on the SD card:
 mkdir /mnt/card/localmail
 Go to your home dir:
 cd
 Go to kopiemail data storage dir:
 cd kdepim/apps/kopiemail
 Create a symlink to the SD card:
 ls -s /mnt/card/localmail
 Now KOpieMail will store all mails on the SD card.
 
 KO/Pi Monthview:
 Now "Go to Today" selects the current month from day 1-end,
 not the current date + some days.
 I.e. "Go to Today" shows now always
 the current month with first day of month in the first row. 
 
 Added missing German translation.
 
 Fixed icons of executeable on Wintendo.
 
 Added a "Show next Mail" button to the OM/Pi 
 mail viewer such that the mail below the current mail
 in the mail list view of the current folder
 can be read with a single click.
 
 
 ********** VERSION 1.9.13 ************
diff --git a/kabc/addresseedialog.cpp b/kabc/addresseedialog.cpp
index ae67968..9ea9d04 100644
--- a/kabc/addresseedialog.cpp
+++ b/kabc/addresseedialog.cpp
@@ -1,172 +1,172 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qlayout.h>
 #include <qpushbutton.h>
 #include <qgroupbox.h>
 #include <qapplication.h>
 #include <qregexp.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
 
 #include "stdaddressbook.h"
 
 #include "addresseedialog.h"
 //#include "addresseedialog.moc"
 
 using namespace KABC;
 
 AddresseeItem::AddresseeItem( QListView *parent, const Addressee &addressee ) :
   QListViewItem( parent ),
   mAddressee( addressee )
 {
     QString name = addressee.familyName()+", "+ addressee.givenName();
     if ( name.length() == 2 )
-        name = addressee.realName();
+        name = addressee.organization();
     setText( Name,name);
     setText( Email, addressee.preferredEmail() );
 }
 
 QString AddresseeItem::key( int column, bool ) const
 {
 
   if (column == Email) {
     QString value = text(Email);
     int val = value.findRev("@");
     return value.mid( val) + value.left( val );
   }
   return text(column).lower();
 }
 
 AddresseeDialog::AddresseeDialog( QWidget *parent, bool multiple ) :
   KDialogBase( KDialogBase::Plain, i18n("Select Addressee"),
                Ok|Cancel, Ok, parent ), mMultiple( multiple )
 {
   QWidget *topWidget = plainPage();
 
   QBoxLayout *topLayout = new QHBoxLayout( topWidget );
   QBoxLayout *listLayout = new QVBoxLayout;
   topLayout->addLayout( listLayout );
 
   mAddresseeList = new KListView( topWidget );
   mAddresseeList->addColumn( i18n("Name") );
   mAddresseeList->addColumn( i18n("Email") );
   mAddresseeList->setAllColumnsShowFocus( true );
   mAddresseeList->setFullWidth( true );
   listLayout->addWidget( mAddresseeList );
   connect( mAddresseeList, SIGNAL( doubleClicked( QListViewItem * ) ),
            SLOT( slotOk() ) );
 
   mAddresseeEdit = new QLineEdit( topWidget );
   connect( mAddresseeEdit, SIGNAL( returnPressed() ),
            SLOT( loadAddressBook() ) );
   mAddresseeEdit->setFocus();
  
   listLayout->addWidget( mAddresseeEdit );
 
   if ( mMultiple ) {
     QBoxLayout *selectedLayout = new QVBoxLayout;
     topLayout->addLayout( selectedLayout );
     topLayout->setSpacing( spacingHint() );
 
     QGroupBox *selectedGroup = new QGroupBox( 1, Horizontal, i18n("Selected"),
                                               topWidget );
     selectedLayout->addWidget( selectedGroup );
 
     mSelectedList = new KListView( selectedGroup );
     mSelectedList->addColumn( i18n("Name") );
     mSelectedList->addColumn( i18n("Email") );
     mSelectedList->setAllColumnsShowFocus( true );
     mSelectedList->setFullWidth( true );
     connect( mSelectedList, SIGNAL( doubleClicked( QListViewItem * ) ),
              SLOT( removeSelected() ) );
 
     QPushButton *unselectButton = new QPushButton( i18n("Unselect"), selectedGroup ); 
     connect ( unselectButton, SIGNAL( clicked() ), SLOT( removeSelected() ) );
 
     connect( mAddresseeList, SIGNAL( clicked( QListViewItem * ) ),
              SLOT( addSelected( QListViewItem * ) ) );
     connect( mAddresseeList, SIGNAL( returnPressed( QListViewItem * ) ),
              SLOT( selectNextItem( QListViewItem * ) ) );
 
   }
 
   mAddressBook = StdAddressBook::self( true );
   connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
            SLOT( addressBookChanged() ) );
   connect( mAddressBook, SIGNAL( loadingFinished( Resource* ) ),
            SLOT( addressBookChanged() ) );
 
   loadAddressBook();
 }
 
 AddresseeDialog::~AddresseeDialog()
 {
 }
 
 void AddresseeDialog::loadAddressBook()
 {
   mAddresseeList->clear();
   mItemDict.clear();
   if ( mAddresseeEdit->text().isEmpty() ) {
       AddressBook::Iterator it;
       for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
       if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
             continue; 
           new AddresseeItem( mAddresseeList, (*it) );
       }
       return;
   }
   //mAddresseeEdit->completionObject()->clear();
   QRegExp re;
   re.setWildcard(true); // most people understand these better.
   re.setCaseSensitive(false);
   re.setPattern( "*"+ mAddresseeEdit->text() + "*");
 
   AddressBook::Iterator it;
   for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
       if ( (*it).uid().left(2) == "la" && (*it).uid().left(19) == QString("last-syncAddressee-") )
             continue; 
       QString name = (*it).familyName()+", "+ (*it).givenName();
       if ( name.length() == 2 )
           name = (*it).realName();
       name += (*it).preferredEmail();
 #if QT_VERSION >= 300
       if (re.search(name) != -1)
 #else
       if (re.match(name) != -1)
 #endif
           AddresseeItem *item = new AddresseeItem( mAddresseeList, (*it) );
   }
 }
 
 void AddresseeDialog::addCompletionItem( const QString &str, QListViewItem *item )
 {
   if ( str.isEmpty() ) return;
 
   mItemDict.insert( str, item );
   //mAddresseeEdit->completionObject()->addItem( str );
 }
 
 void AddresseeDialog::selectItem( const QString &str )
 {
   if ( str.isEmpty() ) return;
diff --git a/kaddressbook/addresseeeditorwidget.cpp b/kaddressbook/addresseeeditorwidget.cpp
index c6993e9..bd32859 100644
--- a/kaddressbook/addresseeeditorwidget.cpp
+++ b/kaddressbook/addresseeeditorwidget.cpp
@@ -873,466 +873,476 @@ void AddresseeEditorWidget::setupTab3()
 {
   // This is the Misc tab
   QWidget *tab3 = new QWidget( mTabWidget );
 
   QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
   layout->setMargin( KDialogBase::marginHintSmall() );
   layout->setSpacing( KDialogBase::spacingHintSmall() );
 //US  layout->setColStretch( 2, 1 );
   
   //////////////////////////////////////
   // Geo
   mGeoWidget = new GeoWidget( tab3 );
   // mGeoWidget->setMinimumSize( mGeoWidget->sizeHint() );
   connect( mGeoWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mGeoWidget, 0, 0 );
 /*US
   //////////////////////////////////////
   // Sound
 #ifndef KAB_EMBEDDED    
   mSoundWidget = new SoundWidget( tab3 );
   mSoundWidget->setMinimumSize( mSoundWidget->sizeHint() );
   connect( mSoundWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mSoundWidget, 0, 1, Qt::AlignTop );
 #else //KAB_EMBEDDED    
 qDebug("AddresseeEditorWidget::setupTab2 sound part is not supported = has to be changed");
 #endif //KAB_EMBEDDED    
 
   //////////////////////////////////////
   // Images
   mImageWidget = new ImageWidget( tab3 );
   mImageWidget->setMinimumSize( mImageWidget->sizeHint() );
   connect( mImageWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mImageWidget, 1, 0, Qt::AlignTop );
 */
 //US  
 /*
   KSeparator* bar = new KSeparator( KSeparator::HLine, tab3 );
   layout->addMultiCellWidget( bar, 1, 1, 0, 0 );
 */ 
   //////////////////////////////////////
   // Keys
   mKeyWidget = new KeyWidget( tab3 );
   //mKeyWidget->setMinimumSize( mKeyWidget->sizeHint() );
   connect( mKeyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
 //US  layout->addWidget( mKeyWidget, 1, 1, Qt::AlignTop );
   layout->addWidget( mKeyWidget, 1, 0 );
 
   mTabWidget->addTab( tab3, i18n( "&Misc" ) );
 }
 
 void AddresseeEditorWidget::setupTab3_1()
 {
   // This is the Misc tab
   QWidget *tab3 = new QWidget( mTabWidget );
 
 //US  QGridLayout *layout = new QGridLayout( tab3, 2, 3 );
   QGridLayout *layout = new QGridLayout( tab3, 1, 1 );
   layout->setMargin( KDialogBase::marginHint() );
   layout->setSpacing( KDialogBase::spacingHint() );
 //US  layout->setColStretch( 2, 1 );
 
 /*US  
   //////////////////////////////////////
   // Geo
   mGeoWidget = new GeoWidget( tab3 );
   mGeoWidget->setMinimumSize( mGeoWidget->sizeHint() );
   connect( mGeoWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mGeoWidget, 0, 0, Qt::AlignTop );
 */
   //////////////////////////////////////
   // Sound
 #ifndef KAB_EMBEDDED    
   mSoundWidget = new SoundWidget( tab3 );
   mSoundWidget->setMinimumSize( mSoundWidget->sizeHint() );
   connect( mSoundWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mSoundWidget, 0, 1, Qt::AlignTop );
 #else //KAB_EMBEDDED    
 //US qDebug("AddresseeEditorWidget::setupTab2 sound part is not supported = has to be changed");
 #endif //KAB_EMBEDDED    
 
   //////////////////////////////////////
   // Images
   mImageWidget = new ImageWidget( tab3 );
   mImageWidget->setMinimumSize( mImageWidget->sizeHint() );
   connect( mImageWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mImageWidget, 0, 0, Qt::AlignTop );
 /*US
   //////////////////////////////////////
   // Keys
   mKeyWidget = new KeyWidget( tab3 );
   mKeyWidget->setMinimumSize( mKeyWidget->sizeHint() );
   connect( mKeyWidget, SIGNAL( changed() ), SLOT( emitModified() ) );
   layout->addWidget( mKeyWidget, 1, 1, Qt::AlignTop );
 */
   mTabWidget->addTab( tab3, i18n( "&Images" ) );
 }
 
     
 void AddresseeEditorWidget::load()
 {
 
   // Block signals in case anything tries to emit modified
   // CS: This doesn't seem to work.
   bool block = signalsBlocked();
   blockSignals( true ); 
   mBlockSignals = true; // used for internal signal blocking
 
   mNameEdit->setText( mAddressee.assembledName() );
   
   if ( mAddressee.formattedName().isEmpty() ) {
 //US    KConfig config( "kaddressbookrc" );
     KConfig config( locateLocal("config", "kabcrc") );
     config.setGroup( "General" );
     mFormattedNameType = config.readNumEntry( "FormattedNameType", 1 );
     mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
   } else {;
     if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::SimpleName ) )
       mFormattedNameType = NameEditDialog::SimpleName;
     else if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::FullName ) )
       mFormattedNameType = NameEditDialog::FullName;
     else if ( mAddressee.formattedName() == NameEditDialog::formattedName( mAddressee, NameEditDialog::ReverseName ) )
       mFormattedNameType = NameEditDialog::ReverseName;
     else
       mFormattedNameType = NameEditDialog::CustomName;
   }
 
   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() );
   
 //US  mURLEdit->setURL( mAddressee.url().url() );
   mURLEdit->setText( mAddressee.url().prettyURL() );
 //US??  mURLEdit->home( false );
   
   // mNoteEdit->setText( mAddressee.note() );
   mNoteEdit->setText( mAddressee.note() );
   mEmailWidget->setEmails( mAddressee.emails() );
   mPhoneEditWidget->setPhoneNumbers( mAddressee.phoneNumbers() );
   mAddressEditWidget->setAddresses( mAddressee, mAddressee.addresses() );
   mBirthdayPicker->setDate( mAddressee.birthday().date() );
 
 //US  mAnniversaryPicker->setDate( QDate::fromString( mAddressee.custom(
 //US                               "KADDRESSBOOK", "X-Anniversary" ), Qt::ISODate) );
   QDate dt = KGlobal::locale()->readDate( mAddressee.custom("KADDRESSBOOK", "X-Anniversary" ), 
                                                     "%Y-%m-%d");  // = Qt::ISODate
   mAnniversaryPicker->setDate( dt );
 
                                                               
   mNicknameEdit->setText( mAddressee.nickName() );
   mCategoryEdit->setText( mAddressee.categories().join( "," ) );
 
   mGeoWidget->setGeo( mAddressee.geo() );
   mImageWidget->setPhoto( mAddressee.photo() );
   mImageWidget->setLogo( mAddressee.logo() );
   mKeyWidget->setKeys( mAddressee.keys() );
   mSecrecyWidget->setSecrecy( mAddressee.secrecy() );
 #ifndef KAB_EMBEDDED    
   mSoundWidget->setSound( mAddressee.sound() );
 #else //KAB_EMBEDDED    
 //US qDebug("AddresseeEditorWidget::load has to be changed 2");
 #endif //KAB_EMBEDDED    
 
   // Load customs
   mIMAddressEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-IMAddress" ) );
   mSpouseEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-SpousesName" ) );
   mChildEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Children" ) );
   mManagerEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-ManagersName" ) );
   mAssistantEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-AssistantsName" ) );
   mDepartmentEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Department" ) );
   mOfficeEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Office" ) );
   mProfessionEdit->setText( mAddressee.custom( "KADDRESSBOOK", "X-Profession" ) );
   QString gen = mAddressee.custom( "KADDRESSBOOK", "X-Gender" );
   if ( gen == "female" )
       mGenderBox->setCurrentItem ( 1 ); 
   else if ( gen == "male" )
       mGenderBox->setCurrentItem ( 2 ); 
   else 
       mGenderBox->setCurrentItem ( 0 ); 
   blockSignals( block );
   mBlockSignals = false;
 
   mDirty = false;
 }
 
 void AddresseeEditorWidget::save()
 {
     if ( !dirty() ) {
             return;
     }
  
     mAddressee.setRevision( QDateTime::currentDateTime() ); 
  
   mAddressee.setRole( mRoleEdit->text() );
   mAddressee.setOrganization( mOrgEdit->text() );
   mAddressee.setUrl( KURL( mURLEdit->text() ) );
   mAddressee.setNote( mNoteEdit->text() );
   if ( mBirthdayPicker->inputIsValid() ) {
       QDate da = mBirthdayPicker->date();
       if ( da > QDate::currentDate() )
           da.setYMD(da.year()-100, da.month(), da.day() );
       mAddressee.setBirthday( QDateTime( da ) );
       //qDebug("bday %s ",da.toString().latin1());
   }
   else {
     mAddressee.setBirthday( QDateTime() );
     mBirthdayPicker->clear();
   }
   mAddressee.setNickName( mNicknameEdit->text() );
   mAddressee.setCategories( QStringList::split( ",", mCategoryEdit->text() ) );
 
   mAddressee.setGeo( mGeoWidget->geo() );
   mAddressee.setPhoto( mImageWidget->photo() );
   mAddressee.setLogo( mImageWidget->logo() );
   mAddressee.setKeys( mKeyWidget->keys() );
 #ifndef KAB_EMBEDDED    
   mAddressee.setSound( mSoundWidget->sound() );
 #else //KAB_EMBEDDED    
 //US qDebug("AddresseeEditorWidget::save sound not supported");
 #endif //KAB_EMBEDDED    
   mAddressee.setSecrecy( mSecrecyWidget->secrecy() );
 
   // save custom fields
   mAddressee.insertCustom( "KADDRESSBOOK", "X-IMAddress", mIMAddressEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-SpousesName", mSpouseEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-Children", mChildEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-ManagersName", mManagerEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", mAssistantEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-Department", mDepartmentEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-Office", mOfficeEdit->text() );
   mAddressee.insertCustom( "KADDRESSBOOK", "X-Profession", mProfessionEdit->text() );
   if ( mAnniversaryPicker->inputIsValid() ) {
     QString dt = KGlobal::locale()->formatDate(mAnniversaryPicker->date(), true, KLocale::ISODate);
     mAddressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
   }
   else {
     mAddressee.removeCustom( "KADDRESSBOOK", "X-Anniversary" );
     mAnniversaryPicker->clear();
   }
   int gen = mGenderBox->currentItem ();
   if ( gen == 1 )
     mAddressee.insertCustom( "KADDRESSBOOK", "X-Gender", "female");
   else if ( gen == 2 )
     mAddressee.insertCustom( "KADDRESSBOOK", "X-Gender", "male");
   else 
     mAddressee.removeCustom( "KADDRESSBOOK", "X-Gender" );
                       
   // Save the email addresses
   QStringList emails = mAddressee.emails();
   QStringList::Iterator iter;
   for ( iter = emails.begin(); iter != emails.end(); ++iter )
     mAddressee.removeEmail( *iter );
   
   emails = mEmailWidget->emails();
   bool first = true;
   for ( iter = emails.begin(); iter != emails.end(); ++iter ) {
     mAddressee.insertEmail( *iter, first );
     first = false;
   }
   
   // Save the phone numbers
   KABC::PhoneNumber::List phoneNumbers;
   KABC::PhoneNumber::List::Iterator phoneIter;
   phoneNumbers = mAddressee.phoneNumbers();
   for ( phoneIter = phoneNumbers.begin(); phoneIter != phoneNumbers.end();
         ++phoneIter )
     mAddressee.removePhoneNumber( *phoneIter );
     
   phoneNumbers = mPhoneEditWidget->phoneNumbers();
   for ( phoneIter = phoneNumbers.begin(); phoneIter != phoneNumbers.end();
         ++phoneIter )
     mAddressee.insertPhoneNumber( *phoneIter );
 
   // Save the addresses
   KABC::Address::List addresses;
   KABC::Address::List::Iterator addressIter;
   addresses = mAddressee.addresses();
   for ( addressIter = addresses.begin(); addressIter != addresses.end();
         ++addressIter )
     mAddressee.removeAddress( *addressIter );
     
   addresses = mAddressEditWidget->addresses();
   for ( addressIter = addresses.begin(); addressIter != addresses.end();
         ++addressIter )
     mAddressee.insertAddress( *addressIter );
   mDirty = false;
 }
 
 bool AddresseeEditorWidget::dirty()
 {
 
     if ( ! mDirty ) {
         if ( mBirthdayPicker->inputIsValid() ) {
             QDate da = mBirthdayPicker->date();
             if ( !(da ==  mAddressee.birthday().date()))
                 mDirty = true;
         }
         else {
             mBirthdayPicker->clear();
         }
         if ( mAnniversaryPicker->inputIsValid() ) {
             QDate da = mAnniversaryPicker->date();
             if ( da != KGlobal::locale()->readDate( mAddressee.custom("KADDRESSBOOK", "X-Anniversary" ), 
                                                     "%Y-%m-%d"))
                 mDirty = true;
         }
         else {
             mAnniversaryPicker->clear();
         }
     }
   return mDirty;
 }
 
 void AddresseeEditorWidget::nameTextChanged( const QString &text )
 {
     if ( mBlockSignals )
         return;
   // use the addressee class to parse the name for us
     mAConfig->setUid( mAddressee.uid() );
   if ( mAConfig->automaticNameParsing() ) {
     if ( !mAddressee.formattedName().isEmpty() ) {
          QString fn = mAddressee.formattedName();
         mAddressee.setNameFromString( text );
         mAddressee.setFormattedName( fn );
     } else {
       // use extra addressee to avoid a formatted name assignment
       Addressee addr;
       addr.setNameFromString( text );
       mAddressee.setPrefix( addr.prefix() );
       mAddressee.setGivenName( addr.givenName() );
       mAddressee.setAdditionalName( addr.additionalName() );
       mAddressee.setFamilyName( addr.familyName() );
       mAddressee.setSuffix( addr.suffix() );
     }
   }
-
   nameBoxChanged();
 
+ 
   emitModified();
 }
 
 void AddresseeEditorWidget::nameBoxChanged()
 {
   KABC::Addressee addr;
   mAConfig->setUid( mAddressee.uid() );
   if ( mAConfig->automaticNameParsing() ) {
     addr.setNameFromString( mNameEdit->text() );
     mNameLabel->hide();
     mNameEdit->show();
   } else {
     addr = mAddressee;
     mNameEdit->hide();
     mNameLabel->setText( mNameEdit->text() );
     mNameLabel->show();
   }
 
   if ( mFormattedNameType != NameEditDialog::CustomName ) {
     mFormattedNameLabel->setText( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
     mAddressee.setFormattedName( NameEditDialog::formattedName( mAddressee, mFormattedNameType ) );
   }
 }
 
 void AddresseeEditorWidget::nameButtonClicked()
 {
   // show the name dialog.
   NameEditDialog dialog( mAddressee, mFormattedNameType, this );
   
   if ( KApplication::execDialog( &dialog) ) {
     if ( dialog.changed() ) {
       mAddressee.setFamilyName( dialog.familyName() );
       mAddressee.setGivenName( dialog.givenName() );
       mAddressee.setPrefix( dialog.prefix() );
       mAddressee.setSuffix( dialog.suffix() );
       mAddressee.setAdditionalName( dialog.additionalName() );
       mFormattedNameType = dialog.formattedNameType();
       if ( mFormattedNameType == NameEditDialog::CustomName ) {
         mFormattedNameLabel->setText( dialog.customFormattedName() );
         mAddressee.setFormattedName( dialog.customFormattedName() );
       }
       // Update the name edit.
       bool block = mNameEdit->signalsBlocked();
       mNameEdit->blockSignals( true );
       mNameEdit->setText( mAddressee.assembledName() );
       mNameEdit->blockSignals( block );
 
       // Update the combo box.
       nameBoxChanged();
     
       emitModified();
     }
   }
 }
 
 void AddresseeEditorWidget::categoryButtonClicked()
 {
   // Show the category dialog
   if ( mCategoryDialog == 0 ) {
     mCategoryDialog = new KPIM::CategorySelectDialog( KABPrefs::instance(), this );
     connect( mCategoryDialog, SIGNAL( categoriesSelected( const QStringList& ) ),
              SLOT(categoriesSelected( const QStringList& ) ) );
     connect( mCategoryDialog, SIGNAL( editCategories() ), SLOT( editCategories() ) );
   }
 
   mCategoryDialog->setCategories();
   mCategoryDialog->setSelected( QStringList::split( ",", mCategoryEdit->text() ) );
   mCategoryDialog->show();
   mCategoryDialog->raise();
 }
 
 void AddresseeEditorWidget::categoriesSelected( const QStringList &list )
 {
   mCategoryEdit->setText( list.join( "," ) );
 }
 
 void AddresseeEditorWidget::editCategories()
 {
   if ( mCategoryEditDialog == 0 ) {
     mCategoryEditDialog = new KPIM::CategoryEditDialog( KABPrefs::instance(), this );
     connect( mCategoryEditDialog, SIGNAL( categoryConfigChanged() ),
              SLOT( categoryButtonClicked() ) );
   }
   
   mCategoryEditDialog->show();
   mCategoryEditDialog->raise();
 }
 
 void AddresseeEditorWidget::emitModified()
 {
   mDirty = true;
 
   KABC::Addressee::List list;
 
   if ( mIsExtension && !mBlockSignals ) {
     save();
     list.append( mAddressee );
   }
 
   emit modified( list );
 }
 
 void AddresseeEditorWidget::dateChanged( QDate )
 {
   emitModified();
 }
 
 //US invalid dates are handdled by the KDateEdit widget itself
 void AddresseeEditorWidget::invalidDate()
 {
   KMessageBox::sorry( this, i18n( "You must specify a valid date" ) );
 }
 
 
 void AddresseeEditorWidget::pageChanged( QWidget *wdg )
 {
 #ifndef KAB_EMBEDDED    
   if ( wdg )
     KAcceleratorManager::manage( wdg );
 #else //KAB_EMBEDDED    
 //US 
 #endif //KAB_EMBEDDED    
     
 }
 
 QString AddresseeEditorWidget::title() const
 {
   return i18n( "Contact Editor" );
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 48370e3..9ee4eac 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -1,294 +1,312 @@
 /*                                                                      
     This file is part of KAddressBook.                                  
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>                   
                                                                         
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or   
     (at your option) any later version.                                 
                                                                         
     This program is distributed in the hope that it will be useful,     
     but WITHOUT ANY WARRANTY; without even the implied warranty of      
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
     GNU General Public License for more details.                        
                                                                         
     You should have received a copy of the GNU General Public License   
     along with this program; if not, write to the Free Software         
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <kabc/picture.h>
 
 #ifndef KAB_EMBEDDED
 #include <kaccelmanager.h>
 #include <kio/netaccess.h>
 #include <kimageio.h>
 #endif //KAB_EMBEDDED
 
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kurlrequester.h>
 #include <kurl.h>
 
 #include <qcheckbox.h>
 #include <qgroupbox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qpixmap.h>
+#include <qpushbutton.h>
 #include <qapplication.h>
 
 #include "imagewidget.h"
 
 ImageWidget::ImageWidget( QWidget *parent, const char *name )
   : QWidget( parent, name )
 {
   QGridLayout *topLayout = new QGridLayout( this, 2, 1, KDialog::marginHint(),
                                             KDialog::spacingHint() );
 
   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 );
 
   mPhotoLabel = new QLabel( photoBox );
   int fac = 9;
   if ( QApplication::desktop()->width() > 320 )
       fac = 6;
   mPhotoLabel->setFixedSize( 50*9/fac, 70*9/fac );
   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 );
 #ifndef KAB_EMBEDDED  
   mPhotoUrl->setFilter( KImageIO::pattern() );
 #else //KAB_EMBEDDED  
 //US  qDebug("ImageWidget::ImageWidget KImageIO not defined. Does this harm ???");
 #endif //KAB_EMBEDDED  
   
   
   boxLayout->addWidget( mPhotoUrl, 0, 1 );
   
   mUsePhotoUrl = new QCheckBox( i18n( "Store as URL" ), photoBox );
   mUsePhotoUrl->setEnabled( false );
   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 );
 
   mLogoLabel = new QLabel( logoBox );
   mLogoLabel->setFixedSize( 50*9/fac, 70*9/fac );
   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 );
 #ifndef KAB_EMBEDDED  
   mLogoUrl->setFilter( KImageIO::pattern() );
 #else //KAB_EMBEDDED  
 //US  qDebug("ImageWidget::ImageWidget KImageIO not defined 2");
 #endif //KAB_EMBEDDED  
   boxLayout->addWidget( mLogoUrl, 0, 1 );
   
   mUseLogoUrl = new QCheckBox( i18n( "Store as URL" ), logoBox );
   mUseLogoUrl->setEnabled( false );
   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 );
 
   connect( mPhotoUrl, SIGNAL( textChanged( const QString& ) ),
            SIGNAL( changed() ) );
   connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ),
            SLOT( loadPhoto() ) );
   connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ),
            SIGNAL( changed() ) );
   connect( mPhotoUrl, SIGNAL( urlSelected( const QString& ) ),
            SLOT( updateGUI() ) );
   connect( mUsePhotoUrl, SIGNAL( toggled( bool ) ),
            SIGNAL( changed() ) );
 
   connect( mLogoUrl, SIGNAL( textChanged( const QString& ) ),
            SIGNAL( changed() ) );
   connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ),
            SLOT( loadLogo() ) );
   connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ),
            SIGNAL( changed() ) );
   connect( mLogoUrl, SIGNAL( urlSelected( const QString& ) ),
            SLOT( updateGUI() ) );
   connect( mUseLogoUrl, SIGNAL( toggled( bool ) ),
            SIGNAL( changed() ) );
 
 #ifndef KAB_EMBEDDED  
   KAcceleratorManager::manage( this );
 #endif //KAB_EMBEDDED  
 
 }
 
 ImageWidget::~ImageWidget()
 {
 }
 
 void ImageWidget::setPhoto( const KABC::Picture &photo )
 {
   bool blocked = signalsBlocked();
   blockSignals( true );
 
   if ( photo.isIntern() ) {
 //US   
 //US    mPhotoLabel->setPixmap( photo.data() );
     if (photo.data().isNull() != true)
     {
       QPixmap pm;
       pm.convertFromImage(photo.data()); 
 
       mPhotoLabel->setPixmap( pm );
     }
     
     mUsePhotoUrl->setChecked( false );
   } else {
     mPhotoUrl->setURL( photo.url() );
     if ( !photo.url().isEmpty() )
       mUsePhotoUrl->setChecked( true );
     loadPhoto();
   }
   
   blockSignals( blocked );
 }
 
 KABC::Picture ImageWidget::photo() const
 {
   KABC::Picture photo;
 
   if ( mUsePhotoUrl->isChecked() )
     photo.setUrl( mPhotoUrl->url() );
   else {
     QPixmap *px = mPhotoLabel->pixmap();
     if ( px ) {
 #ifndef KAB_EMBEDDED  
       if ( px->height() > px->width() )
         photo.setData( px->convertToImage().scaleHeight( 140 ) );
       else
         photo.setData( px->convertToImage().scaleWidth( 100 ) );
 #else //KAB_EMBEDDED  
 //US add teh nullcheck      
       if (px->isNull() != true )
         photo.setData( px->convertToImage() );
 #endif //KAB_EMBEDDED  
 
       photo.setType( "PNG" );
     }
   }
 
   return photo;
 }
 
 void ImageWidget::setLogo( const KABC::Picture &logo )
 {
   bool blocked = signalsBlocked();
   blockSignals( true );
 
   if ( logo.isIntern() ) {
 //US
 //US    mLogoLabel->setPixmap( logo.data() );
     if (logo.data().isNull() != true)
     {
       QPixmap pm;
       pm.convertFromImage(logo.data()); 
       mLogoLabel->setPixmap( pm );
     }
     mUseLogoUrl->setChecked( false );
   } else {
     mLogoUrl->setURL( logo.url() );
     if ( !logo.url().isEmpty() )
       mUseLogoUrl->setChecked( true );
     loadLogo();
   }
 
   blockSignals( blocked );
 }
 
 KABC::Picture ImageWidget::logo() const
 {
   KABC::Picture logo;
 
   if ( mUseLogoUrl->isChecked() )
     logo.setUrl( mLogoUrl->url() );
   else {
     QPixmap *px = mLogoLabel->pixmap();
     if ( px ) {
 #ifndef KAB_EMBEDDED  
       if ( px->height() > px->width() )
         logo.setData( px->convertToImage().scaleHeight( 140 ) );
       else
         logo.setData( px->convertToImage().scaleWidth( 100 ) );
 #else //KAB_EMBEDDED  
       logo.setData( px->convertToImage() );
 #endif //KAB_EMBEDDED  
 
       logo.setType( "PNG" );
       
     }
   }
-
   return logo;
 }
+void ImageWidget::removePhoto()
+{
+    setPhoto(KABC::Picture() );
+}
+
+void ImageWidget::removeLogo()
+{
+    setLogo(KABC::Picture() );
+}
 
 void ImageWidget::loadPhoto()
 {
   mPhotoLabel->setPixmap( loadPixmap( mPhotoUrl->url() ) );
 }
 
 void ImageWidget::loadLogo()
 {
   mLogoLabel->setPixmap( loadPixmap( mLogoUrl->url() ) );
 }
 
 void ImageWidget::updateGUI()
 {
   KURLRequester *ptr = (KURLRequester*)sender();
 
 
   if ( ptr == mPhotoUrl )
     mUsePhotoUrl->setEnabled( true );
   else if ( ptr == mLogoUrl )
     mUseLogoUrl->setEnabled( true );
 }
 
 QPixmap ImageWidget::loadPixmap( const KURL &url )
 {
   QString tempFile;
   QPixmap pixmap;
 
   if ( url.isEmpty() )
     return pixmap;
   
   if ( url.isLocalFile() )
     pixmap = QPixmap( url.path() );
   else
   {
 #ifndef KAB_EMBEDDED
     if ( KIO::NetAccess::download( url, tempFile ) ) {
       pixmap = QPixmap( tempFile );
     KIO::NetAccess::removeTempFile( tempFile );
     }
 #else //KAB_EMBEDDED
   qDebug("ImageWidget::loadPixmap : only local pixmaps are allowed");
 #endif //KAB_EMBEDDED
     
   }
 
   return pixmap;
 }
 
 #ifndef KAB_EMBEDDED
 #include "imagewidget.moc"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h
index b3ca0bd..afb9aa7 100644
--- a/kaddressbook/imagewidget.h
+++ b/kaddressbook/imagewidget.h
@@ -1,86 +1,88 @@
 /*                                                                      
     This file is part of KAddressBook.                                  
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>                   
                                                                         
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or   
     (at your option) any later version.                                 
                                                                         
     This program is distributed in the hope that it will be useful,     
     but WITHOUT ANY WARRANTY; without even the implied warranty of      
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
     GNU General Public License for more details.                        
                                                                         
     You should have received a copy of the GNU General Public License   
     along with this program; if not, write to the Free Software         
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #ifndef IMAGEWIDGET_H
 #define IMAGEWIDGET_H
 
 #include <qwidget.h>
 
 #include <kabc/picture.h>
 #include <kdialogbase.h>
 
 class KURL;
 class KURLRequester;
 
 class QCheckBox;
 class QLabel;
 
 class ImageWidget : public QWidget
 {
   Q_OBJECT
 
   public:
     ImageWidget( QWidget *parent, const char *name = 0 );
     ~ImageWidget();
 
     /**
       Sets the photo object.
      */
     void setPhoto( const KABC::Picture &photo );
 
     /**
       Returns a photo object.
      */
     KABC::Picture photo() const;
 
     /**
       Sets the logo object.
      */
     void setLogo( const KABC::Picture &photo );
 
     /**
       Returns a logo object.
      */
     KABC::Picture logo() const;
 
   signals:
     void changed();
 
   private slots:
     void loadPhoto();
     void loadLogo();
+    void removePhoto();
+    void removeLogo();
     void updateGUI();
 
   private:
     QPixmap loadPixmap( const KURL &url );
 
     KURLRequester *mPhotoUrl;
     KURLRequester *mLogoUrl;
 
     QCheckBox *mUsePhotoUrl;
     QCheckBox *mUseLogoUrl;
     QLabel *mPhotoLabel;
     QLabel *mLogoLabel;
 };
 
 #endif