author | zautrix <zautrix> | 2005-01-13 03:53:45 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-13 03:53:45 (UTC) |
commit | 7d00f1441b5e1270dcd447bfb7920dbd3a21503d (patch) (unidiff) | |
tree | 8eb3b053e8104914021eff6f39772024784fff64 /korganizer/calendarview.cpp | |
parent | 7a4a866cded40032766acb4fe8d02b6347b1d12e (diff) | |
download | kdepimpi-7d00f1441b5e1270dcd447bfb7920dbd3a21503d.zip kdepimpi-7d00f1441b5e1270dcd447bfb7920dbd3a21503d.tar.gz kdepimpi-7d00f1441b5e1270dcd447bfb7920dbd3a21503d.tar.bz2 |
sync dialog fixes
-rw-r--r-- | korganizer/calendarview.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 7ddbe23..363dc32 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1114,141 +1114,141 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1114 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" ) | 1114 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" ) |
1115 | skipIncidence = true; | 1115 | skipIncidence = true; |
1116 | if ( !skipIncidence ) { | 1116 | if ( !skipIncidence ) { |
1117 | inR = remote->incidence( uid ); | 1117 | inR = remote->incidence( uid ); |
1118 | if ( ! inR ) { // no conflict ********** add or delete local | 1118 | if ( ! inR ) { // no conflict ********** add or delete local |
1119 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1119 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1120 | if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { | 1120 | if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { |
1121 | checkExternSyncEvent(eventLSyncSharp, inL); | 1121 | checkExternSyncEvent(eventLSyncSharp, inL); |
1122 | local->deleteIncidence( inL ); | 1122 | local->deleteIncidence( inL ); |
1123 | ++deletedEventL; | 1123 | ++deletedEventL; |
1124 | } else { | 1124 | } else { |
1125 | if ( ! mSyncManager->mWriteBackExistingOnly ) { | 1125 | if ( ! mSyncManager->mWriteBackExistingOnly ) { |
1126 | inL->removeID(mCurrentSyncDevice ); | 1126 | inL->removeID(mCurrentSyncDevice ); |
1127 | ++addedEventR; | 1127 | ++addedEventR; |
1128 | //qDebug("remote added Incidence %s ", inL->summary().latin1()); | 1128 | //qDebug("remote added Incidence %s ", inL->summary().latin1()); |
1129 | inL->setLastModified( modifiedCalendar ); | 1129 | inL->setLastModified( modifiedCalendar ); |
1130 | inR = inL->clone(); | 1130 | inR = inL->clone(); |
1131 | inR->setIDStr( ":" ); | 1131 | inR->setIDStr( ":" ); |
1132 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 1132 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
1133 | remote->addIncidence( inR ); | 1133 | remote->addIncidence( inR ); |
1134 | } | 1134 | } |
1135 | } | 1135 | } |
1136 | } else { | 1136 | } else { |
1137 | if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) { | 1137 | if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) { |
1138 | checkExternSyncEvent(eventLSyncSharp, inL); | 1138 | checkExternSyncEvent(eventLSyncSharp, inL); |
1139 | local->deleteIncidence( inL ); | 1139 | local->deleteIncidence( inL ); |
1140 | ++deletedEventL; | 1140 | ++deletedEventL; |
1141 | } else { | 1141 | } else { |
1142 | if ( ! mSyncManager->mWriteBackExistingOnly ) { | 1142 | if ( ! mSyncManager->mWriteBackExistingOnly ) { |
1143 | ++addedEventR; | 1143 | ++addedEventR; |
1144 | inL->setLastModified( modifiedCalendar ); | 1144 | inL->setLastModified( modifiedCalendar ); |
1145 | inR = inL->clone(); | 1145 | inR = inL->clone(); |
1146 | inR->setIDStr( ":" ); | 1146 | inR->setIDStr( ":" ); |
1147 | remote->addIncidence( inR ); | 1147 | remote->addIncidence( inR ); |
1148 | } | 1148 | } |
1149 | } | 1149 | } |
1150 | } | 1150 | } |
1151 | } | 1151 | } |
1152 | } | 1152 | } |
1153 | inL = el.next(); | 1153 | inL = el.next(); |
1154 | } | 1154 | } |
1155 | int delFut = 0; | 1155 | int delFut = 0; |
1156 | int remRem = 0; | 1156 | int remRem = 0; |
1157 | if ( mSyncManager->mWriteBackInFuture ) { | 1157 | if ( mSyncManager->mWriteBackInFuture ) { |
1158 | er = remote->rawIncidences(); | 1158 | er = remote->rawIncidences(); |
1159 | remRem = er.count(); | 1159 | remRem = er.count(); |
1160 | inR = er.first(); | 1160 | inR = er.first(); |
1161 | QDateTime dt; | 1161 | QDateTime dt; |
1162 | QDateTime cur = QDateTime::currentDateTime().addDays( -7 ); | 1162 | QDateTime cur = QDateTime::currentDateTime().addDays( -(mSyncManager->mWriteBackInPast * 7) ); |
1163 | QDateTime end = cur.addDays( (mSyncManager->mWriteBackInFuture +1 ) *7 ); | 1163 | QDateTime end = QDateTime::currentDateTime().addDays( (mSyncManager->mWriteBackInFuture ) *7 ); |
1164 | while ( inR ) { | 1164 | while ( inR ) { |
1165 | if ( inR->type() == "Todo" ) { | 1165 | if ( inR->type() == "Todo" ) { |
1166 | Todo * t = (Todo*)inR; | 1166 | Todo * t = (Todo*)inR; |
1167 | if ( t->hasDueDate() ) | 1167 | if ( t->hasDueDate() ) |
1168 | dt = t->dtDue(); | 1168 | dt = t->dtDue(); |
1169 | else | 1169 | else |
1170 | dt = cur.addSecs( 62 ); | 1170 | dt = cur.addSecs( 62 ); |
1171 | } | 1171 | } |
1172 | else if (inR->type() == "Event" ) { | 1172 | else if (inR->type() == "Event" ) { |
1173 | bool ok; | 1173 | bool ok; |
1174 | dt = inR->getNextOccurence( cur, &ok ); | 1174 | dt = inR->getNextOccurence( cur, &ok ); |
1175 | if ( !ok ) | 1175 | if ( !ok ) |
1176 | dt = cur.addSecs( -62 ); | 1176 | dt = cur.addSecs( -62 ); |
1177 | } | 1177 | } |
1178 | else | 1178 | else |
1179 | dt = inR->dtStart(); | 1179 | dt = inR->dtStart(); |
1180 | if ( dt < cur || dt > end ) { | 1180 | if ( dt < cur || dt > end ) { |
1181 | remote->deleteIncidence( inR ); | 1181 | remote->deleteIncidence( inR ); |
1182 | ++delFut; | 1182 | ++delFut; |
1183 | } | 1183 | } |
1184 | inR = er.next(); | 1184 | inR = er.next(); |
1185 | } | 1185 | } |
1186 | } | 1186 | } |
1187 | bar.hide(); | 1187 | bar.hide(); |
1188 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); | 1188 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); |
1189 | eventLSync->setReadOnly( false ); | 1189 | eventLSync->setReadOnly( false ); |
1190 | eventLSync->setDtStart( mLastCalendarSync ); | 1190 | eventLSync->setDtStart( mLastCalendarSync ); |
1191 | eventRSync->setDtStart( mLastCalendarSync ); | 1191 | eventRSync->setDtStart( mLastCalendarSync ); |
1192 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1192 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1193 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1193 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1194 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; | 1194 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; |
1195 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); | 1195 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); |
1196 | eventLSync->setReadOnly( true ); | 1196 | eventLSync->setReadOnly( true ); |
1197 | qDebug("********** %d %d ", mGlobalSyncMode == SYNC_MODE_NORMAL, mSyncManager->syncWithDesktop() ); | 1197 | qDebug("********** %d %d ", mGlobalSyncMode == SYNC_MODE_NORMAL, mSyncManager->syncWithDesktop() ); |
1198 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // kde is abnormal... | 1198 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // kde is abnormal... |
1199 | remote->addEvent( eventRSync ); | 1199 | remote->addEvent( eventRSync ); |
1200 | else | 1200 | else |
1201 | delete eventRSync; | 1201 | delete eventRSync; |
1202 | QString mes; | 1202 | QString mes; |
1203 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR ); | 1203 | mes .sprintf( i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR ); |
1204 | QString delmess; | 1204 | QString delmess; |
1205 | if ( delFut ) { | 1205 | if ( delFut ) { |
1206 | delmess.sprintf( i18n("%d items skipped on remote,\nbecause they are in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInFuture, remRem-delFut); | 1206 | delmess.sprintf( i18n("%d items skipped on remote,\nbecause they are more\nthan %d weeks in the past or\nmore than %d weeks in the future.\nAfter skipping, remote has\n%d calendar/todo items."), delFut,mSyncManager->mWriteBackInPast,mSyncManager->mWriteBackInFuture, remRem-delFut); |
1207 | mes += delmess; | 1207 | mes += delmess; |
1208 | } | 1208 | } |
1209 | mes = i18n("Local calendar changed!\n") +mes; | 1209 | mes = i18n("Local calendar changed!\n") +mes; |
1210 | mCalendar->checkAlarmForIncidence( 0, true ); | 1210 | mCalendar->checkAlarmForIncidence( 0, true ); |
1211 | qDebug( mes ); | 1211 | qDebug( mes ); |
1212 | if ( mSyncManager->mShowSyncSummary ) { | 1212 | if ( mSyncManager->mShowSyncSummary ) { |
1213 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, | 1213 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, |
1214 | i18n("KO/Pi Synchronization"),i18n("Write back"))) { | 1214 | i18n("KO/Pi Synchronization"),i18n("Write back"))) { |
1215 | qDebug("cancelled "); | 1215 | qDebug("cancelled "); |
1216 | return false; | 1216 | return false; |
1217 | } | 1217 | } |
1218 | } | 1218 | } |
1219 | return syncOK; | 1219 | return syncOK; |
1220 | } | 1220 | } |
1221 | 1221 | ||
1222 | void CalendarView::setSyncDevice( QString s ) | 1222 | void CalendarView::setSyncDevice( QString s ) |
1223 | { | 1223 | { |
1224 | mCurrentSyncDevice= s; | 1224 | mCurrentSyncDevice= s; |
1225 | } | 1225 | } |
1226 | void CalendarView::setSyncName( QString s ) | 1226 | void CalendarView::setSyncName( QString s ) |
1227 | { | 1227 | { |
1228 | mCurrentSyncName= s; | 1228 | mCurrentSyncName= s; |
1229 | } | 1229 | } |
1230 | bool CalendarView::syncCalendar(QString filename, int mode) | 1230 | bool CalendarView::syncCalendar(QString filename, int mode) |
1231 | { | 1231 | { |
1232 | //qDebug("syncCalendar %s ", filename.latin1()); | 1232 | //qDebug("syncCalendar %s ", filename.latin1()); |
1233 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 1233 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
1234 | CalendarLocal* calendar = new CalendarLocal(); | 1234 | CalendarLocal* calendar = new CalendarLocal(); |
1235 | calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); | 1235 | calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
1236 | FileStorage* storage = new FileStorage( calendar ); | 1236 | FileStorage* storage = new FileStorage( calendar ); |
1237 | bool syncOK = false; | 1237 | bool syncOK = false; |
1238 | storage->setFileName( filename ); | 1238 | storage->setFileName( filename ); |
1239 | // qDebug("loading ... "); | 1239 | // qDebug("loading ... "); |
1240 | if ( storage->load() ) { | 1240 | if ( storage->load() ) { |
1241 | getEventViewerDialog()->setSyncMode( true ); | 1241 | getEventViewerDialog()->setSyncMode( true ); |
1242 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); | 1242 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); |
1243 | getEventViewerDialog()->setSyncMode( false ); | 1243 | getEventViewerDialog()->setSyncMode( false ); |
1244 | if ( syncOK ) { | 1244 | if ( syncOK ) { |
1245 | if ( mSyncManager->mWriteBackFile ) | 1245 | if ( mSyncManager->mWriteBackFile ) |
1246 | { | 1246 | { |
1247 | storage->setSaveFormat( new ICalFormat() ); | 1247 | storage->setSaveFormat( new ICalFormat() ); |
1248 | storage->save(); | 1248 | storage->save(); |
1249 | } | 1249 | } |
1250 | } | 1250 | } |
1251 | setModified( true ); | 1251 | setModified( true ); |
1252 | } | 1252 | } |
1253 | delete storage; | 1253 | delete storage; |
1254 | delete calendar; | 1254 | delete calendar; |