-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" | |||
58 | #include "undocmds.h" | 58 | #include "undocmds.h" |
59 | #include "xxportselectdialog.h" | 59 | #include "xxportselectdialog.h" |
60 | 60 | ||
61 | #include "xxportmanager.h" | 61 | #include "xxportmanager.h" |
62 | #include "nameeditdialog.h" | ||
62 | 63 | ||
63 | KURL XXPortManager::importURL = KURL(); | 64 | KURL XXPortManager::importURL = KURL(); |
64 | QString XXPortManager::importData = QString::null; | 65 | QString XXPortManager::importData = QString::null; |
65 | 66 | ||
@@ -131,8 +132,14 @@ void XXPortManager::slotImport( const QString &identifier, const QString &data ) | |||
131 | mShowPreview = true; | 132 | mShowPreview = true; |
132 | KABC::AddresseeList::Iterator it; | 133 | KABC::AddresseeList::Iterator it; |
133 | bool imported = false; | 134 | bool imported = false; |
134 | int count = 0; | 135 | int count = 0; |
136 | |||
137 | KConfig config( locateLocal("config", "kabcrc") ); | ||
138 | config.setGroup( "General" ); | ||
139 | int FormattedNameType = config.readNumEntry( "FormattedNameType", 1 ); | ||
140 | |||
141 | |||
135 | for ( it = list.begin(); it != list.end(); ++it ) { | 142 | for ( it = list.begin(); it != list.end(); ++it ) { |
136 | if ( mShowPreview ) { | 143 | if ( mShowPreview ) { |
137 | PreviewDialog dlg( *it, mCore ); | 144 | PreviewDialog dlg( *it, mCore ); |
138 | connect( &dlg, SIGNAL( closeClicked() ), this, SLOT ( noPreview()) ); | 145 | connect( &dlg, SIGNAL( closeClicked() ), this, SLOT ( noPreview()) ); |
@@ -140,11 +147,13 @@ void XXPortManager::slotImport( const QString &identifier, const QString &data ) | |||
140 | if ( mShowPreview ) | 147 | if ( mShowPreview ) |
141 | continue; | 148 | continue; |
142 | } | 149 | } |
143 | } | 150 | } |
144 | |||
145 | (*it).setResource( resource ); | 151 | (*it).setResource( resource ); |
152 | if ( (*it).formattedName().isEmpty() ) | ||
153 | (*it).setFormattedName( NameEditDialog::formattedName( (*it), FormattedNameType ) ); | ||
146 | if ( useUndo ) { | 154 | if ( useUndo ) { |
155 | ++count; | ||
147 | // We use a PwNewCommand so the user can undo it. | 156 | // We use a PwNewCommand so the user can undo it. |
148 | PwNewCommand *command = new PwNewCommand( mCore->addressBook(), *it ); | 157 | PwNewCommand *command = new PwNewCommand( mCore->addressBook(), *it ); |
149 | UndoStack::instance()->push( command ); | 158 | UndoStack::instance()->push( command ); |
150 | RedoStack::instance()->clear(); | 159 | RedoStack::instance()->clear(); |
@@ -153,12 +162,10 @@ void XXPortManager::slotImport( const QString &identifier, const QString &data ) | |||
153 | mCore->addressBook()->insertAddressee( (*it), true, true ); | 162 | mCore->addressBook()->insertAddressee( (*it), true, true ); |
154 | } | 163 | } |
155 | imported = true; | 164 | imported = true; |
156 | } | 165 | } |
157 | |||
158 | if ( imported ) { | 166 | if ( imported ) { |
159 | KMessageBox::information( mCore, i18n( "%1 contacts\nsuccessfully\nimported.").arg( count) ); | 167 | KMessageBox::information( mCore, i18n( "%1 contacts\nsuccessfully\nimported.").arg( count) ); |
160 | |||
161 | emit modified(); | 168 | emit modified(); |
162 | } | 169 | } |
163 | } | 170 | } |
164 | void XXPortManager::noPreview() | 171 | void XXPortManager::noPreview() |