author | zautrix <zautrix> | 2005-12-02 10:19:28 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-12-02 10:19:28 (UTC) |
commit | 1bb72406b4f160efa20bf4329539543e000295a5 (patch) (unidiff) | |
tree | eb8cee9f4c79dd28443b4e7a3b2374b712c16e9b /libkdepim | |
parent | cba4eb3e05bee757b910f316ffab01d3849c0138 (diff) | |
download | kdepimpi-1bb72406b4f160efa20bf4329539543e000295a5.zip kdepimpi-1bb72406b4f160efa20bf4329539543e000295a5.tar.gz kdepimpi-1bb72406b4f160efa20bf4329539543e000295a5.tar.bz2 |
more sync
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 7197b30..b7929ec 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1165,48 +1165,49 @@ void KSyncManager::syncPi() | |||
1165 | qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); | 1165 | qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); |
1166 | 1166 | ||
1167 | KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); | 1167 | KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); |
1168 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1168 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1169 | commandSocket->readFile( syncFileName() ); | 1169 | commandSocket->readFile( syncFileName() ); |
1170 | mParent->topLevelWidget()->setCaption( i18n("Syncing %1 <-> %2").arg( mCurrentResourceLocal ).arg( mCurrentResourceRemote ) ); | 1170 | mParent->topLevelWidget()->setCaption( i18n("Syncing %1 <-> %2").arg( mCurrentResourceLocal ).arg( mCurrentResourceRemote ) ); |
1171 | while ( !mPisyncFinished ) { | 1171 | while ( !mPisyncFinished ) { |
1172 | //qDebug("waiting "); | 1172 | //qDebug("waiting "); |
1173 | qApp->processEvents(); | 1173 | qApp->processEvents(); |
1174 | } | 1174 | } |
1175 | if ( startLocal+1 < mSpecificResources.count()/2 ) { | 1175 | if ( startLocal+1 < mSpecificResources.count()/2 ) { |
1176 | mParent->topLevelWidget()->setCaption( i18n("Waiting a second before syncing next resource...") ); | 1176 | mParent->topLevelWidget()->setCaption( i18n("Waiting a second before syncing next resource...") ); |
1177 | QTime timer; | 1177 | QTime timer; |
1178 | timer.start(); | 1178 | timer.start(); |
1179 | while ( timer.elapsed () < 1000 ) { | 1179 | while ( timer.elapsed () < 1000 ) { |
1180 | qApp->processEvents(); | 1180 | qApp->processEvents(); |
1181 | } | 1181 | } |
1182 | } | 1182 | } |
1183 | } | 1183 | } |
1184 | ++startRemote; | 1184 | ++startRemote; |
1185 | ++startLocal; | 1185 | ++startLocal; |
1186 | mAskForPreferences = false; | 1186 | mAskForPreferences = false; |
1187 | } | 1187 | } |
1188 | mPisyncFinished = true; | 1188 | mPisyncFinished = true; |
1189 | mParent->topLevelWidget()->setCaption( i18n("Multi-resource Pi-sync finished") ); | ||
1189 | } else { | 1190 | } else { |
1190 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); | 1191 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); |
1191 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1192 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1192 | commandSocket->readFile( syncFileName() ); | 1193 | commandSocket->readFile( syncFileName() ); |
1193 | } | 1194 | } |
1194 | } | 1195 | } |
1195 | 1196 | ||
1196 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | 1197 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) |
1197 | { | 1198 | { |
1198 | //enum { success, errorW, errorR, quiet }; | 1199 | //enum { success, errorW, errorR, quiet }; |
1199 | 1200 | ||
1200 | 1201 | ||
1201 | 1202 | ||
1202 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW || | 1203 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW || |
1203 | state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) { | 1204 | state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) { |
1204 | if ( state == KCommandSocket::errorPW ) | 1205 | if ( state == KCommandSocket::errorPW ) |
1205 | mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); | 1206 | mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); |
1206 | else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) | 1207 | else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) |
1207 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); | 1208 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); |
1208 | else if ( state == KCommandSocket::errorCA ) | 1209 | else if ( state == KCommandSocket::errorCA ) |
1209 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") ); | 1210 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") ); |
1210 | else if ( state == KCommandSocket::errorFI ) | 1211 | else if ( state == KCommandSocket::errorFI ) |
1211 | mParent->topLevelWidget()->setCaption( i18n("File error on remote.") ); | 1212 | mParent->topLevelWidget()->setCaption( i18n("File error on remote.") ); |
1212 | else if ( state == KCommandSocket::errorED ) | 1213 | else if ( state == KCommandSocket::errorED ) |