author | zautrix <zautrix> | 2005-12-02 08:29:35 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-12-02 08:29:35 (UTC) |
commit | 2bd8aff44e90b6d58e2037771db8b38846addb3e (patch) (side-by-side diff) | |
tree | 63b679b438f2ad0daa4789de5e70a9f0eb5a8c9f /libkdepim/ksyncmanager.cpp | |
parent | 467b2e451511d201bfe9bef946728e5488d38e0a (diff) | |
download | kdepimpi-2bd8aff44e90b6d58e2037771db8b38846addb3e.zip kdepimpi-2bd8aff44e90b6d58e2037771db8b38846addb3e.tar.gz kdepimpi-2bd8aff44e90b6d58e2037771db8b38846addb3e.tar.bz2 |
more sync
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 4d859ce..f80c2a6 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp @@ -315,12 +315,14 @@ void KSyncManager::slotSyncMenu( int action ) 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 ); @@ -657,16 +659,19 @@ int KSyncManager::ringSync() 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 ); mPassWordPiSync = temp->getRemotePw(); mActiveSyncPort = temp->getRemotePort(); mActiveSyncIP = temp->getRemoteIP(); } else { mPassWordPiSync = temp->getRemotePwPWM(); @@ -1165,16 +1170,16 @@ void KSyncManager::syncPi() 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; |