-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 2a75bfb..d71264f 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -1009,193 +1009,193 @@ void KSyncManager::syncKDE() | |||
1009 | } | 1009 | } |
1010 | 1010 | ||
1011 | } | 1011 | } |
1012 | break; | 1012 | break; |
1013 | case (PWMPI): | 1013 | case (PWMPI): |
1014 | 1014 | ||
1015 | break; | 1015 | break; |
1016 | default: | 1016 | default: |
1017 | qDebug("KSM::slotSyncMenu: invalid apptype selected"); | 1017 | qDebug("KSM::slotSyncMenu: invalid apptype selected"); |
1018 | break; | 1018 | break; |
1019 | 1019 | ||
1020 | } | 1020 | } |
1021 | } | 1021 | } |
1022 | 1022 | ||
1023 | void KSyncManager::syncSharp() | 1023 | void KSyncManager::syncSharp() |
1024 | { | 1024 | { |
1025 | 1025 | ||
1026 | if ( ! syncExternalApplication("sharp") ) | 1026 | if ( ! syncExternalApplication("sharp") ) |
1027 | qDebug("KSM::ERROR sync sharp "); | 1027 | qDebug("KSM::ERROR sync sharp "); |
1028 | } | 1028 | } |
1029 | 1029 | ||
1030 | bool KSyncManager::syncExternalApplication(QString resource) | 1030 | bool KSyncManager::syncExternalApplication(QString resource) |
1031 | { | 1031 | { |
1032 | 1032 | ||
1033 | emit save(); | 1033 | emit save(); |
1034 | 1034 | ||
1035 | if ( mAskForPreferences ) | 1035 | if ( mAskForPreferences ) |
1036 | if ( !edit_sync_options()) { | 1036 | if ( !edit_sync_options()) { |
1037 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | 1037 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); |
1038 | return false; | 1038 | return false; |
1039 | } | 1039 | } |
1040 | 1040 | ||
1041 | qDebug("KSM::Sync extern %s", resource.latin1()); | 1041 | qDebug("KSM::Sync extern %s", resource.latin1()); |
1042 | 1042 | ||
1043 | bool syncOK = mImplementation->syncExternal(this, resource); | 1043 | bool syncOK = mImplementation->syncExternal(this, resource); |
1044 | 1044 | ||
1045 | return syncOK; | 1045 | return syncOK; |
1046 | 1046 | ||
1047 | } | 1047 | } |
1048 | 1048 | ||
1049 | void KSyncManager::syncPhone() | 1049 | void KSyncManager::syncPhone() |
1050 | { | 1050 | { |
1051 | 1051 | ||
1052 | syncExternalApplication("phone"); | 1052 | syncExternalApplication("phone"); |
1053 | 1053 | ||
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | void KSyncManager::showProgressBar(int percentage, QString caption, int total) | 1056 | void KSyncManager::showProgressBar(int percentage, QString caption, int total) |
1057 | { | 1057 | { |
1058 | if (!bar->isVisible()) | 1058 | if (!bar->isVisible()) |
1059 | { | 1059 | { |
1060 | int w = 300; | 1060 | int w = 300; |
1061 | if ( QApplication::desktop()->width() < 320 ) | 1061 | if ( QApplication::desktop()->width() < 320 ) |
1062 | w = 220; | 1062 | w = 220; |
1063 | int h = bar->sizeHint().height() ; | 1063 | int h = bar->sizeHint().height() ; |
1064 | int dw = QApplication::desktop()->width(); | 1064 | int dw = QApplication::desktop()->width(); |
1065 | int dh = QApplication::desktop()->height(); | 1065 | int dh = QApplication::desktop()->height(); |
1066 | bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 1066 | bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
1067 | bar->setCaption (caption); | 1067 | bar->setCaption (caption); |
1068 | bar->setTotalSteps ( total ) ; | 1068 | bar->setTotalSteps ( total ) ; |
1069 | bar->show(); | 1069 | bar->show(); |
1070 | } | 1070 | } |
1071 | bar->raise(); | 1071 | bar->raise(); |
1072 | bar->setProgress( percentage ); | 1072 | bar->setProgress( percentage ); |
1073 | qApp->processEvents(); | 1073 | qApp->processEvents(); |
1074 | } | 1074 | } |
1075 | 1075 | ||
1076 | void KSyncManager::hideProgressBar() | 1076 | void KSyncManager::hideProgressBar() |
1077 | { | 1077 | { |
1078 | bar->hide(); | 1078 | bar->hide(); |
1079 | qApp->processEvents(); | 1079 | qApp->processEvents(); |
1080 | } | 1080 | } |
1081 | 1081 | ||
1082 | bool KSyncManager::isProgressBarCanceled() | 1082 | bool KSyncManager::isProgressBarCanceled() |
1083 | { | 1083 | { |
1084 | return !bar->isVisible(); | 1084 | return !bar->isVisible(); |
1085 | } | 1085 | } |
1086 | 1086 | ||
1087 | QString KSyncManager::syncFileName() | 1087 | QString KSyncManager::syncFileName() |
1088 | { | 1088 | { |
1089 | 1089 | ||
1090 | QString fn = "tempfile"; | 1090 | QString fn = "tempfile"; |
1091 | switch(mTargetApp) | 1091 | switch(mTargetApp) |
1092 | { | 1092 | { |
1093 | case (KAPI): | 1093 | case (KAPI): |
1094 | fn = "tempsyncab.vcf"; | 1094 | fn = "tempsyncab.vcf"; |
1095 | break; | 1095 | break; |
1096 | case (KOPI): | 1096 | case (KOPI): |
1097 | fn = "tempsynccal.ics"; | 1097 | fn = "tempsynccal.ics"; |
1098 | break; | 1098 | break; |
1099 | case (PWMPI): | 1099 | case (PWMPI): |
1100 | fn = "tempsyncpw.pwm"; | 1100 | fn = "tempsyncpw.pwm"; |
1101 | break; | 1101 | break; |
1102 | default: | 1102 | default: |
1103 | break; | 1103 | break; |
1104 | } | 1104 | } |
1105 | #ifdef _WIN32_ | 1105 | #ifdef DESKTOP_VERSION |
1106 | return locateLocal( "tmp", fn ); | 1106 | return locateLocal( "tmp", fn ); |
1107 | #else | 1107 | #else |
1108 | return (QString( "/tmp/" )+ fn ); | 1108 | return (QString( "/tmp/" )+ fn ); |
1109 | #endif | 1109 | #endif |
1110 | } | 1110 | } |
1111 | 1111 | ||
1112 | void KSyncManager::syncPi() | 1112 | void KSyncManager::syncPi() |
1113 | { | 1113 | { |
1114 | mIsKapiFile = true; | 1114 | mIsKapiFile = true; |
1115 | mPisyncFinished = false; | 1115 | mPisyncFinished = false; |
1116 | qApp->processEvents(); | 1116 | qApp->processEvents(); |
1117 | if ( mAskForPreferences ) | 1117 | if ( mAskForPreferences ) |
1118 | if ( !edit_pisync_options()) { | 1118 | if ( !edit_pisync_options()) { |
1119 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); | 1119 | mParent->topLevelWidget()->setCaption( i18n("Syncing aborted. Nothing synced.") ); |
1120 | mPisyncFinished = true; | 1120 | mPisyncFinished = true; |
1121 | return; | 1121 | return; |
1122 | } | 1122 | } |
1123 | bool ok; | 1123 | bool ok; |
1124 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); | 1124 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); |
1125 | if ( ! ok ) { | 1125 | if ( ! ok ) { |
1126 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); | 1126 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); |
1127 | mPisyncFinished = true; | 1127 | mPisyncFinished = true; |
1128 | return; | 1128 | return; |
1129 | } | 1129 | } |
1130 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); | 1130 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this, mParent->topLevelWidget() ); |
1131 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 1131 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
1132 | commandSocket->readFile( syncFileName() ); | 1132 | commandSocket->readFile( syncFileName() ); |
1133 | } | 1133 | } |
1134 | 1134 | ||
1135 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | 1135 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) |
1136 | { | 1136 | { |
1137 | //enum { success, errorW, errorR, quiet }; | 1137 | //enum { success, errorW, errorR, quiet }; |
1138 | 1138 | ||
1139 | 1139 | ||
1140 | 1140 | ||
1141 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW || | 1141 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ||state == KCommandSocket::errorPW || |
1142 | state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) { | 1142 | state == KCommandSocket::errorCA ||state == KCommandSocket::errorFI ||state == KCommandSocket::errorUN||state == KCommandSocket::errorED ) { |
1143 | if ( state == KCommandSocket::errorPW ) | 1143 | if ( state == KCommandSocket::errorPW ) |
1144 | mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); | 1144 | mParent->topLevelWidget()->setCaption( i18n("Wrong password: Receiving remote file failed.") ); |
1145 | else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) | 1145 | else if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) |
1146 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); | 1146 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); |
1147 | else if ( state == KCommandSocket::errorCA ) | 1147 | else if ( state == KCommandSocket::errorCA ) |
1148 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") ); | 1148 | mParent->topLevelWidget()->setCaption( i18n("Sync cancelled from remote.") ); |
1149 | else if ( state == KCommandSocket::errorFI ) | 1149 | else if ( state == KCommandSocket::errorFI ) |
1150 | mParent->topLevelWidget()->setCaption( i18n("File error on remote.") ); | 1150 | mParent->topLevelWidget()->setCaption( i18n("File error on remote.") ); |
1151 | else if ( state == KCommandSocket::errorED ) | 1151 | else if ( state == KCommandSocket::errorED ) |
1152 | mParent->topLevelWidget()->setCaption( i18n("Please close error dialog on remote.") ); | 1152 | mParent->topLevelWidget()->setCaption( i18n("Please close error dialog on remote.") ); |
1153 | else if ( state == KCommandSocket::errorUN ) | 1153 | else if ( state == KCommandSocket::errorUN ) |
1154 | mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") ); | 1154 | mParent->topLevelWidget()->setCaption( i18n("Unknown error on remote.") ); |
1155 | delete s; | 1155 | delete s; |
1156 | if ( state == KCommandSocket::errorR ) { | 1156 | if ( state == KCommandSocket::errorR ) { |
1157 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); | 1157 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget()); |
1158 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1158 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1159 | commandSocket->sendStop(); | 1159 | commandSocket->sendStop(); |
1160 | } | 1160 | } |
1161 | mPisyncFinished = true; | 1161 | mPisyncFinished = true; |
1162 | return; | 1162 | return; |
1163 | 1163 | ||
1164 | } else if ( state == KCommandSocket::errorW ) { | 1164 | } else if ( state == KCommandSocket::errorW ) { |
1165 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); | 1165 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); |
1166 | mPisyncFinished = true; | 1166 | mPisyncFinished = true; |
1167 | 1167 | ||
1168 | } else if ( state == KCommandSocket::successR ) { | 1168 | } else if ( state == KCommandSocket::successR ) { |
1169 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); | 1169 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); |
1170 | 1170 | ||
1171 | } else if ( state == KCommandSocket::successW ) { | 1171 | } else if ( state == KCommandSocket::successW ) { |
1172 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); | 1172 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync successful!") ); |
1173 | mPisyncFinished = true; | 1173 | mPisyncFinished = true; |
1174 | } else if ( state == KCommandSocket::quiet ){ | 1174 | } else if ( state == KCommandSocket::quiet ){ |
1175 | qDebug("KSS: quiet "); | 1175 | qDebug("KSS: quiet "); |
1176 | mPisyncFinished = true; | 1176 | mPisyncFinished = true; |
1177 | } else { | 1177 | } else { |
1178 | qDebug("KSS: Error: unknown state: %d ", state); | 1178 | qDebug("KSS: Error: unknown state: %d ", state); |
1179 | mPisyncFinished = true; | 1179 | mPisyncFinished = true; |
1180 | } | 1180 | } |
1181 | 1181 | ||
1182 | delete s; | 1182 | delete s; |
1183 | } | 1183 | } |
1184 | 1184 | ||
1185 | void KSyncManager::readFileFromSocket() | 1185 | void KSyncManager::readFileFromSocket() |
1186 | { | 1186 | { |
1187 | QString fileName = syncFileName(); | 1187 | QString fileName = syncFileName(); |
1188 | bool syncOK = true; | 1188 | bool syncOK = true; |
1189 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); | 1189 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); |
1190 | if ( ! syncWithFile( fileName , true ) ) { | 1190 | if ( ! syncWithFile( fileName , true ) ) { |
1191 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); | 1191 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); |
1192 | syncOK = false; | 1192 | syncOK = false; |
1193 | } | 1193 | } |
1194 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); | 1194 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this, mParent->topLevelWidget() ); |
1195 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 1195 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
1196 | if ( mWriteBackFile && syncOK ) { | 1196 | if ( mWriteBackFile && syncOK ) { |
1197 | mParent->topLevelWidget()->setCaption( i18n("Sending back file ...") ); | 1197 | mParent->topLevelWidget()->setCaption( i18n("Sending back file ...") ); |
1198 | commandSocket->writeFile( fileName ); | 1198 | commandSocket->writeFile( fileName ); |
1199 | } | 1199 | } |
1200 | else { | 1200 | else { |
1201 | commandSocket->sendStop(); | 1201 | commandSocket->sendStop(); |