2 files changed, 11 insertions, 3 deletions

diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 15caf9e..fd5e4f9 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -1,29 +1,30 @@
 Info about the changes in new versions of KDE-Pim/Pi
 
 ********** VERSION 2.2.1 ************
 
 KO/Pi:
 Fixed a problem displaying very long allday events in agenda view in single day mode.
 Fixed a problem with the default settings for new todos.
 
 KA/Pi:
 Added a config option to turn on asking before a contact is deleted.
 Fixed a problem with the default view and view selection at startup.
+Formatted name is now set on import, if formatted name is empty.
 
 ********** VERSION 2.2.0 ************
 
 New stable release!
 Fixed some minor usability problems.
 Added writing of next alarm to a file for usage on pdaXrom.
 
 
 *************************************
 
 You can find the complete changelog 
 from version 1.7.7 to  2.2.0 
 in the source package or on 
 
 http://www.pi-sync.net/html/changelog.html
 
 
 
diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 7cb67ed..405f7ec 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -30,64 +30,65 @@ $Id$
 
 #include <qlayout.h>
 #include <qlist.h>
 
 #include <kabc/addressbook.h>
 #include <kabc/resource.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 
 #ifndef KAB_EMBEDDED
 #include <ktrader.h>
 #else //KAB_EMBEDDED
 extern "C"
 {
   void* init_microkaddrbk_csv_xxport();
   void* init_microkaddrbk_kde2_xxport();
   void* init_microkaddrbk_vcard_xxport();
   //  void* init_microkaddrbk_opie_xxport();
   void* init_microkaddrbk_qtopia_xxport();
   void* init_microkaddrbk_sharpdtm_xxport();
 }
 #endif //KAB_EMBEDDED
 
 #include <addresseeview.h>
 
 #include "kabcore.h"
 #include "undocmds.h"
 #include "xxportselectdialog.h"
 
 #include "xxportmanager.h"
+#include "nameeditdialog.h"
 
 KURL XXPortManager::importURL = KURL();
 QString XXPortManager::importData = QString::null;
 
 class PreviewDialog : public KDialogBase
 {
   public:
     PreviewDialog( const KABC::Addressee &addr,
                    QWidget *parent, const char *name = 0 );
 };
 
 XXPortManager::XXPortManager( KABCore *core, QObject *parent, const char *name )
   : QObject( parent, name ), mCore( core ), mShowPreview( false )
 {
   loadPlugins();
 }
 
 XXPortManager::~XXPortManager()
 {
 }
 
 void XXPortManager::restoreSettings()
 {
 }
 
 void XXPortManager::saveSettings()
 {
 }
 
 void XXPortManager::importVCard( const KURL &url )
 {
   importVCard( url, false );
@@ -103,90 +104,96 @@ void XXPortManager::importVCard( const KURL &url, bool showPreview )
 }
 
 void XXPortManager::importVCard( const QString &vCard, bool showPreview )
 {
   importData = vCard;
   mShowPreview = showPreview;
   slotImport( "vcard", "<empty>" );
   mShowPreview = false;
   importData = "";
 }
 
 void XXPortManager::slotImport( const QString &identifier, const QString &data )
 {
   XXPortObject *obj = mXXPortObjects[ identifier ];
   if ( !obj ) {
     KMessageBox::error( mCore, i18n( "<qt>No import plugin available for <b>%1</b>.</qt>" ).arg( identifier ) );
     return;
   }
 
   KABC::Resource *resource = mCore->requestResource( mCore );
   if ( !resource )
     return;
 
   KABC::AddresseeList list = obj->importContacts( data );
   bool useUndo = ( list.count() < 25 );
 #ifdef  DESKTOP_VERSION
   useUndo = true;
 #endif  
   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()) );
       if ( !dlg.exec() ) {
           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();
     } else {
         ++count;
         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()
 {
     mShowPreview = false;
 }
 void XXPortManager::slotExport( const QString &identifier, const QString &data )
 {
   XXPortObject *obj = mXXPortObjects[ identifier ];
   if ( !obj ) {
     KMessageBox::error( mCore, i18n( "<qt>No export plugin available for <b>%1</b>.</qt>" ).arg( identifier ) );
     return;
   }
 
   KABC::AddresseeList addrList;
   XXPortSelectDialog dlg( mCore, obj->requiresSorting(), mCore );
   if ( dlg.exec() )
     addrList = dlg.contacts();
   else
     return;
   if ( !obj->exportContacts( addrList, data ) )
     KMessageBox::error( mCore, i18n( "Unable to export contacts." ) );
   else
     KMessageBox::information( mCore, i18n( "contacts successfully exported." ) );
 }
 
 void XXPortManager::loadPlugins()
 {
   mXXPortObjects.clear();
 
 #ifndef KAB_EMBEDDED