2 files changed, 36 insertions, 14 deletions

diff --git a/kaddressbook/xxportmanager.cpp b/kaddressbook/xxportmanager.cpp
index 89a2626..7cb67ed 100644
--- a/kaddressbook/xxportmanager.cpp
+++ b/kaddressbook/xxportmanager.cpp
@@ -95,88 +95,105 @@ void XXPortManager::importVCard( const KURL &url )
 
 void XXPortManager::importVCard( const KURL &url, bool showPreview )
 {
   importURL = url;
   mShowPreview = showPreview;
   slotImport( "vcard", "<empty>" );
   mShowPreview = false;
   importURL = KURL();
 }
 
 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;
   for ( it = list.begin(); it != list.end(); ++it ) {
     if ( mShowPreview ) {
       PreviewDialog dlg( *it, mCore );
-      if ( !dlg.exec() )
-        continue;
+      connect( &dlg, SIGNAL( closeClicked() ), this, SLOT ( noPreview()) );
+      if ( !dlg.exec() ) {
+          if ( mShowPreview )
+              continue;
+      }
     }
 
     (*it).setResource( resource );
-    // We use a PwNewCommand so the user can undo it.
-    PwNewCommand *command = new PwNewCommand( mCore->addressBook(), *it );
-    UndoStack::instance()->push( command );
-    RedoStack::instance()->clear();
+    if ( useUndo ) {
+        // 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( "contacts successfully 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
   KTrader::OfferList plugins = KTrader::self()->query( "KAddressBook/XXPort" );
   KTrader::OfferList::ConstIterator it;
   for ( it = plugins.begin(); it != plugins.end(); ++it ) {
     if ( !(*it)->hasServiceType( "KAddressBook/XXPort" ) )
       continue;
 
     KLibFactory *factory = KLibLoader::self()->factory( (*it)->library().latin1() );
@@ -193,50 +210,54 @@ void XXPortManager::loadPlugins()
     }
 
 #else //KAB_EMBEDDED
   QList<XXPortFactory> factorylist;
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_csv_xxport()));
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_kde2_xxport()));
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_vcard_xxport()));
   //US  factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_opie_xxport()));
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_qtopia_xxport()));
   factorylist.append(static_cast<XXPortFactory*>(init_microkaddrbk_sharpdtm_xxport()));
 
   QListIterator<XXPortFactory> it(factorylist);
   for ( ; it.current(); ++it )
   {
     XXPortFactory *xxportFactory = it.current();
 #endif //KAB_EMBEDDED
 
     XXPortObject *obj = xxportFactory->xxportObject( mCore->addressBook(), mCore );
     if ( obj ) {
       mCore->addGUIClient( obj );
       mXXPortObjects.insert( obj->identifier(), obj );
       connect( obj, SIGNAL( exportActivated( const QString&, const QString& ) ),
                this, SLOT( slotExport( const QString&, const QString& ) ) );
       connect( obj, SIGNAL( importActivated( const QString&, const QString& ) ),
                this, SLOT( slotImport( const QString&, const QString& ) ) );
     }
   }
 }
 
 
 PreviewDialog::PreviewDialog( const KABC::Addressee &addr, QWidget *parent,
                               const char *name )
-  : KDialogBase( Plain, i18n( "Contact Preview" ), Ok | Cancel, Ok, parent,
-                 name, true, true )
+  : KDialogBase( Plain, i18n( "Import this contact?" ), Ok | User1| User2, Ok, parent,
+                 name, true, true ,i18n( "Import all!" ),i18n( "No" ) )
 {
   QWidget *page = plainPage();
   QVBoxLayout *layout = new QVBoxLayout( page, marginHint(), spacingHint() );
+  connect( this, SIGNAL( user1Clicked() ), this, SLOT ( slotClose() ) );
+  connect( this, SIGNAL( user2Clicked() ), this, SLOT ( slotCancel() ) );
 
   KABC::AddresseeView *view = new KABC::AddresseeView( page );
   view->setAddressee( addr );
-
   layout->addWidget( view );
-
-  resize( 400, 300 );
+#ifdef DESKTOP_VERSION
+  resize( 640, 480 );
+#else
+  showMaximized();
+#endif
 }
 
 #ifndef KAB_EMBEDDED
 #include "xxportmanager.moc"
 #endif //KAB_EMBEDDED
 
diff --git a/kaddressbook/xxportmanager.h b/kaddressbook/xxportmanager.h
index f8436ed..e801d9b 100644
--- a/kaddressbook/xxportmanager.h
+++ b/kaddressbook/xxportmanager.h
@@ -34,46 +34,47 @@ $Id$
 
 #include <qdict.h>
 #include <qobject.h>
 
 #include <kurl.h>
 
 #include "xxportobject.h"
 
 class KABCore;
 
 class XXPortManager : public QObject
 {
   Q_OBJECT
 
   public:
     XXPortManager( KABCore *core, QObject *parent, const char *name = 0 );
     ~XXPortManager();
 
     void restoreSettings();
     void saveSettings();
 
     static KURL importURL;
     static QString importData;
 
   public slots:
     void importVCard( const KURL &url );
     void importVCard( const KURL &url, bool showPreview );
     void importVCard( const QString &vCard, bool showPreview );
 
   signals:
     void modified();
 
-  protected slots:
+  protected slots: 
+    void noPreview();
     void slotImport( const QString&, const QString& );
     void slotExport( const QString&, const QString& );
 
   private:
     void loadPlugins();
 
     QDict<XXPortObject> mXXPortObjects;
 
     KABCore *mCore;
     bool mShowPreview;
 };
 
 #endif