3 files changed, 36 insertions, 9 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index f4263c4..1a34e4d 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -102,32 +102,33 @@
 #include "addresseeeditordialog.h"
 #include "viewmanager.h"
 #include "details/detailsviewcontainer.h"
 #include "kabprefs.h"
 #include "xxportmanager.h"
 #include "incsearchwidget.h"
 #include "jumpbuttonbar.h"
 #include "extensionmanager.h"
 #include "addresseeconfig.h"
 #include <kcmultidialog.h>
 
 #ifdef _WIN32_
 
 #include "kaimportoldialog.h"
 #endif
 
+bool pasteWithNewUid = true;
 
 #ifdef KAB_EMBEDDED
 KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name )
   : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ),
     mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US  mLdapSearchDialog( 0 ),*/
     mReadWrite( readWrite ), mModified( false ), mMainWindow(client)
 #else //KAB_EMBEDDED
 KABCore::KABCore( KXMLGUIClient *client, bool readWrite, QWidget *parent, const char *name )
   : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ),
     mExtensionManager( 0 ), mConfigureDialog( 0 ), mLdapSearchDialog( 0 ),
     mReadWrite( readWrite ), mModified( false )
 #endif //KAB_EMBEDDED
 {
 #ifdef KAB_EMBEDDED
   //US we define here our own global actioncollection. 
   //mActionCollection = new KActionCollection(this);
@@ -385,33 +386,37 @@ void KABCore::createAboutData()
 #ifdef DESKTOP_VERSION
                         "Desktop Edition\n"
 #else
                         "PDA-Edition\n"
                         "for: Zaurus 5500 / 7x0 / 8x0\n"
 #endif
                         
                         "(c) 2004 Ulf Schenk\n"
                         "(c) 1997-2003, The KDE PIM Team\n"
   "Tobias Koenig Current maintainer tokoe@kde.org\n"
   "Don Sanders Original author\n"
   "Cornelius Schumacher Co-maintainer  schumacher@kde.org\n"
   "Mike Pilone GUI and framework redesign mpilone@slac.com\n"
   "Greg Stern DCOP interface\n"
   "Mark Westcot Contact pinning\n"
   "Michel Boyer de la Giroday LDAP Lookup\n" "michel@klaralvdalens-datakonsult.se\n"
-  "Steffen Hansen LDAP Lookup hansen@kde.org\n" );
+  "Steffen Hansen LDAP Lookup hansen@kde.org\n"
+#ifdef _WIN32_
+ "(c) 2004 Lutz Rogowski Import from OL rogowski@kde.org\n"
+#endif
+ );
 }
 
 void KABCore::setContactSelected( const QString &uid )
 {
   KABC::Addressee addr = mAddressBook->findByUid( uid );
   if ( !mDetails->isHidden() )
     mDetails->setAddressee( addr );
 
   if ( !addr.isEmpty() ) {
     emit contactSelected( addr.formattedName() );
     KABC::Picture pic = addr.photo();
     if ( pic.isIntern() ) {
 //US      emit contactSelected( pic.data() );
 //US instead use:      
       QPixmap px;
       if (pic.data().isNull() != true)
@@ -581,33 +586,33 @@ void KABCore::cutContacts()
     UndoStack::instance()->push( command );
     RedoStack::instance()->clear();
 
     setModified( true );
   }
 }
 
 void KABCore::pasteContacts()
 {
   QClipboard *cb = QApplication::clipboard();
 
   KABC::Addressee::List list = AddresseeUtil::clipboardToAddressees( cb->text() );
 
   pasteContacts( list );
 }
 
-void KABCore::pasteContacts( KABC::Addressee::List &list )
+void KABCore::pasteContacts( KABC::Addressee::List &list  )
 {
   KABC::Resource *resource = requestResource( this );
   KABC::Addressee::List::Iterator it;
   for ( it = list.begin(); it != list.end(); ++it )
     (*it).setResource( resource );
 
   PwPasteCommand *command = new PwPasteCommand( this, list );
   UndoStack::instance()->push( command );
   RedoStack::instance()->clear();
 
   setModified( true );
 }
 
 void KABCore::setWhoAmI()
 {
   KABC::Addressee::List addrList = mViewManager->selectedAddressees();
@@ -841,34 +846,51 @@ void KABCore::addEmail( QString aStr )
   }
 #else //KAB_EMBEDDED
   qDebug("KABCore::addEmail finsih method");
 #endif //KAB_EMBEDDED
 }
 
 void KABCore::importVCard( const KURL &url, bool showPreview )
 {
   mXXPortManager->importVCard( url, showPreview );
 }
 void KABCore::importFromOL()
 {
 #ifdef _WIN32_
   KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"),  mAddressBook, this );
   idgl->exec();
   KABC::Addressee::List list = idgl->getAddressList();
-  if ( list.count() > 0 )
-    pasteContacts( list );
+  if ( list.count() > 0 ) {
+    KABC::Addressee::List listNew;
+    KABC::Addressee::List listExisting;
+    KABC::Addressee::List::Iterator it;
+    KABC::AddressBook::Iterator iter;
+    for ( it = list.begin(); it != list.end(); ++it ) {
+      if ( mAddressBook->findByUid((*it).uid() ).isEmpty())
+        listNew.append( (*it) );
+      else
+        listExisting.append( (*it) );
+    }
+    if ( listExisting.count()  > 0 )
+      KMessageBox::information( this, i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() ));
+    if ( listNew.count() > 0 ) {
+      pasteWithNewUid = false;
+      pasteContacts( listNew );
+      pasteWithNewUid = true;
+    }
+  }
   delete idgl;
 #endif
 }
 
 void KABCore::importVCard( const QString &vCard, bool showPreview )
 {
   mXXPortManager->importVCard( vCard, showPreview );
 }
 
 //US added a second method without defaultparameter    
 void KABCore::editContact2() {
   editContact( QString::null );
 }
 
 void KABCore::editContact( const QString &uid )
 {
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp
index 5e7d7c4..ef949e7 100644
--- a/kaddressbook/kaimportoldialog.cpp
+++ b/kaddressbook/kaimportoldialog.cpp
@@ -235,33 +235,33 @@ void KAImportOLdialog::readContactData( DWORD folder )
       itm = folderItems.Item(indx.Detach());
       _ContactItem * pItem = (_ContactItem *)&itm;
       ol2kapiContact( pItem );
       itm->Release();
     }
 }
 void KAImportOLdialog::slotOk()
 {
    QDialog::accept();
 }
 
 void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
 {
   KABC::Addressee  addressee;
   
   addressee.setUid( QString::fromUcs2(aItem->GetEntryID().GetBuffer()));
-  
+  //GetLastModificationTime()
   //addressee.setName( const QString &name );
   //addressee.setFormattedName( const QString &formattedName );
   addressee.setFamilyName( QString::fromUcs2(aItem->GetLastName().GetBuffer()) );
   addressee.setGivenName( QString::fromUcs2(aItem->GetFirstName().GetBuffer()) );
   addressee.setAdditionalName( QString::fromUcs2(aItem->GetMiddleName().GetBuffer()) );
   addressee.setPrefix(QString::fromUcs2(aItem->GetTitle().GetBuffer()) );
   addressee.setSuffix( QString::fromUcs2(aItem->GetSuffix().GetBuffer()) );
   addressee.setNickName( QString::fromUcs2(aItem->GetNickName().GetBuffer()) );
   QDateTime dtb = mDdate2Qdtr(aItem->GetBirthday());
   if ( dtb.isValid() )
     addressee.setBirthday( mDdate2Qdtr(aItem->GetBirthday()));
 
   //QString::fromUcs2(aItem->.GetBuffer())
   //addressee.setMailer( const QString &mailer );
   //addressee.setTimeZone( const TimeZone &timeZone );
   //addressee.setGeo( const Geo &geo );
@@ -616,20 +616,24 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem )
 }
 void KAImportOLdialog::slotCancel()
 {
   reject();
 }
 
 bool KAImportOLdialog::addAddressee( KABC::Addressee a )
 {
   bool add = true;
   KABC::Addressee::List::Iterator it;
     for ( it = mAList.begin(); it != mAList.end(); ++it ) {
       if ( (*it).uid() == a.uid() ) {
         add = false;
         break;
       }
     }
-    if ( add )
-      mAList.append ( a );
+    if ( add ) {
+      if ( mABook->findByUid(a.uid() ).isEmpty())
+        mAList.append ( a );
+      else 
+        add = false;
+    }
     return add;
 }
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index 5fbeec3..5807dc0 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -23,33 +23,33 @@
 
 #include <qtextstream.h>
 
 #include <qapplication.h>
 #include <qclipboard.h>
 
 #include <klocale.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <kabc/addressbook.h>
 
 #include "addresseeutil.h"
 #include "addresseeconfig.h"
 #include "kabcore.h"
 
 #include "undocmds.h"
-
+extern bool pasteWithNewUid;
 /////////////////////////////////
 // PwDelete Methods
 
 PwDeleteCommand::PwDeleteCommand(KABC::AddressBook *doc, 
                                  const QStringList &uidList)
   : Command(), mDocument(doc), mAddresseeList(), mUidList(uidList)
 {
   redo();
 }
 
 PwDeleteCommand::~PwDeleteCommand()
 {
 }
 
 QString PwDeleteCommand::name()
 {
@@ -99,33 +99,34 @@ QString PwPasteCommand::name()
 
 void PwPasteCommand::undo()
 {
   KABC::Addressee::List::Iterator it;
   for ( it = mAddresseeList.begin(); it != mAddresseeList.end(); ++it ) 
     mCore->addressBook()->removeAddressee( *it );
 }
 
 void PwPasteCommand::redo()
 {
   QStringList uids;
   KABC::Addressee::List::Iterator it;
   for ( it = mAddresseeList.begin(); it != mAddresseeList.end(); ++it ) {
     /* we have to set a new uid for the contact, otherwise insertAddressee()
        ignore it.
      */ 
-    (*it).setUid( KApplication::randomString( 10 ) );
+    if ( pasteWithNewUid )
+      (*it).setUid( KApplication::randomString( 10 ) );
     uids.append( (*it).uid() );
     mCore->addressBook()->insertAddressee( *it );
   }
   if ( uids.count() < 4 ) {
       QStringList::Iterator uidIt;
       for ( uidIt = uids.begin(); uidIt != uids.end(); ++uidIt )
           mCore->editContact( *uidIt );
   }
 }
 
 /////////////////////////////////
 // PwNew Methods
 
 PwNewCommand::PwNewCommand( KABC::AddressBook *doc, const KABC::Addressee &a )
   : Command(), mDocument( doc ), mA( a )
 {