sync fixes

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
@@ -2813,69 +2813,75 @@ bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
 #if 0
 
     if ( storage->load(KOPrefs::instance()->mUseQuicksave) ) {
         getEventViewerDialog()->setSyncMode( true );
         syncOK = synchronizeCalendar( mCalendar, calendar, mode );
         getEventViewerDialog()->setSyncMode( false );
         if (  syncOK ) {
            if ( KOPrefs::instance()->mWriteBackFile )
             {
                 storage->setSaveFormat( new ICalFormat( KOPrefs::instance()->mUseQuicksave) );
                 storage->save();
             }
         }
         setModified();
     }
   
 #endif
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
 {
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
     AddressBook abLocal( resource,"syncContact");
     bool syncOK = false;
     if ( abLocal.load() ) {
         qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
         mGlobalSyncMode = SYNC_MODE_EXTERNAL;
         abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice );
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile ) {
                 abLocal.saveAB();
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice );
             }
         }
         setModified();
     }
     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
@@ -304,96 +304,97 @@ class KABCore : public QWidget, public KSyncInterface
      */
     void editContact( const QString &uid /*US = QString::null*/ );
 //US added a second method without defaultparameter
     void editContact2();
 
     /**
       Shows or edits the detail view for the given uid. If the uid is QString::null,
       the method will try to find a selected addressee in the view.
      */
     void executeContact( const QString &uid /*US = QString::null*/ );
 
     /**
       Launches the configuration dialog.
      */
     void openConfigDialog();
 
     /**
       Launches the ldap search dialog.
      */
     void openLDAPDialog();
 
     /**
       Creates a KAddressBookPrinter, which will display the print
       dialog and do the printing.
      */
     void print();
 
     /**
       Registers a new GUI client, so plugins can register its actions.
      */
    void addGUIClient( KXMLGUIClient *client );
 
    void requestForNameEmailUidList(const QString& sourceChannel, const QString& sessionuid);
    void requestForDetails(const QString& sourceChannel, const QString& sessionuid, const QString& name, const QString& email, const QString& uid);
    void requestForBirthdayList(const QString& sourceChannel, const QString& sessionuid);
 
 
   signals:
     void contactSelected( const QString &name );
     void contactSelected( const QPixmap &pixmap );
   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
     void configureResources();
 #endif //KAB_EMBEDDED
 
     void slotEditorDestroyed( const QString &uid );
     void configurationChanged();
     void addressBookChanged();
 
   private:
     void initGUI();
     void initActions();
 
     AddresseeEditorDialog *createAddresseeEditorDialog( QWidget *parent,
                                                         const char *name = 0 );
 
  KXMLGUIClient *mGUIClient;
 
   KABC::AddressBook *mAddressBook;
 
   ViewManager *mViewManager;
   // QSplitter *mDetailsSplitter;
   KDGanttMinimizeSplitter *mExtensionBarSplitter;
   ViewContainer *mDetails;
   KDGanttMinimizeSplitter* mMiniSplitter;
   XXPortManager *mXXPortManager;
   JumpButtonBar *mJumpButtonBar;
   IncSearchWidget *mIncSearchWidget;
   ExtensionManager *mExtensionManager;
 
   KCMultiDialog *mConfigureDialog;
 
 #ifndef KAB_EMBEDDED
     LDAPSearchDialog *mLdapSearchDialog;
 #endif //KAB_EMBEDDED
     // QDict<AddresseeEditorDialog> mEditorDict;
     AddresseeEditorDialog *mEditorDialog;
     bool mReadWrite;
     bool mModified;
     bool mIsPart;
     bool mMultipleViewsAtOnce;
 
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index b360644..a663427 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -186,97 +186,97 @@ void KSyncManager::slotSyncMenu( int action )
     } else if ( action == 1001 ) {
         syncLocalFile();
 
     } else if ( action == 1002 ) {
         quickSyncLocalFile();
 
     } else if ( action >= 1003  ) {
         if ( temp->getIsLocalFileSync() ) {
           switch(mTargetApp)
           {
             case (KAPI):
               if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
                 mLastSyncedLocalFile = temp->getRemoteFileNameAB();
               break;
             case (KOPI):
               if ( syncWithFile( temp->getRemoteFileName( ), false ) )
                 mLastSyncedLocalFile = temp->getRemoteFileName();
               break;
             case (PWMPI):
               if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
                 mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
               break;
             default:
               qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
               break;
               
           }
         } else {
             if (  temp->getIsPhoneSync() ) {
                 mPhoneDevice = temp->getPhoneDevice( ) ;
                 mPhoneConnection = temp->getPhoneConnection( );
                 mPhoneModel = temp->getPhoneModel( );
                 syncPhone();
             } else if (  temp->getIsPiSync() ) {
                 if ( mTargetApp == KAPI ) {
                     mPassWordPiSync = temp->getRemotePwAB();
                     mActiveSyncPort = temp->getRemotePortAB();
                     mActiveSyncIP = temp->getRemoteIPAB();
                 } else if ( mTargetApp == KOPI ) {
                     mPassWordPiSync = temp->getRemotePw();
                     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()
 {
     QDialog dia ( 0, "input-dialog", true );
     QLineEdit lab ( &dia );
     QVBoxLayout lay( &dia );
     lab.setText( mPrefs->mPassiveSyncPort );
     lay.setMargin(7);
     lay.setSpacing(7);
     int po = 9197+mTargetApp;
     QLabel label ( i18n("Port number (Default: %1)").arg(po), &dia );
     lay.addWidget( &label);
     lay.addWidget( &lab);
 
     QLineEdit lepw ( &dia );
     lepw.setText( mPrefs->mPassiveSyncPw );
     QLabel label2 ( i18n("Password to enable\naccess from remote:"), &dia );
     lay.addWidget( &label2);
     lay.addWidget( &lepw);
     dia.setFixedSize( 230,80 );
     dia.setCaption( i18n("Enter port for Pi-Sync") );
     QPushButton pb ( "OK",  &dia);
     lay.addWidget( &pb );
     connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) );
     dia.show();
     if ( ! dia.exec() )
         return;
     dia.hide();
     qApp->processEvents();
     mPrefs->mPassiveSyncPw = lepw.text();
     mPrefs->mPassiveSyncPort = lab.text();
     bool ok;
     Q_UINT16 port = mPrefs->mPassiveSyncPort.toUInt(&ok);
     if ( ! ok ) {
         KMessageBox::information( 0, i18n("No valid port"));
         return;
     }
     //qDebug("port %d ", port);
     mServerSocket = new KServerSocket ( mPrefs->mPassiveSyncPw, port ,1 );
     mServerSocket->setFileName( defaultFileName() );
     //qDebug("connected ");
     if ( !mServerSocket->ok() ) {
@@ -304,333 +304,333 @@ void KSyncManager::syncLocalFile()
             case (KOPI):
               ext = "(*.ics/*.vcs)";
               break;
             case (PWMPI):
               ext = "(*.pwm)";
               break;
             default:
               qDebug("KSyncManager::syncLocalFile: invalid apptype selected");
               break;
               
           }
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename"+ext), mParent );
     if ( fn == "" )
         return;
     if (  syncWithFile(  fn, false ) ) {
         qDebug("syncLocalFile() successful ");
     }
 
 }
 bool  KSyncManager::syncWithFile( QString fn , bool quick )
 {
     bool ret = false;
     QFileInfo info;
     info.setFile( fn );
     QString mess;
     bool loadbup = true;
     if ( !info. exists() ) {
         mess =  i18n( "Sync file \n...%1\ndoes not exist!\nNothing synced!\n").arg(fn.right( 30) );
         int result = QMessageBox::warning( mParent, i18n("Warning!"),
                                            mess );
         return ret;
     }
     int result = 0;
     if ( !quick ) {
         mess =  i18n("Sync with file \n...%1\nfrom:\n%2\n").arg(fn.right( 25)).arg(KGlobal::locale()->formatDateTime(info.lastModified (), true, false ));
         result = QMessageBox::warning( mParent, i18n("Warning!"),
                                        mess,
                                        i18n("Sync"), i18n("Cancel"), 0,
                                        0, 1 );
         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()
 {
     
     if ( syncWithFile( mLastSyncedLocalFile, false ) ) {
         qDebug("quick syncLocalFile() successful ");
       
     }
 }
 void KSyncManager::multiSync( bool askforPrefs  )
 {
     if (blockSave())
         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"  ) );
     QStringList syncProfileNames = mSyncProfileNames;
     KSyncProfile* temp = new KSyncProfile ();
     mAskForPreferences = false;
     for ( i = 0; i < syncProfileNames.count(); ++i ) {
         mCurrentSyncProfile = i;
         temp->setName(syncProfileNames[mCurrentSyncProfile]);
         temp->readConfig(&config);
 
         QString includeInRingSync;
         switch(mTargetApp)
           {
           case (KAPI):
             includeInRingSync = temp->getIncludeInRingSyncAB();
               break;
           case (KOPI):
             includeInRingSync = temp->getIncludeInRingSync();
               break;
           case (PWMPI):
             includeInRingSync = temp->getIncludeInRingSyncPWM();
               break;
             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;
             mCurrentSyncDevice = syncProfileNames[i] ;
             mCurrentSyncName = mLocalMachineName;
             if ( i == 0 ) {
                 syncSharp();
             } else {
                 if ( temp->getIsLocalFileSync() ) {
                   switch(mTargetApp)
                     {
                     case (KAPI):
                       if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
                         mLastSyncedLocalFile = temp->getRemoteFileNameAB();
                       break;
                     case (KOPI):
                       if ( syncWithFile( temp->getRemoteFileName( ), false ) )
                         mLastSyncedLocalFile = temp->getRemoteFileName();
                       break;
                     case (PWMPI):
                       if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
                         mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
                       break;
                     default:
                       qDebug("KSyncManager::slotSyncMenu: invalid apptype selected");
                       break;
                     }
                 } else {
                     if (  temp->getIsPhoneSync() ) {
                         mPhoneDevice = temp->getPhoneDevice( ) ;
                         mPhoneConnection = temp->getPhoneConnection( );
                         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
             }
 
         }
 
     }
     delete temp;
     return syncedProfiles;
 }
 
 void KSyncManager::syncRemote( KSyncProfile* prof,  bool ask)
 {
     QString question;
     if ( ask ) {
     question = i18n("Do you really want\nto remote sync\nwith profile \n")+ prof->getName()+" ?\n";
     if ( QMessageBox::information( mParent, i18n("Sync"),
                                    question,
                                    i18n("Yes"), i18n("No"),
                                    0, 0 ) != 0 )
         return;
     }
 
     QString preCommand;
     QString localTempFile;
     QString postCommand;
 
     switch(mTargetApp)
         {
         case (KAPI):
             preCommand = prof->getPreSyncCommandAB();
             postCommand = prof->getPostSyncCommandAB();
             localTempFile = prof->getLocalTempFileAB();
             break;
         case (KOPI):
             preCommand = prof->getPreSyncCommand();
             postCommand = prof->getPostSyncCommand();
             localTempFile = prof->getLocalTempFile();
             break;
         case (PWMPI):
             preCommand = prof->getPreSyncCommandPWM();
             postCommand = prof->getPostSyncCommandPWM();
             localTempFile = prof->getLocalTempFilePWM();
             break;
         default:
             qDebug("KSyncManager::syncRemote: invalid apptype selected");
             break;
         }
 
 
     int fi;
     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()
 {
     //mDialogManager->showSyncOptions();
     //mSyncAlgoPrefs 
     QDialog dia( mParent, "dia", true );
     dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice );
     QButtonGroup gr ( 1,  Qt::Horizontal, i18n("Sync preferences"), &dia);
     QVBoxLayout lay ( &dia );
     lay.setSpacing( 2 );
     lay.setMargin( 3 );
     lay.addWidget(&gr);
     QRadioButton loc ( i18n("Take local entry on conflict"), &gr );
     QRadioButton rem ( i18n("Take remote entry on conflict"), &gr );
     QRadioButton newest( i18n("Take newest entry on conflict"), &gr );
     QRadioButton ask( i18n("Ask for every entry on conflict"), &gr );
     QRadioButton f_loc( i18n("Force: Take local entry always"), &gr );
     QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr );
     //QRadioButton both( i18n("Take both on conflict"), &gr );
     QPushButton pb ( "OK",  &dia); 
     lay.addWidget( &pb );
     connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); 
     switch ( mSyncAlgoPrefs ) {
     case 0:
         loc.setChecked( true);
         break;
     case 1:
         rem.setChecked( true );
         break;
     case 2:
         newest.setChecked( true);
         break;
     case 3:
         ask.setChecked( true);
         break;
     case 4:
         f_loc.setChecked( true);
         break;
     case 5:
         f_rem.setChecked( true);
         break;
     case 6:
         // both.setChecked( true);
@@ -704,285 +704,264 @@ bool KSyncManager::syncExternalApplication(QString  resource)
 
     qDebug("sync %s", resource.latin1());
 
     bool syncOK = mImplementation->syncExternal(this, resource);
 
     return syncOK;
 
 }
 
 void KSyncManager::syncPhone()
 {
     emit save();
 
     qDebug("pending syncPhone(); ");
     //mView->syncPhone();
 
 }
 
 void KSyncManager::showProgressBar(int percentage, QString caption, int total)
 {
   if (!bar->isVisible())
   {
     bar->setCaption (caption); 
     bar->setTotalSteps (  total  ) ;
 
     bar->show();
   }
 
   bar->setProgress( percentage );
 }
 
 void KSyncManager::hideProgressBar()
 {
   bar->hide();
 }
 
 bool KSyncManager::isProgressBarCanceled()
 {
   return !bar->isVisible();
 }
 
 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 );
 #endif
 }
 
 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;
 };
 
 void KServerSocket::newConnection ( int socket ) 
 {
     // qDebug("KServerSocket:New connection %d ", socket); 
     if ( mSocket ) {
         qDebug("KServerSocket::newConnection Socket deleted! ");
         delete mSocket;
         mSocket = 0;
     }
     mSocket = new QSocket( this );
     connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) );
     connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) );
     mSocket->setSocket( socket );
 }
 
 void KServerSocket::discardClient()
 {
     //qDebug(" KServerSocket::discardClient()");
     if ( mSocket ) {
         delete mSocket;
         mSocket = 0;
     }
     //emit endConnect();
 }
 void KServerSocket::readClient()
 {
     if ( blockRC )
         return;
     if ( mSocket == 0 ) {
         qDebug("ERROR::KServerSocket::readClient(): mSocket == 0  ");
         return;
     }
     qDebug("KServerSocket readClient()");
     if ( mSocket->canReadLine() ) {
         QString line = mSocket->readLine();
         qDebug("KServerSocket readline: %s ", line.latin1());
         QStringList tokens = QStringList::split( QRegExp("[ \r\n][ \r\n]*"), line );
         if ( tokens[0] == "GET" ) {
             if (  tokens[1] == mPassWord )
                 //emit sendFile( mSocket );
                 send_file();
             else {
                 KMessageBox::information( 0, i18n("ERROR:\nGot send file request\nwith invalid password"));
                 qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
             }
         } 
         if ( tokens[0] == "PUT" ) {
             if (  tokens[1] == mPassWord ) {
                 //emit getFile( mSocket );
                 blockRC = true;
                 get_file();
             }
             else {
                 KMessageBox::information( 0, i18n("ERROR:\nGot receive file request\nwith invalid password"));
                 qDebug("password %s, invalid password %s ",mPassWord.latin1(), tokens[1].latin1() );
             }
         } 
         if ( tokens[0] == "STOP" ) {
             //emit endConnect();
             end_connect();
         }
     }
 }
 void KServerSocket::end_connect()
 {
     delete mSyncActionDialog;
     mSyncActionDialog = 0;
 }
 void KServerSocket::send_file()
 {
     //qDebug("MainWindow::sendFile(QSocket* s) ");
     if ( mSyncActionDialog )
         delete mSyncActionDialog;
     mSyncActionDialog = new QDialog ( 0, "input-dialog", true );
     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;
         qDebug("KSS::error open file ");
         mSocket->close();
         if ( mSocket->state() == QSocket::Idle )
             QTimer::singleShot( 10, this , SLOT ( discardClient()));
         return ;
         
     } 
     mSyncActionDialog->setCaption( i18n("Sending file...") );
     QTextStream ts( &file );
     ts.setCodec( QTextCodec::codecForName("utf8") );
     QTextStream os( mSocket );
     os.setCodec( QTextCodec::codecForName("utf8") );
     //os.setEncoding( QTextStream::UnicodeUTF8 );
     while ( ! ts.atEnd() ) {
         os << ts.readLine() << "\n";
     }
     //os << ts.read();
     file.close();
     mSyncActionDialog->setCaption( i18n("Waiting for synced file...") );
     mSocket->close();
     if ( mSocket->state() == QSocket::Idle )
         QTimer::singleShot( 10, this , SLOT ( discardClient()));
 }
 void KServerSocket::get_file()
 {
     mSyncActionDialog->setCaption( i18n("Receiving synced file...") );
    
     piTime.start();
     piFileString = "";
     QTimer::singleShot( 1, this , SLOT (readBackFileFromSocket( ) ));
 }
 
 
 void KServerSocket::readBackFileFromSocket()
 {
     //qDebug("readBackFileFromSocket() %d ", piTime.elapsed ());
     while ( mSocket->canReadLine ()  ) {
         piTime.restart();
         QString line = mSocket->readLine ();
         piFileString += line;
diff --git a/libkdepim/ksyncmanager.h b/libkdepim/ksyncmanager.h
index 0eb3323..aad48d9 100644
--- a/libkdepim/ksyncmanager.h
+++ b/libkdepim/ksyncmanager.h
@@ -114,103 +114,103 @@ class KSyncManager : public QObject
       PWMPI = 2 };
 
   
     KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu);
     ~KSyncManager() ;
 
     bool blockSave() { return mBlockSaveFlag; }
     void setBlockSave(bool sa) { mBlockSaveFlag = sa; }
     void setDefaultFileName( QString s) { mDefFileName = s ;}
     QString defaultFileName() { return mDefFileName ;}
     QString syncFileName();
     void fillSyncMenu();
 
     QString getCurrentSyncDevice() { return mCurrentSyncDevice; }
     QString getCurrentSyncName() { return mCurrentSyncName; }
 
     void showProgressBar(int percentage, QString caption = QString::null, int total=100);
     void hideProgressBar();
     bool isProgressBarCanceled();
 
   // sync stuff
     QString mLocalMachineName;
     QStringList  mExternSyncProfiles;
     QStringList  mSyncProfileNames;
     bool mAskForPreferences;
     bool mShowSyncSummary;
     bool mShowSyncEvents;
     bool mShowTodoInAgenda;
     bool mWriteBackExistingOnly;
     int mSyncAlgoPrefs;
     int mRingSyncAlgoPrefs;
     bool mWriteBackFile;
     int  mWriteBackInFuture;
     QString mPhoneDevice;
     QString mPhoneConnection;
     QString mPhoneModel;
     QString mLastSyncedLocalFile; // save!
     QString mPassWordPiSync;
     QString mActiveSyncPort;
     QString mActiveSyncIP ;
 
  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 );
     void syncLocalFile();
     void syncPhone();
     void syncSharp();
     bool syncExternalApplication(QString);
     void multiSync( bool askforPrefs  );
     int mCurrentSyncProfile ;
     void syncRemote( KSyncProfile* prof,  bool ask = true);
     void edit_sync_options();
     int ringSync();
     QString  getPassword( );
 
   private slots:
     void confSync();
     // *********************
 
  private:
     bool mBlockSaveFlag;
 
 
     QWidget* mParent;
     KSyncInterface* mImplementation;
     TargetApp mTargetApp; 
     QPopupMenu* mSyncMenu;
 
     QProgressBar* bar;
 
 
 
 
 
 };
 
 
 class KSyncInterface 
 { 
   
 
  public :
     virtual bool sync(KSyncManager* manager, QString filename, int mode) = 0;
 
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 0caa27e..ee092b9 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -243,109 +243,109 @@ void KSyncPrefsDialog::setupSyncAlgTab()
    mRemoteFile = new QLineEdit( temphb);
    mRemoteFileAB = new QLineEdit( temphb);
    mRemoteFilePWM = new QLineEdit( temphb);
 
    // *** remote
    remoteFileWidget = new QVBox( topFrame);
    topLayout->addMultiCellWidget(remoteFileWidget, iii,iii,0,1);
    ++iii;
    temphb = new QHBox( remoteFileWidget );
    new QLabel( i18n("Calendar:"), temphb);
    new QLabel( i18n("AddressBook:"), temphb);
    new QLabel( i18n("PWManager:"), temphb);
 
    lab = new QLabel( i18n("Pre sync (download) command:"), remoteFileWidget);
    temphb = new QHBox( remoteFileWidget );
    mRemotePrecommand = new QLineEdit(temphb);
    mRemotePrecommandAB = new QLineEdit(temphb);
    mRemotePrecommandPWM = new QLineEdit(temphb);
 
    lab = new QLabel( i18n("Local temp file:"), remoteFileWidget);
    temphb = new QHBox( remoteFileWidget );
    mLocalTempFile = new QLineEdit(temphb);
    mLocalTempFileAB = new QLineEdit(temphb);
    mLocalTempFilePWM = new QLineEdit(temphb);
 
    lab = new QLabel( i18n("Post sync (upload) command:"), remoteFileWidget);
    temphb = new QHBox( remoteFileWidget );
    mRemotePostcommand = new QLineEdit(temphb );
    mRemotePostcommandAB = new QLineEdit(temphb );
    mRemotePostcommandPWM = new QLineEdit(temphb );
 
    lab = new QLabel( i18n("Fill in default values for:"), remoteFileWidget);
    temphb = new QHBox( remoteFileWidget );
    button = new QPushButton( i18n("ssh/scp"), temphb );
    connect ( button, SIGNAL( clicked()), this, SLOT (fillSSH() ) );
    button = new QPushButton( i18n("ftp"), temphb );
    connect ( button, SIGNAL( clicked()), this, SLOT (fillFTP() ) );
    lab = new QLabel( i18n("Hint: Use $PWD$ for placeholder of password!"), remoteFileWidget);
 
    // *** pi-sync
    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);
 
 }
 
  
 
 
 
 void KSyncPrefsDialog::slotOK()
 {
     if ( mMyMachineName->text() == "undefined" ) {
         KMessageBox::error(this,i18n("Local device name undefined!\nPlease define device name!"),i18n("KO/Pi config error"));
         return;
     }
     int i;
     for (i = 0; i < mSyncProfileNames.count(); ++ i) {
         if ( mSyncProfileNames.contains( mSyncProfileNames[i]) > 1  ) {
             KMessageBox::error(this,i18n("Multiple profiles with same name!\nPlease use unique profile names!"),i18n("KO/Pi config error"));
             return;
         }
     }
     usrWriteConfig();
     QDialog::accept();
 }
 void KSyncPrefsDialog::accept()
 {
     slotOK();
 }
 void KSyncPrefsDialog::chooseFile()
 {
     QString fn = QDir::homeDirPath();
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.ics/*.vcs)"), this );
     if ( fn == "" )
         return;
     mRemoteFile->setText( fn );
 }
 
 void KSyncPrefsDialog::chooseFileAB()
 {
     QString fn = QDir::homeDirPath();
 
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.vcf)"), this );
     if ( fn == "" )
         return;