author | zautrix <zautrix> | 2005-08-17 19:23:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-08-17 19:23:08 (UTC) |
commit | dfb9cdc7d39b988e23e5491e1c8f0e8c5713dae5 (patch) (side-by-side diff) | |
tree | f2c58bbb72294d1a7d1d3fac8c11e15087a01460 /kaddressbook | |
parent | fefa169958abb9c487205d92b54c79532b6f924a (diff) | |
download | kdepimpi-dfb9cdc7d39b988e23e5491e1c8f0e8c5713dae5.zip kdepimpi-dfb9cdc7d39b988e23e5491e1c8f0e8c5713dae5.tar.gz kdepimpi-dfb9cdc7d39b988e23e5491e1c8f0e8c5713dae5.tar.bz2 |
import fix
-rw-r--r-- | kaddressbook/xxportmanager.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp index 7cb67ed..405f7ec 100644 --- a/kaddressbook/xxportmanager.cpp +++ b/kaddressbook/xxportmanager.cpp @@ -58,8 +58,9 @@ extern "C" #include "undocmds.h" #include "xxportselectdialog.h" #include "xxportmanager.h" +#include "nameeditdialog.h" KURL XXPortManager::importURL = KURL(); QString XXPortManager::importData = QString::null; @@ -131,8 +132,14 @@ void XXPortManager::slotImport( const QString &identifier, const QString &data ) mShowPreview = true; KABC::AddresseeList::Iterator it; bool imported = false; int count = 0; + + KConfig config( locateLocal("config", "kabcrc") ); + config.setGroup( "General" ); + int FormattedNameType = config.readNumEntry( "FormattedNameType", 1 ); + + for ( it = list.begin(); it != list.end(); ++it ) { if ( mShowPreview ) { PreviewDialog dlg( *it, mCore ); connect( &dlg, SIGNAL( closeClicked() ), this, SLOT ( noPreview()) ); @@ -140,11 +147,13 @@ void XXPortManager::slotImport( const QString &identifier, const QString &data ) if ( mShowPreview ) continue; } } - (*it).setResource( resource ); + if ( (*it).formattedName().isEmpty() ) + (*it).setFormattedName( NameEditDialog::formattedName( (*it), FormattedNameType ) ); if ( useUndo ) { + ++count; // We use a PwNewCommand so the user can undo it. PwNewCommand *command = new PwNewCommand( mCore->addressBook(), *it ); UndoStack::instance()->push( command ); RedoStack::instance()->clear(); @@ -153,12 +162,10 @@ void XXPortManager::slotImport( const QString &identifier, const QString &data ) mCore->addressBook()->insertAddressee( (*it), true, true ); } imported = true; } - if ( imported ) { KMessageBox::information( mCore, i18n( "%1 contacts\nsuccessfully\nimported.").arg( count) ); - emit modified(); } } void XXPortManager::noPreview() |