-rw-r--r-- | libkdepim/ksyncmanager.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index c8d0e0d..02e5587 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1078,47 +1078,48 @@ void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | |||
1078 | } | 1078 | } |
1079 | mPisyncFinished = true; | 1079 | mPisyncFinished = true; |
1080 | return; | 1080 | return; |
1081 | 1081 | ||
1082 | } else if ( state == KCommandSocket::errorW ) { | 1082 | } else if ( state == KCommandSocket::errorW ) { |
1083 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); | 1083 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); |
1084 | mPisyncFinished = true; | 1084 | mPisyncFinished = true; |
1085 | 1085 | ||
1086 | } else if ( state == KCommandSocket::successR ) { | 1086 | } else if ( state == KCommandSocket::successR ) { |
1087 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); | 1087 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); |
1088 | 1088 | ||
1089 | } else if ( state == KCommandSocket::successW ) { | 1089 | } else if ( state == KCommandSocket::successW ) { |
1090 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 1090 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); |
1091 | mPisyncFinished = true; | 1091 | mPisyncFinished = true; |
1092 | } | 1092 | } |
1093 | 1093 | ||
1094 | delete s; | 1094 | delete s; |
1095 | } | 1095 | } |
1096 | 1096 | ||
1097 | void KSyncManager::readFileFromSocket() | 1097 | void KSyncManager::readFileFromSocket() |
1098 | { | 1098 | { |
1099 | QString fileName = syncFileName(); | 1099 | QString fileName = syncFileName(); |
1100 | bool syncOK = true; | ||
1100 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); | 1101 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); |
1101 | if ( ! syncWithFile( fileName , true ) ) { | 1102 | if ( ! syncWithFile( fileName , true ) ) { |
1102 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); | 1103 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); |
1103 | mPisyncFinished = true; | 1104 | syncOK = false; |
1104 | return; | ||
1105 | } | 1105 | } |
1106 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); | 1106 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); |
1107 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1107 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1108 | if ( mWriteBackFile ) | 1108 | if ( mWriteBackFile && syncOK ) |
1109 | commandSocket->writeFile( fileName ); | 1109 | commandSocket->writeFile( fileName ); |
1110 | else { | 1110 | else { |
1111 | commandSocket->sendStop(); | 1111 | commandSocket->sendStop(); |
1112 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 1112 | if ( syncOK ) |
1113 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | ||
1113 | mPisyncFinished = true; | 1114 | mPisyncFinished = true; |
1114 | } | 1115 | } |
1115 | } | 1116 | } |
1116 | 1117 | ||
1117 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) | 1118 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) |
1118 | { | 1119 | { |
1119 | mPassWord = pw; | 1120 | mPassWord = pw; |
1120 | mSocket = 0; | 1121 | mSocket = 0; |
1121 | mSyncActionDialog = 0; | 1122 | mSyncActionDialog = 0; |
1122 | blockRC = false; | 1123 | blockRC = false; |
1123 | } | 1124 | } |
1124 | 1125 | ||
@@ -1215,25 +1216,25 @@ void KServerSocket::send_file() | |||
1215 | if ( secs < 0 ) | 1216 | if ( secs < 0 ) |
1216 | secs = secs * (-1); | 1217 | secs = secs * (-1); |
1217 | if ( secs > 30 ) | 1218 | if ( secs > 30 ) |
1218 | //if ( true ) | 1219 | //if ( true ) |
1219 | { | 1220 | { |
1220 | QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs ); | 1221 | QString warning = i18n("Clock skew of\nsyncing devices\nis %1 seconds!").arg( secs ); |
1221 | QLabel* label = new QLabel( warning, mSyncActionDialog ); | 1222 | QLabel* label = new QLabel( warning, mSyncActionDialog ); |
1222 | label->setAlignment ( Qt::AlignHCenter ); | 1223 | label->setAlignment ( Qt::AlignHCenter ); |
1223 | lay->addWidget( label); | 1224 | lay->addWidget( label); |
1224 | if ( secs > 180 ) | 1225 | if ( secs > 180 ) |
1225 | { | 1226 | { |
1226 | if ( secs > 300 ) { | 1227 | if ( secs > 300 ) { |
1227 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\n of more than 5 minutes.\nPlease adjust your clocks.\n<b>You may get wrong syncing results!<\b>\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) { | 1228 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(0, i18n("The clocks of the syncing\ndevices have a difference\nof more than 5 minutes.\nPlease adjust your clocks.\nYou may get wrong syncing results!\nPlease confirm synchronization!"), i18n("High clock skew!"),i18n("Synchronize!"))) { |
1228 | qDebug("KSS::Sync cancelled ,cs"); | 1229 | qDebug("KSS::Sync cancelled ,cs"); |
1229 | return ; | 1230 | return ; |
1230 | } | 1231 | } |
1231 | } | 1232 | } |
1232 | QFont f = label->font(); | 1233 | QFont f = label->font(); |
1233 | f.setPointSize ( f.pointSize() *2 ); | 1234 | f.setPointSize ( f.pointSize() *2 ); |
1234 | f. setBold (true ); | 1235 | f. setBold (true ); |
1235 | QLabel* label = new QLabel( warning, mSyncActionDialog ); | 1236 | QLabel* label = new QLabel( warning, mSyncActionDialog ); |
1236 | label->setFont( f ); | 1237 | label->setFont( f ); |
1237 | warning = i18n("ADJUST\nYOUR\nCLOCKS!"); | 1238 | warning = i18n("ADJUST\nYOUR\nCLOCKS!"); |
1238 | label->setText( warning ); | 1239 | label->setText( warning ); |
1239 | label->setAlignment ( Qt::AlignHCenter ); | 1240 | label->setAlignment ( Qt::AlignHCenter ); |