author | zautrix <zautrix> | 2004-10-28 18:28:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-28 18:28:07 (UTC) |
commit | 43f40fe1bbc57d3b57d2a715accb51a7c8e473e1 (patch) (unidiff) | |
tree | a85c2f1229f4c4d9391719c414add5fe9d4f4480 /korganizer/calendarview.cpp | |
parent | a9ca33a6c78026396ff081572e96f0d1e3eb63fa (diff) | |
download | kdepimpi-43f40fe1bbc57d3b57d2a715accb51a7c8e473e1.zip kdepimpi-43f40fe1bbc57d3b57d2a715accb51a7c8e473e1.tar.gz kdepimpi-43f40fe1bbc57d3b57d2a715accb51a7c8e473e1.tar.bz2 |
makefile back
-rw-r--r-- | korganizer/calendarview.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 4e29d6f..59bf615 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1187,24 +1187,25 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1187 | eventLSync->setReadOnly( true ); | 1187 | eventLSync->setReadOnly( true ); |
1188 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // kde is abnormal... | 1188 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // kde is abnormal... |
1189 | remote->addEvent( eventRSync ); | 1189 | remote->addEvent( eventRSync ); |
1190 | else | 1190 | else |
1191 | delete eventRSync; | 1191 | delete eventRSync; |
1192 | QString mes; | 1192 | QString mes; |
1193 | 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 ); | 1193 | 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 ); |
1194 | QString delmess; | 1194 | QString delmess; |
1195 | if ( delFut ) { | 1195 | if ( delFut ) { |
1196 | 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); | 1196 | 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); |
1197 | mes += delmess; | 1197 | mes += delmess; |
1198 | } | 1198 | } |
1199 | mes = i18n("Local calendar changed!\n") +mes; | ||
1199 | mCalendar->checkAlarmForIncidence( 0, true ); | 1200 | mCalendar->checkAlarmForIncidence( 0, true ); |
1200 | qDebug( mes ); | 1201 | qDebug( mes ); |
1201 | if ( mSyncManager->mShowSyncSummary ) { | 1202 | if ( mSyncManager->mShowSyncSummary ) { |
1202 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, | 1203 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, |
1203 | i18n("KO/Pi Synchronization"),i18n("Write back"))) { | 1204 | i18n("KO/Pi Synchronization"),i18n("Write back"))) { |
1204 | qDebug("cancelled "); | 1205 | qDebug("cancelled "); |
1205 | return false; | 1206 | return false; |
1206 | } | 1207 | } |
1207 | } | 1208 | } |
1208 | return syncOK; | 1209 | return syncOK; |
1209 | } | 1210 | } |
1210 | 1211 | ||