2 files changed, 28 insertions, 7 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index d393660..42e147f 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -1371,14 +1371,14 @@ void KABCore::save()
         return;
 
     syncManager->setBlockSave(true);
    QString text = i18n( "There was an error while attempting to save\n the "
     "address book. Please check that some \nother application is "
     "not using it. " );
-   message(i18n("Saving ... please wait! "));
-   qApp->processEvents();
+   message(i18n("Saving ... please wait! "), false);
+   //qApp->processEvents();
 #ifndef KAB_EMBEDDED
   KABC::StdAddressBook *b = dynamic_cast<KABC::StdAddressBook*>( mAddressBook );
   if ( !b || !b->save() ) {
     KMessageBox::error( this, text, i18n( "Unable to Save" ) );
   }
 #else //KAB_EMBEDDED
@@ -2294,17 +2294,21 @@ void KABCore::manageCategories( )
     cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     if ( !cp->exec() ) {
         delete cp;
         return;
     }
     int count = 0;
+    int cc = 0;
     message( i18n("Please wait, processing categories..."));
     if ( cp->addCat() ) {
         KABC::AddressBook::Iterator it;
         QStringList catList = KABPrefs::instance()->mCustomCategories;
         for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
+            ++cc;
+            if ( cc %10 == 0)
+                message(i18n("Processing contact #%1").arg(cc));
             QStringList catIncList = (*it).categories();
             int i;
             for( i = 0; i<   catIncList.count(); ++i ) {
                 if ( !catList.contains (catIncList[i])) {
                     catList.append( catIncList[i] );
                     //qDebug("add cat %s ",  catIncList[i].latin1());
@@ -2319,12 +2323,15 @@ void KABCore::manageCategories( )
     } else {
         QStringList catList = KABPrefs::instance()->mCustomCategories;
         QStringList catIncList;
         QStringList newCatList;
         KABC::AddressBook::Iterator it;
         for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
+            ++cc;
+            if ( cc %10 == 0)
+                message(i18n("Processing contact #%1").arg(cc));
             QStringList catIncList = (*it).categories();
             int i;
             if ( catIncList.count() ) {
                 newCatList.clear();
                 for( i = 0; i<   catIncList.count(); ++i ) {
                     if ( catList.contains (catIncList[i])) {
@@ -2371,13 +2378,15 @@ void KABCore::setFormattedName()
     mAddressBook->setUntagged();
     dlg.tagSelected();
     int count = 0;
     KABC::AddressBook::Iterator it;
     for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
         if ( (*it).tagged() ) {
-            message(i18n("Changing contact #%1").arg( ++count ) );
+            ++count;
+            if ( count %10 == 0 )
+                message(i18n("Changing contact #%1").arg( count ) );
             qApp->processEvents();
             QString fName;
             if ( setpref.simple->isChecked() )
                 fName = NameEditDialog::formattedName( (*it), NameEditDialog::SimpleName );
             else if ( setpref.full->isChecked() )
                 fName = NameEditDialog::formattedName( (*it), NameEditDialog::FullName );
@@ -2389,12 +2398,13 @@ void KABCore::setFormattedName()
                 if ( fName.isEmpty() || fName =="," )
                     fName = (*it).organization();
             (*it).setFormattedName( fName );
         }
     }
     message(i18n("Refreshing view...") );
+    qApp->processEvents();
     mViewManager->refreshView( "" );
     Addressee add;
     mDetails->setAddressee( add );
     message(i18n("Setting formatted name completed!") );
 }
 
@@ -3186,38 +3196,49 @@ bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
    if ( manager != syncManager )
         qDebug("KABCore::syncExternal:: ERROR! :: manager != syncManager ");
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
     AddressBook abLocal( resource,"syncContact");
     bool syncOK = false;
+    message(i18n("Loading DTM address data..."), false);
     if ( abLocal.load() ) {
         qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
         mGlobalSyncMode = SYNC_MODE_EXTERNAL;
+        message(i18n("Sync preprocessing..."),false);
         abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false );
+        message(i18n("Synchronizing..."),false);
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile ) {
                 abLocal.removeSyncAddressees( false );
+                message(i18n("Saving DTM address data..."),false);
                 abLocal.saveAB();
+                message(i18n("Sync postprocessing..."),false);
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true );
             }
         } else
             message( i18n("Sync cancelled or failed.") );
         setModified();
     }
     abLocal.removeResources();
-    if ( syncOK )
+    if ( syncOK ) {
         mViewManager->refreshView();
+        message(i18n("DTM syncing finished."));
+    }
     disableBR( false );
     return syncOK;
 
 }
-void KABCore::message( QString m )
+void KABCore::message( QString m, bool startTimer)
 {
     topLevelWidget()->setCaption( m );
-    mMessageTimer->start( 20000, true );
+    qApp->processEvents();
+    if ( startTimer )
+        mMessageTimer->start( 15000, true );
+    else
+        mMessageTimer->stop();
 }
 bool KABCore::syncPhone()
 {
     QString mCurrentSyncDevice = syncManager->getCurrentSyncDevice();
     QString fileName = getPhoneFile();
     if ( !PhoneAccess::readFromPhone( fileName) ) {
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index ecfe6e9..786549a 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -497,13 +497,13 @@ class KABCore : public QWidget, public KSyncInterface
 
     //this are the overwritten callbackmethods from the syncinterface
     virtual bool sync(KSyncManager* manager, QString filename, int mode);
     virtual bool syncExternal(KSyncManager* manager, QString resource);
     virtual void removeSyncInfo( QString syncProfile);
     bool syncPhone();
-    void message( QString m );
+    void message( QString m , bool startTimer = true);
 
     // LR *******************************
     // sync stuff!
     QString sentSyncFile();
     QPopupMenu *syncMenu;
     KSyncManager* syncManager;