-rw-r--r-- | kaddressbook/kabcore.cpp | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp index f4263c4..1a34e4d 100644 --- a/kaddressbook/kabcore.cpp +++ b/kaddressbook/kabcore.cpp | |||
@@ -112,12 +112,13 @@ | |||
112 | 112 | ||
113 | #ifdef _WIN32_ | 113 | #ifdef _WIN32_ |
114 | 114 | ||
115 | #include "kaimportoldialog.h" | 115 | #include "kaimportoldialog.h" |
116 | #endif | 116 | #endif |
117 | 117 | ||
118 | bool pasteWithNewUid = true; | ||
118 | 119 | ||
119 | #ifdef KAB_EMBEDDED | 120 | #ifdef KAB_EMBEDDED |
120 | KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) | 121 | KABCore::KABCore( KAddressBookMain *client, bool readWrite, QWidget *parent, const char *name ) |
121 | : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), | 122 | : QWidget( parent, name ), mGUIClient( client ), mViewManager( 0 ), |
122 | mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ | 123 | mExtensionManager( 0 ),mConfigureDialog( 0 ),/*US mLdapSearchDialog( 0 ),*/ |
123 | mReadWrite( readWrite ), mModified( false ), mMainWindow(client) | 124 | mReadWrite( readWrite ), mModified( false ), mMainWindow(client) |
@@ -395,13 +396,17 @@ void KABCore::createAboutData() | |||
395 | "Don Sanders Original author\n" | 396 | "Don Sanders Original author\n" |
396 | "Cornelius Schumacher Co-maintainer schumacher@kde.org\n" | 397 | "Cornelius Schumacher Co-maintainer schumacher@kde.org\n" |
397 | "Mike Pilone GUI and framework redesign mpilone@slac.com\n" | 398 | "Mike Pilone GUI and framework redesign mpilone@slac.com\n" |
398 | "Greg Stern DCOP interface\n" | 399 | "Greg Stern DCOP interface\n" |
399 | "Mark Westcot Contact pinning\n" | 400 | "Mark Westcot Contact pinning\n" |
400 | "Michel Boyer de la Giroday LDAP Lookup\n" "michel@klaralvdalens-datakonsult.se\n" | 401 | "Michel Boyer de la Giroday LDAP Lookup\n" "michel@klaralvdalens-datakonsult.se\n" |
401 | "Steffen Hansen LDAP Lookup hansen@kde.org\n" ); | 402 | "Steffen Hansen LDAP Lookup hansen@kde.org\n" |
403 | #ifdef _WIN32_ | ||
404 | "(c) 2004 Lutz Rogowski Import from OL rogowski@kde.org\n" | ||
405 | #endif | ||
406 | ); | ||
402 | } | 407 | } |
403 | 408 | ||
404 | void KABCore::setContactSelected( const QString &uid ) | 409 | void KABCore::setContactSelected( const QString &uid ) |
405 | { | 410 | { |
406 | KABC::Addressee addr = mAddressBook->findByUid( uid ); | 411 | KABC::Addressee addr = mAddressBook->findByUid( uid ); |
407 | if ( !mDetails->isHidden() ) | 412 | if ( !mDetails->isHidden() ) |
@@ -851,14 +856,31 @@ void KABCore::importVCard( const KURL &url, bool showPreview ) | |||
851 | void KABCore::importFromOL() | 856 | void KABCore::importFromOL() |
852 | { | 857 | { |
853 | #ifdef _WIN32_ | 858 | #ifdef _WIN32_ |
854 | KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"), mAddressBook, this ); | 859 | KAImportOLdialog* idgl = new KAImportOLdialog( i18n("Import Contacts from OL"), mAddressBook, this ); |
855 | idgl->exec(); | 860 | idgl->exec(); |
856 | KABC::Addressee::List list = idgl->getAddressList(); | 861 | KABC::Addressee::List list = idgl->getAddressList(); |
857 | if ( list.count() > 0 ) | 862 | if ( list.count() > 0 ) { |
858 | pasteContacts( list ); | 863 | KABC::Addressee::List listNew; |
864 | KABC::Addressee::List listExisting; | ||
865 | KABC::Addressee::List::Iterator it; | ||
866 | KABC::AddressBook::Iterator iter; | ||
867 | for ( it = list.begin(); it != list.end(); ++it ) { | ||
868 | if ( mAddressBook->findByUid((*it).uid() ).isEmpty()) | ||
869 | listNew.append( (*it) ); | ||
870 | else | ||
871 | listExisting.append( (*it) ); | ||
872 | } | ||
873 | if ( listExisting.count() > 0 ) | ||
874 | KMessageBox::information( this, i18n("%1 contacts not added to addressbook\nbecause they were already in the addressbook!").arg( listExisting.count() )); | ||
875 | if ( listNew.count() > 0 ) { | ||
876 | pasteWithNewUid = false; | ||
877 | pasteContacts( listNew ); | ||
878 | pasteWithNewUid = true; | ||
879 | } | ||
880 | } | ||
859 | delete idgl; | 881 | delete idgl; |
860 | #endif | 882 | #endif |
861 | } | 883 | } |
862 | 884 | ||
863 | void KABCore::importVCard( const QString &vCard, bool showPreview ) | 885 | void KABCore::importVCard( const QString &vCard, bool showPreview ) |
864 | { | 886 | { |