-rw-r--r-- | libkdepim/ksyncmanager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index fa7804e..0109c02 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1119,129 +1119,129 @@ QString KSyncManager::syncFileName() | |||
1119 | return (QString( "/tmp/" )+ fn ); | 1119 | return (QString( "/tmp/" )+ fn ); |
1120 | #endif | 1120 | #endif |
1121 | } | 1121 | } |
1122 | 1122 | ||
1123 | void KSyncManager::syncPi() | 1123 | void KSyncManager::syncPi() |
1124 | { | 1124 | { |
1125 | mIsKapiFile = true; | 1125 | mIsKapiFile = true; |
1126 | mPisyncFinished = false; | 1126 | mPisyncFinished = false; |
1127 | qApp->processEvents(); | 1127 | qApp->processEvents(); |
1128 | if ( mAskForPreferences ) | 1128 | if ( mAskForPreferences ) |
1129 | if ( !edit_pisync_options()) { | 1129 | if ( !edit_pisync_options()) { |
1130 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | 1130 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); |
1131 | mPisyncFinished = true; | 1131 | mPisyncFinished = true; |
1132 | return; | 1132 | return; |
1133 | } | 1133 | } |
1134 | bool ok; | 1134 | bool ok; |
1135 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); | 1135 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); |
1136 | if ( ! ok ) { | 1136 | if ( ! ok ) { |
1137 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); | 1137 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); |
1138 | mPisyncFinished = true; | 1138 | mPisyncFinished = true; |
1139 | return; | 1139 | return; |
1140 | } | 1140 | } |
1141 | mCurrentResourceLocal = ""; | 1141 | mCurrentResourceLocal = ""; |
1142 | mCurrentResourceRemote = ""; | 1142 | mCurrentResourceRemote = ""; |
1143 | if ( mSpecificResources.count() ) { | 1143 | if ( mSpecificResources.count() ) { |
1144 | int lastSyncRes = mSpecificResources.count()/2; | 1144 | int lastSyncRes = mSpecificResources.count()/2; |
1145 | int ccc = mSpecificResources.count()-1; | 1145 | int ccc = mSpecificResources.count()-1; |
1146 | while ( lastSyncRes > 0 && ccc > 0 && mSpecificResources[ ccc ].isEmpty() ) { | 1146 | while ( lastSyncRes > 0 && ccc > 0 && mSpecificResources[ ccc ].isEmpty() ) { |
1147 | --ccc; | 1147 | --ccc; |
1148 | --lastSyncRes; | 1148 | --lastSyncRes; |
1149 | //qDebug ( "KSM: sync pi %d",ccc ); | 1149 | //qDebug ( "KSM: sync pi %d",ccc ); |
1150 | } | 1150 | } |
1151 | int startLocal = 0; | 1151 | int startLocal = 0; |
1152 | int startRemote = mSpecificResources.count()/2; | 1152 | int startRemote = mSpecificResources.count()/2; |
1153 | emit multiResourceSyncStart( true ); | 1153 | emit multiResourceSyncStart( true ); |
1154 | while ( startLocal < mSpecificResources.count()/2 ) { | 1154 | while ( startLocal < mSpecificResources.count()/2 ) { |
1155 | if ( startLocal+1 >= lastSyncRes ) | 1155 | if ( startLocal+1 >= lastSyncRes ) |
1156 | emit multiResourceSyncStart( false ); | 1156 | emit multiResourceSyncStart( false ); |
1157 | mPisyncFinished = false; | 1157 | mPisyncFinished = false; |
1158 | mCurrentResourceLocal = mSpecificResources[ startLocal ]; | 1158 | mCurrentResourceLocal = mSpecificResources[ startLocal ]; |
1159 | mCurrentResourceRemote = mSpecificResources[ startRemote ]; | 1159 | mCurrentResourceRemote = mSpecificResources[ startRemote ]; |
1160 | //qDebug ( "KSM: AAASyncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); | 1160 | //qDebug ( "KSM: AAASyncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); |
1161 | if ( !mCurrentResourceRemote.isEmpty() ) { | 1161 | if ( !mCurrentResourceRemote.isEmpty() ) { |
1162 | qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); | 1162 | qDebug ( "KSM: Syncing resources: Local: %s --- Remote: %s ",mCurrentResourceLocal.latin1(), mCurrentResourceRemote.latin1() ); |
1163 | 1163 | ||
1164 | KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); | 1164 | KCommandSocket* commandSocket = new KCommandSocket( mCurrentResourceRemote, mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); |
1165 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1165 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1166 | commandSocket->readFile( syncFileName() ); | 1166 | commandSocket->readFile( syncFileName() ); |
1167 | mParent->topLevelWidget()->setCaption( i18n("Syncing %1 <-> %2").arg( mCurrentResourceLocal ).arg( mCurrentResourceRemote ) ); | 1167 | mParent->topLevelWidget()->setCaption( i18n("Syncing %1 <-> %2").arg( mCurrentResourceLocal ).arg( mCurrentResourceRemote ) ); |
1168 | while ( !mPisyncFinished ) { | 1168 | while ( !mPisyncFinished ) { |
1169 | //qDebug("waiting "); | 1169 | //qDebug("waiting "); |
1170 | qApp->processEvents(); | 1170 | qApp->processEvents(); |
1171 | } | 1171 | } |
1172 | if ( startLocal+1 < mSpecificResources.count()/2 ) { | 1172 | if ( startLocal+1 < mSpecificResources.count()/2 ) { |
1173 | mParent->topLevelWidget()->setCaption( i18n("Waiting 2 secs before syncing next resource...") ); | 1173 | mParent->topLevelWidget()->setCaption( i18n("Waiting 2 secs before syncing next resource...") ); |
1174 | QTime timer; | 1174 | QTime timer; |
1175 | timer.start(); | 1175 | timer.start(); |
1176 | while ( timer.elapsed () < 2000 ) { | 1176 | while ( timer.elapsed () < 2000 ) { |
1177 | qApp->processEvents(); | 1177 | qApp->processEvents(); |
1178 | } | 1178 | } |
1179 | } | 1179 | } |
1180 | } | 1180 | } |
1181 | ++startRemote; | 1181 | ++startRemote; |
1182 | ++startLocal; | 1182 | ++startLocal; |
1183 | 1183 | mAskForPreferences = false; | |
1184 | } | 1184 | } |
1185 | mPisyncFinished = true; | 1185 | mPisyncFinished = true; |
1186 | } else { | 1186 | } else { |
1187 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); | 1187 | KCommandSocket* commandSocket = new KCommandSocket( "", mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); |
1188 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1188 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1189 | commandSocket->readFile( syncFileName() ); | 1189 | commandSocket->readFile( syncFileName() ); |
1190 | } | 1190 | } |
1191 | } | 1191 | } |
1192 | 1192 | ||
1193 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | 1193 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) |
1194 | { | 1194 | { |
1195 | //enum { success, errorW, errorR, quiet }; | 1195 | //enum { success, errorW, errorR, quiet }; |
1196 | 1196 | ||
1197 | 1197 | ||
1198 | 1198 | ||
1199 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW || | 1199 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW || |
1200 | state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) { | 1200 | state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) { |
1201 | if ( state == KCommandSocket::errorPW ) | 1201 | if ( state == KCommandSocket::errorPW ) |
1202 | mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); | 1202 | mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); |
1203 | else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) | 1203 | else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) |
1204 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); | 1204 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); |
1205 | else if ( state == KCommandSocket::errorCA ) | 1205 | else if ( state == KCommandSocket::errorCA ) |
1206 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") ); | 1206 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") ); |
1207 | else if ( state == KCommandSocket::errorFI ) | 1207 | else if ( state == KCommandSocket::errorFI ) |
1208 | mParent->topLevelWidget()->setCaption( i18n("File error on remote.") ); | 1208 | mParent->topLevelWidget()->setCaption( i18n("File error on remote.") ); |
1209 | else if ( state == KCommandSocket::errorED ) | 1209 | else if ( state == KCommandSocket::errorED ) |
1210 | mParent->topLevelWidget()->setCaption( i18n("Please close error dialog on remote.") ); | 1210 | mParent->topLevelWidget()->setCaption( i18n("Please close error dialog on remote.") ); |
1211 | else if ( state == KCommandSocket::errorUN ) | 1211 | else if ( state == KCommandSocket::errorUN ) |
1212 | mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") ); | 1212 | mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") ); |
1213 | delete s; | 1213 | delete s; |
1214 | if ( state == KCommandSocket::errorR ) { | 1214 | if ( state == KCommandSocket::errorR ) { |
1215 | KCommandSocket* commandSocket = new KCommandSocket( "",mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); | 1215 | KCommandSocket* commandSocket = new KCommandSocket( "",mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); |
1216 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1216 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1217 | commandSocket->sendStop(); | 1217 | commandSocket->sendStop(); |
1218 | } | 1218 | } |
1219 | mPisyncFinished = true; | 1219 | mPisyncFinished = true; |
1220 | return; | 1220 | return; |
1221 | 1221 | ||
1222 | } else if ( state == KCommandSocket::errorW ) { | 1222 | } else if ( state == KCommandSocket::errorW ) { |
1223 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); | 1223 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); |
1224 | mPisyncFinished = true; | 1224 | mPisyncFinished = true; |
1225 | 1225 | ||
1226 | } else if ( state == KCommandSocket::successR ) { | 1226 | } else if ( state == KCommandSocket::successR ) { |
1227 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); | 1227 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); |
1228 | 1228 | ||
1229 | } else if ( state == KCommandSocket::successW ) { | 1229 | } else if ( state == KCommandSocket::successW ) { |
1230 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); | 1230 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); |
1231 | mPisyncFinished = true; | 1231 | mPisyncFinished = true; |
1232 | } else if ( state == KCommandSocket::quiet ){ | 1232 | } else if ( state == KCommandSocket::quiet ){ |
1233 | qDebug("KSS: quiet "); | 1233 | qDebug("KSS: quiet "); |
1234 | mPisyncFinished = true; | 1234 | mPisyncFinished = true; |
1235 | } else { | 1235 | } else { |
1236 | qDebug("KSS: Error: unknown state: %d ", state); | 1236 | qDebug("KSS: Error: unknown state: %d ", state); |
1237 | mPisyncFinished = true; | 1237 | mPisyncFinished = true; |
1238 | } | 1238 | } |
1239 | 1239 | ||
1240 | delete s; | 1240 | delete s; |
1241 | } | 1241 | } |
1242 | 1242 | ||
1243 | void KSyncManager::readFileFromSocket() | 1243 | void KSyncManager::readFileFromSocket() |
1244 | { | 1244 | { |
1245 | QString fileName = syncFileName(); | 1245 | QString fileName = syncFileName(); |
1246 | bool syncOK = true; | 1246 | bool syncOK = true; |
1247 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); | 1247 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); |