more sync

2 files changed, 10 insertions, 6 deletions

diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp
index 4d859ce..f80c2a6 100644
--- a/libkdepim/ksyncmanager.cpp
+++ b/libkdepim/ksyncmanager.cpp
@@ -289,70 +289,72 @@ void KSyncManager::slotSyncMenu( int action )
         quickSyncLocalFile();
 
     } else if ( action >= 1003  ) {
         if ( temp->getIsLocalFileSync() ) {
             switch(mTargetApp)
                 {
                 case (KAPI):
                     if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
                         mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
                     break;
                 case (KOPI):
                     if ( syncWithFile( temp->getRemoteFileName( ), false ) )
                         mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
                     break;
                 case (PWMPI):
                     if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
                         mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
                     break;
                 default:
                     qDebug("KSM::slotSyncMenu: invalid apptype selected");
                     break;
 	      
                 }
         } else {
             if (  temp->getIsPhoneSync() ) {
                 mPhoneDevice = temp->getPhoneDevice( ) ;
                 mPhoneConnection = temp->getPhoneConnection( );
                 mPhoneModel = temp->getPhoneModel( );
                 syncPhone();
             } else if (  temp->getIsPiSync()|| temp->getIsPiSyncSpec()) {
                 mSpecificResources.clear();
                 if ( mTargetApp == KAPI ) {
+                    if ( temp->getIsPiSyncSpec() )
+                        mSpecificResources = QStringList::split( ":", temp->getResSpecKapi(),true );
                     mPassWordPiSync = temp->getRemotePwAB();
                     mActiveSyncPort = temp->getRemotePortAB();
                     mActiveSyncIP = temp->getRemoteIPAB();
                 } else if ( mTargetApp == KOPI ) {
-                if ( temp->getIsPiSyncSpec() )
-                    mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true );
+                    if ( temp->getIsPiSyncSpec() )
+                        mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true );
                     mPassWordPiSync = temp->getRemotePw();
                     mActiveSyncPort = temp->getRemotePort();
                     mActiveSyncIP = temp->getRemoteIP();
                 } else  {
                     mPassWordPiSync = temp->getRemotePwPWM();
                     mActiveSyncPort = temp->getRemotePortPWM();
                     mActiveSyncIP = temp->getRemoteIPPWM();
                 } 
                 syncPi();
                 while ( !mPisyncFinished ) {
                     //qDebug("waiting ");
                     qApp->processEvents();
                 }
             } else
                 syncRemote( temp );
 
         }
     }
     delete temp;
     setBlockSave(false);
 }
 
 void KSyncManager::enableQuick( bool ask )
 {
     bool autoStart;
     bool changed = false;
     if ( ask ) {
         QDialog dia ( 0, "input-dialog", true );
         QLineEdit lab ( &dia );
         QVBoxLayout lay( &dia );
         lab.setText( mPrefs->mPassiveSyncPort );
         lay.setMargin(7);
@@ -631,69 +633,72 @@ int KSyncManager::ringSync()
 #else
                 syncSharp();
 #endif
             } else {
                 if ( temp->getIsLocalFileSync() ) {
                     switch(mTargetApp)
                         {
                         case (KAPI):
                             if ( syncWithFile( temp->getRemoteFileNameAB( ), false ) )
                                 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNameAB();
                             break;
                         case (KOPI):
                             if ( syncWithFile( temp->getRemoteFileName( ), false ) )
                                 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileName();
                             break;
                         case (PWMPI):
                             if ( syncWithFile( temp->getRemoteFileNamePWM( ), false ) )
                                 mPrefs->mLastSyncedLocalFile = temp->getRemoteFileNamePWM();
                             break;
                         default:
                             qDebug("KSM: invalid apptype selected");
                             break;
                         }
                 } else {
                     if (  temp->getIsPhoneSync() ) {
                         mPhoneDevice = temp->getPhoneDevice( ) ;
                         mPhoneConnection = temp->getPhoneConnection( );
                         mPhoneModel = temp->getPhoneModel( );
                         syncPhone();
                     } else if (  temp->getIsPiSync() || temp->getIsPiSyncSpec()) {
                         mSpecificResources.clear();
                         if ( mTargetApp == KAPI ) {
+                            if ( temp->getIsPiSyncSpec() )
+                                mSpecificResources = QStringList::split( ":", temp->getResSpecKapi(),true );
                             mPassWordPiSync = temp->getRemotePwAB();
                             mActiveSyncPort = temp->getRemotePortAB();
                             mActiveSyncIP = temp->getRemoteIPAB();
                         } else if ( mTargetApp == KOPI ) {
-                            mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true );
+                            if ( temp->getIsPiSyncSpec() )
+                                mSpecificResources = QStringList::split( ":", temp->getResSpecKopi(),true );
                             mPassWordPiSync = temp->getRemotePw();
                             mActiveSyncPort = temp->getRemotePort();
                             mActiveSyncIP = temp->getRemoteIP();
                         } else  {
                             mPassWordPiSync = temp->getRemotePwPWM();
                             mActiveSyncPort = temp->getRemotePortPWM();
                             mActiveSyncIP = temp->getRemoteIPPWM();
                         } 
                         syncPi();
                         while ( !mPisyncFinished ) {
                             //qDebug("waiting ");
                             qApp->processEvents();
                         }
                         timer.start(); 
                         while ( timer.elapsed () < 2000 ) {
                             qApp->processEvents();
                         }
                     } else
                         syncRemote( temp, false );
 
                 }
             }
             timer.start();
             mParent->topLevelWidget()->setCaption(i18n("Multiple sync in progress ... please wait!") );
             while ( timer.elapsed () < 2000 ) {
                 qApp->processEvents();
 #ifndef _WIN32_
                 sleep (1);
 #endif
             }
 
         }
@@ -1139,68 +1144,68 @@ void KSyncManager::syncPi()
     mCurrentResourceLocal = "";
     mCurrentResourceRemote = "";
     if ( mSpecificResources.count() ) {
         uint lastSyncRes = mSpecificResources.count()/2;
         int ccc = mSpecificResources.count()-1;
         while ( lastSyncRes > 0 && ccc > 0 && mSpecificResources[ ccc ].isEmpty() ) {
             --ccc;
             --lastSyncRes;
             //qDebug ( "KSM: sync pi %d",ccc  );
         }
         uint startLocal = 0;
         uint startRemote = mSpecificResources.count()/2;
         emit multiResourceSyncStart( true );
         while ( startLocal < mSpecificResources.count()/2 ) {
             if (  startLocal+1 >= lastSyncRes )
                 emit multiResourceSyncStart( false );
             mPisyncFinished = false;
             mCurrentResourceLocal = mSpecificResources[ startLocal ];
             mCurrentResourceRemote = mSpecificResources[ startRemote ]; 
             //qDebug ( "KSM: AAASyncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(),  mCurrentResourceRemote.latin1() );
             if ( !mCurrentResourceRemote.isEmpty() ) {
                 qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(),  mCurrentResourceRemote.latin1() );
                
                 KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
                 connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
                 commandSocket->readFile(  syncFileName() ); 
                 mParent->topLevelWidget()->setCaption( i18n("Syncing %1 <-> %2").arg( mCurrentResourceLocal ).arg( mCurrentResourceRemote ) );
                 while ( !mPisyncFinished ) {
                     //qDebug("waiting ");
                     qApp->processEvents();
                 }
                 if (  startLocal+1 < mSpecificResources.count()/2  ) { 
-                    mParent->topLevelWidget()->setCaption( i18n("Waiting 2 secs before syncing next resource...") );
+                    mParent->topLevelWidget()->setCaption( i18n("Waiting a second before syncing next resource...") );
                     QTime timer;
                     timer.start(); 
-                    while ( timer.elapsed () < 2000 ) {
+                    while ( timer.elapsed () < 1000 ) {
                         qApp->processEvents();
                     }
                 }
             }
             ++startRemote;
             ++startLocal; 
             mAskForPreferences = false;
         }
         mPisyncFinished = true;
     } else {
         KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() );
         connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) );
         commandSocket->readFile(  syncFileName() );
     }
 }
 
 void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state)
 {
     //enum { success, errorW, errorR, quiet };
 
 
 
     if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW ||
          state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) {
         if ( state == KCommandSocket::errorPW )
             mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") );
         else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO )
             mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") );
         else if ( state == KCommandSocket::errorCA )
             mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") );
         else if ( state == KCommandSocket::errorFI )
             mParent->topLevelWidget()->setCaption( i18n("File error on remote.") );
diff --git a/libkdepim/ksyncprefsdialog.cpp b/libkdepim/ksyncprefsdialog.cpp
index 6f46d19..2b87298 100644
--- a/libkdepim/ksyncprefsdialog.cpp
+++ b/libkdepim/ksyncprefsdialog.cpp
@@ -474,65 +474,64 @@ void KSyncPrefsDialog::slotOK()
         }
     }
     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;
     mRemoteFileAB->setText( fn );
 }
 
 void KSyncPrefsDialog::chooseFilePWM()
 {
     QString fn = QDir::homeDirPath();
-
     fn =KFileDialog:: getOpenFileName( fn, i18n("Sync filename(*.pwm)"), this );
     if ( fn == "" )
         return;
     mRemoteFilePWM->setText( fn );
 }
 void KSyncPrefsDialog::updateMyCaption()
 {
     setCaption( mProfileBox->currentText() + " : " +i18n("Synchronization Preferences"));
 }
 void KSyncPrefsDialog::textChanged( const QString &  s )
 {
     if ( mProfileBox->count() == 0 )
         return;
     if ( currentSelection < 3 ) {
         //KMessageBox::error(this,i18n("This profil name\ncannot be edited!\n"),i18n("KO/Pi config error"));
         mProfileBox->blockSignals( true );
         mProfileBox->setCurrentItem(mProfileBox-> currentItem ());
         mProfileBox->blockSignals( false );
         return;
     }
     //qDebug("cur i %d ",mProfileBox-> currentItem () );
     mProfileBox->changeItem ( s, mProfileBox-> currentItem () ) ;
     KSyncProfile* prof = mSyncProfiles.at(mProfileBox-> currentItem ()) ;
     prof->setName( s );
     mSyncProfileNames[mProfileBox-> currentItem ()] = s;
     updateMyCaption();
 }
 void KSyncPrefsDialog::profileChanged( int item )
 {
   //qDebug("KSyncPrefsDialog::profileChanged before %d, count %d ", item, mProfileBox->count() ); 
     KSyncProfile* prof;
     saveProfile();