5 files changed, 42 insertions, 56 deletions

diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 6404410..fa80f5c 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2853,29 +2853,35 @@ bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 
 }
 
 void KABCore::getFile( bool success )
 {
+    qDebug("KABCore::getFile ");
+    QTimer::singleShot( 15000, this , SLOT ( setCaptionBack()));
     if ( ! success ) {
         setCaption( i18n("Error receiving file. Nothing changed!") );
         return;
     }
     mAddressBook->importFromFile( sentSyncFile() );
-    setCaption( i18n("Pi-Sync successful!") );
+    topLevelWidget()->setCaption( i18n("Pi-Sync successful!") );
 }
 void KABCore::syncFileRequest()
 {
     mAddressBook->export2File( sentSyncFile() );
 }
 QString KABCore::sentSyncFile()
 {
 #ifdef _WIN32_
-    return  locateLocal( "tmp", "syncab.ics" );
+    return  locateLocal( "tmp", "copysyncab.vcf" );
 #else
-    return QString( "/tmp/kapitempfile.vcf" );
+    return QString( "/tmp/copysyncab.vcf" );
 #endif 
 }
 
+void KABCore::setCaptionBack()
+{
+    topLevelWidget()->setCaption( i18n("KAddressbook/Pi") );
+}
 
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index 987369d..c628399 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -344,16 +344,17 @@ class KABCore : public QWidget, public KSyncInterface
   public slots:
     void getFile( bool success );
     void syncFileRequest();
     void setDetailsVisible( bool visible );
     void setDetailsToState();
     //    void slotSyncMenu( int );
   private slots:
     void setJumpButtonBarVisible( bool visible );
+    void setCaptionBack();
   void importFromOL();
     void extensionModified( const KABC::Addressee::List &list );
     void extensionChanged( int id );
     void clipboardDataChanged();
     void updateActionMenu();
     void configureKeyBindings();
     void removeVoice();
 #ifdef KAB_EMBEDDED
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index b360644..a663427 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -226,17 +226,17 @@ void KSyncManager::slotSyncMenu( int action )
                     mActiveSyncPort = temp->getRemotePort();
                     mActiveSyncIP = temp->getRemoteIP();
                 } else  {
                     mPassWordPiSync = temp->getRemotePwPWM();
                     mActiveSyncPort = temp->getRemotePortPWM();
                     mActiveSyncIP = temp->getRemoteIPPWM();
                 } 
                 syncPi();
-            }
+            } else
                 syncRemote( temp );
 
         }
     }
     delete temp;
     setBlockSave(false);
 }
 void KSyncManager::enableQuick()
@@ -344,19 +344,19 @@ bool  KSyncManager::syncWithFile( QString fn , bool quick )
         if ( result )
             return false;
     }
     if ( mAskForPreferences )
         edit_sync_options();
     if ( result == 0 ) {
         //qDebug("Now sycing ... ");
         if ( ret = mImplementation->sync( this, fn, mSyncAlgoPrefs ) )
-            mParent->setCaption( i18n("Synchronization successful") );
+            mParent->topLevelWidget()->setCaption( i18n("Synchronization successful") );
         else
-            mParent->setCaption( i18n("Sync cancelled or failed. Nothing synced.") );
+            mParent->topLevelWidget()->setCaption( i18n("Sync cancelled or failed. Nothing synced.") );
         if ( ! quick )
             mLastSyncedLocalFile = fn;
     }
     return ret;
 }
 void KSyncManager::quickSyncLocalFile()
 {
     
@@ -371,37 +371,37 @@ void KSyncManager::multiSync( bool askforPrefs  )
         return;
     setBlockSave(true);
     QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
     if ( QMessageBox::information( mParent, i18n("Sync"),
                                    question,
                                    i18n("Yes"), i18n("No"),
                                    0, 0 ) != 0 ) {
         setBlockSave(false);
-        mParent->setCaption(i18n("Aborted! Nothing synced!"));
+        mParent->topLevelWidget()->setCaption(i18n("Aborted! Nothing synced!"));
         return;
     }
     mCurrentSyncDevice = i18n("Multiple profiles") ;
     mSyncAlgoPrefs = mRingSyncAlgoPrefs;
     if ( askforPrefs ) {
         edit_sync_options();
         mRingSyncAlgoPrefs = mSyncAlgoPrefs;
     }
-    mParent->setCaption(i18n("Multiple sync started.") );
+    mParent->topLevelWidget()->setCaption(i18n("Multiple sync started.") );
     qApp->processEvents();
     int num = ringSync() ;
     if (  num > 1 )
         ringSync();
     setBlockSave(false);
     if ( num )
         emit save();
     if ( num )
-        mParent->setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) );
+        mParent->topLevelWidget()->setCaption(i18n("%1 profiles synced. Multiple sync completed!").arg(num) );
     else
-        mParent->setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
+        mParent->topLevelWidget()->setCaption(i18n("Nothing synced! No profiles defined for multisync!"));
     return;
 }
 int KSyncManager::ringSync()
 {
     int syncedProfiles = 0;
     unsigned int i;
     QTime timer;
     KConfig config ( locateLocal( "config","ksyncprofilesrc"  ) );
@@ -428,17 +428,17 @@ int KSyncManager::ringSync()
             default:
               qDebug("KSyncManager::ringSync: invalid apptype selected");
               break;
               
           }
         
         
         if ( includeInRingSync && ( i < 1 || i > 2  )) {
-            mParent->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
+            mParent->topLevelWidget()->setCaption(i18n("Profile ")+syncProfileNames[mCurrentSyncProfile]+ i18n(" is synced ... "));
             ++syncedProfiles;
             // mAskForPreferences = temp->getAskForPreferences();
             mWriteBackFile = temp->getWriteBackFile();
             mWriteBackExistingOnly = temp->getWriteBackExisting();
             mWriteBackInFuture = 0;
             if ( temp->getWriteBackFuture() )
                 mWriteBackInFuture =  temp->getWriteBackFutureWeeks( );
             mShowSyncSummary = false;
@@ -473,17 +473,17 @@ int KSyncManager::ringSync()
                         mPhoneModel = temp->getPhoneModel( );
                         syncPhone();
                     } else
                         syncRemote( temp, false );
 
                 }
             }
             timer.start();
-            mParent->setCaption(i18n("Multiple sync in progress ... please wait!") );
+            mParent->topLevelWidget()->setCaption(i18n("Multiple sync in progress ... please wait!") );
             while ( timer.elapsed () < 2000 ) {
                 qApp->processEvents();
 #ifndef _WIN32_
                 sleep (1);
 #endif
             }
 
         }
@@ -536,61 +536,61 @@ void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
     if ( (fi = preCommand.find("$PWD$")) > 0 ) {
         QString pwd = getPassword();
         preCommand = preCommand.left( fi )+ pwd + preCommand.mid( fi+5 );
 
     }
     int maxlen = 30;
     if ( QApplication::desktop()->width() > 320 )
         maxlen += 25;
-    mParent->setCaption ( i18n( "Copy remote file to local machine..." ) );
+    mParent->topLevelWidget()->setCaption ( i18n( "Copy remote file to local machine..." ) );
     int fileSize = 0;
     int result = system ( preCommand );
     // 0 : okay
     // 256: no such file or dir
     //
     qDebug("KO: Remote copy result(0 = okay): %d ",result );
     if ( result != 0 ) {
         unsigned int len = maxlen;
         while ( len <  preCommand.length() ) {
             preCommand.insert( len , "\n" );
             len += maxlen +2;
         }
         question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (preCommand) ;
         QMessageBox::information( mParent, i18n("Sync - ERROR"),
                                   question,
                                   i18n("Okay!")) ;
-        mParent->setCaption ("");
+        mParent->topLevelWidget()->setCaption ("");
         return;
     }
-    mParent->setCaption ( i18n( "Copying succeed." ) );
+    mParent->topLevelWidget()->setCaption ( i18n( "Copying succeed." ) );
     //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() );
 
 
 
     if ( syncWithFile( localTempFile, true ) ) {
 //         Event* e = mView->getLastSyncEvent();
 //         e->setReadOnly( false );
 //         e->setLocation( KOPrefs::instance()->mSyncProfileNames[mCurrentSyncProfile]);
 //         e->setReadOnly( true );
         if ( mWriteBackFile ) {
             int fi;
             if ( (fi = postCommand.find("$PWD$")) > 0 ) {
                 QString pwd = getPassword();
                 postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 );
                 
             }
-            mParent->setCaption ( i18n( "Writing back file ..." ) );
+            mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) );
             result = system ( postCommand );
             qDebug("Writing back file result: %d ", result);
             if ( result != 0 ) {
-                mParent->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) );
+                mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) );
                 return;
             } else {
-                mParent->setCaption ( i18n( "Syncronization sucessfully completed" ) );
+                mParent->topLevelWidget()->setCaption ( i18n( "Syncronization sucessfully completed" ) );
             }
         }
     }
     return;
 }
 
 void KSyncManager::edit_sync_options()
 {
@@ -744,23 +744,23 @@ bool KSyncManager::isProgressBarCanceled()
 
 QString KSyncManager::syncFileName()
 {
 
     QString fn = "tempfile";
     switch(mTargetApp)
         {
         case (KAPI):
-            fn = "addressbook.vcf";
+            fn = "tempsyncab.vcf";
             break;
         case (KOPI):
-            fn = "synccalendar.ics";
+            fn = "tempsynccal.ics";
             break;
         case (PWMPI):
-            fn = "manager.pwm";
+            fn = "tempsyncpw.pwm";
             break;
         default:
             break;
         }
 #ifdef _WIN32_
     return  locateLocal( "tmp", fn );
 #else
     return (QString( "/tmp/" )+ fn );
@@ -768,92 +768,70 @@ QString KSyncManager::syncFileName()
 }
 
 void KSyncManager::syncPi()
 {
     qApp->processEvents();
     bool ok;
     Q_UINT16 port = mActiveSyncPort.toUInt(&ok);
     if ( ! ok ) {
-        mParent->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
+        mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") );
         return;
     }
     KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
-    mParent->setCaption( i18n("Sending request for remote file ...") );
+    mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") );
     commandSocket->readFile(  syncFileName() );
 }
 
 void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
 {
     qDebug("MainWindow::deleteCommandSocket %d", state);
     
     //enum { success, errorW, errorR, quiet };
     if ( state == KCommandSocket::errorR ) {
-         mParent->setCaption( i18n("ERROR: Receiving remote file failed.") );
+         mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
         delete s;
         KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
         connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
         commandSocket->sendStop();
         return;
         
     } else  if ( state == KCommandSocket::errorW ) {
-         mParent->setCaption( i18n("ERROR:Writing back file failed.") );
+         mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") );
 
     } else  if ( state == KCommandSocket::successR ) {
         QTimer::singleShot( 1, this , SLOT ( readFileFromSocket()));
 
     } else  if ( state == KCommandSocket::successW ) {
-         mParent->setCaption( i18n("Pi-Sync succesful!") );
+         mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
     }
 
     delete s;
 }
 
 void KSyncManager::readFileFromSocket()
 {
     QString fileName = syncFileName();
-    mParent->setCaption( i18n("Remote file saved to temp file.") );
+    mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") );
     if ( ! syncWithFile( fileName , true ) ) {
-        mParent->setCaption( i18n("Syncing failed.") );
+        mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") );
         qDebug("Syncing failed ");
         return;
     }
     KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this );
     connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) );
     if ( mWriteBackFile ) 
         commandSocket->writeFile(  fileName );
     else {
         commandSocket->sendStop();
-        mParent->setCaption( i18n("Pi-Sync succesful!") );
+        mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") );
     }
 }
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name )
 {
     mPassWord = pw;
     mSocket = 0;
     mSyncActionDialog = 0;
     blockRC = false;
 };
 
@@ -933,16 +911,17 @@ void KServerSocket::send_file()
     mSyncActionDialog->setCaption(i18n("Received sync request"));
     QLabel* label = new QLabel( i18n("Synchronizing from remote ...\n\nDo not use this application!\n\nIf syncing fails\nyou can close this dialog."), mSyncActionDialog );
     QVBoxLayout* lay = new QVBoxLayout( mSyncActionDialog );
     lay->addWidget( label);
     lay->setMargin(7);
     lay->setSpacing(7);
     mSyncActionDialog->setFixedSize( 230, 120);
     mSyncActionDialog->show();
+    mSyncActionDialog->raise();
     qDebug("KSS::saving ... ");
     emit request_file();
     qApp->processEvents();
     QString fileName = mFileName;
     QFile file( fileName );
     if (!file.open( IO_ReadOnly ) ) {
         delete mSyncActionDialog;
         mSyncActionDialog = 0;
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 0eb3323..aad48d9 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -154,23 +154,23 @@ class KSyncManager : public QObject
 
  signals:
     void save();
     void request_file();
     void getFile( bool );
 
  public slots:
     void slotSyncMenu( int );
+    void deleteCommandSocket(KCommandSocket*s, int state);
+    void readFileFromSocket();
 
  private:
     // LR *******************************
     // sync stuff!
     void syncPi();
-    void deleteCommandSocket(KCommandSocket*s, int state);
-    void readFileFromSocket();
     KServerSocket * mServerSocket;
     void enableQuick();
     KPimPrefs* mPrefs;
     QString mDefFileName;
     QString mCurrentSyncDevice;
     QString mCurrentSyncName;
     void quickSyncLocalFile();
     bool  syncWithFile( QString fn , bool quick );
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 0caa27e..ee092b9 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -283,29 +283,29 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    piWidget = new QVBox( topFrame);
    topLayout->addMultiCellWidget(piWidget, iii,iii,0,1);
    ++iii;
    temphb = new QHBox( piWidget );
    new QLabel( i18n("Calendar:"), temphb);
    new QLabel( i18n("AddressBook:"), temphb);
    new QLabel( i18n("PWManager:"), temphb);
 
-   lab = new QLabel( i18n("Password for remote access:"), piWidget);
+   lab = new QLabel( i18n("Password for remote access: (could be the same for each)"), piWidget);
    temphb = new QHBox( piWidget );
    mRemotePw = new QLineEdit(temphb);
    mRemotePwAB = new QLineEdit(temphb);
    mRemotePwPWM = new QLineEdit(temphb);
 
-   lab = new QLabel( i18n("Remote IP address:"), piWidget);
+   lab = new QLabel( i18n("Remote IP address: (could be the same for each)"), piWidget);
    temphb = new QHBox( piWidget );
    mRemoteIP = new QLineEdit(temphb);
    mRemoteIPAB = new QLineEdit(temphb);
    mRemoteIPPWM = new QLineEdit(temphb);
 
-   lab = new QLabel( i18n("Remote port number:"), piWidget);
+   lab = new QLabel( i18n("Remote port number: (should be different for each)"), piWidget);
    temphb = new QHBox( piWidget );
    mRemotePort = new QLineEdit(temphb);
    mRemotePortAB = new QLineEdit(temphb);
    mRemotePortPWM = new QLineEdit(temphb);
 
 }