Improved pasting of many items

2 files changed, 6 insertions, 5 deletions

diff --git a/kaddressbook/addresseeeditordialog.cpp b/kaddressbook/addresseeeditordialog.cpp
index 790f148..6bc4129 100644
--- a/kaddressbook/addresseeeditordialog.cpp
+++ b/kaddressbook/addresseeeditordialog.cpp
@@ -13,97 +13,97 @@
     GNU General Public License for more details.                        
                                                                         
     You should have received a copy of the GNU General Public License   
     along with this program; if not, write to the Free Software         
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 */                                                                      
 
 #include <qlayout.h>
 #include <qapplication.h>
 
 #include <kdebug.h>
 #include <klocale.h>
 #include <kglobal.h>
 
 #include "addresseeeditorwidget.h"
 #include "kabcore.h"
 
 #include "addresseeeditordialog.h"
 
 AddresseeEditorDialog::AddresseeEditorDialog( KABCore *core, QWidget *parent,
                                               const char *name )
   : KDialogBase( KDialogBase::Plain, i18n( "Edit Contact" ), 
                  KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply,
                  KDialogBase::Ok, parent, name, true )
 {
 
 
   QWidget *page = plainPage();
   
   QVBoxLayout *layout = new QVBoxLayout( page );
 
   mEditorWidget = new AddresseeEditorWidget( core, false, page );
   connect( mEditorWidget, SIGNAL( modified( const KABC::Addressee::List& ) ),
            SLOT( widgetModified() ) );
   layout->addWidget( mEditorWidget );
   
   enableButton( KDialogBase::Apply, false );
   if ( QApplication::desktop()->width()  < 480 ) {
       hideButtons();
   }
 }
 
 AddresseeEditorDialog::~AddresseeEditorDialog()
 {
-    qDebug("----------------------------------------------- ");
+    qDebug("AddresseeEditorDialog::~AddresseeEditorDialog()");
     //emit editorDestroyed( mEditorWidget->addressee().uid() );
 }
 
 void AddresseeEditorDialog::setAddressee( const KABC::Addressee &addr )
 {
   enableButton( KDialogBase::Apply, false );
   
   mEditorWidget->setAddressee( addr );
 }
 
 KABC::Addressee AddresseeEditorDialog::addressee()
 {
   return mEditorWidget->addressee();
 }
 
 bool AddresseeEditorDialog::dirty()
 {
   return mEditorWidget->dirty();
 }
 
 void AddresseeEditorDialog::slotApply()
 {
   if ( mEditorWidget->dirty() ) {
     mEditorWidget->save();
     emit contactModified( mEditorWidget->addressee() );
   }
 
   enableButton( KDialogBase::Apply, false );
   
   KDialogBase::slotApply();
 }
 
 void AddresseeEditorDialog:: accept () 
 {
     slotOk();
 
 }
 void AddresseeEditorDialog::slotOk()
 {
   slotApply();
   
   KDialogBase::slotOk();
   
 }
 
 void AddresseeEditorDialog::widgetModified()
 {
   enableButton( KDialogBase::Apply, true );
diff --git a/kaddressbook/undocmds.cpp b/kaddressbook/undocmds.cpp
index db773be..5fbeec3 100644
--- a/kaddressbook/undocmds.cpp
+++ b/kaddressbook/undocmds.cpp
@@ -71,100 +71,101 @@ void PwDeleteCommand::undo()
 void PwDeleteCommand::redo()
 {
   // Just remove it from the document. This is enough to make the user
   // Think the item has been deleted
   KABC::Addressee a;
   QStringList::Iterator iter;
   for (iter = mUidList.begin(); iter != mUidList.end(); ++iter)
   {
     a = mDocument->findByUid(*iter);
     mDocument->removeAddressee(a);
     mAddresseeList.append(a);
     AddresseeConfig::instance()->remove(a.uid());
   }
 }
 
 /////////////////////////////////
 // PwPaste Methods
 
 PwPasteCommand::PwPasteCommand( KABCore *core, const KABC::Addressee::List &list )
   : Command(), mCore( core ), mAddresseeList( list )
 {
   redo();
 }
 
 QString PwPasteCommand::name()
 {
   return i18n( "Paste" );
 }
 
 void PwPasteCommand::undo()
 {
   KABC::Addressee::List::Iterator it;
   for ( it = mAddresseeList.begin(); it != mAddresseeList.end(); ++it ) 
     mCore->addressBook()->removeAddressee( *it );
 }
 
 void PwPasteCommand::redo()
 {
   QStringList uids;
   KABC::Addressee::List::Iterator it;
   for ( it = mAddresseeList.begin(); it != mAddresseeList.end(); ++it ) {
     /* we have to set a new uid for the contact, otherwise insertAddressee()
        ignore it.
      */ 
     (*it).setUid( KApplication::randomString( 10 ) );
     uids.append( (*it).uid() );
     mCore->addressBook()->insertAddressee( *it );
   }
-
-  QStringList::Iterator uidIt;
-  for ( uidIt = uids.begin(); uidIt != uids.end(); ++uidIt )
-    mCore->editContact( *uidIt );
+  if ( uids.count() < 4 ) {
+      QStringList::Iterator uidIt;
+      for ( uidIt = uids.begin(); uidIt != uids.end(); ++uidIt )
+          mCore->editContact( *uidIt );
+  }
 }
 
 /////////////////////////////////
 // PwNew Methods
 
 PwNewCommand::PwNewCommand( KABC::AddressBook *doc, const KABC::Addressee &a )
   : Command(), mDocument( doc ), mA( a )
 {
   mDocument->insertAddressee(mA);
 }
 
 PwNewCommand::~PwNewCommand()
 {
 }
 
 QString PwNewCommand::name()
 {
   return i18n( "New Contact" );
 }
 
 void PwNewCommand::undo()
 {
   mDocument->removeAddressee( mA );
 }
 
 void PwNewCommand::redo()
 {
   mDocument->insertAddressee( mA );
 }
 
 /////////////////////////////////
 // PwEdit Methods
 
 PwEditCommand::PwEditCommand(KABC::AddressBook *doc,
                              const KABC::Addressee &oldA,
                              const KABC::Addressee &newA )
      : Command(), mDocument(doc), mOldA(oldA), mNewA(newA)
 {
   redo();
 }
 
 PwEditCommand::~PwEditCommand()
 {
 }
 
 QString PwEditCommand::name()
 {
   return i18n( "Entry Edit" );