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 | |
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 | |||
@@ -1154,18 +1154,18 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
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 | } |
@@ -1198,17 +1198,17 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
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"))) { |