author | zautrix <zautrix> | 2005-02-09 20:56:06 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-09 20:56:06 (UTC) |
commit | ab7725c4517a1f6c145075edcff0bdafe105f0ea (patch) (unidiff) | |
tree | e1a230bcb5c31ca695bbebc40ff80874f2f13380 /korganizer | |
parent | a9eff860d8399a198a9fdc04e09ed369097fc745 (diff) | |
download | kdepimpi-ab7725c4517a1f6c145075edcff0bdafe105f0ea.zip kdepimpi-ab7725c4517a1f6c145075edcff0bdafe105f0ea.tar.gz kdepimpi-ab7725c4517a1f6c145075edcff0bdafe105f0ea.tar.bz2 |
fixes
-rw-r--r-- | korganizer/calendarview.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index a9de65a..7c8316f 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1218,25 +1218,26 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1218 | QString delmess; | 1218 | QString delmess; |
1219 | if ( delFut ) { | 1219 | if ( delFut ) { |
1220 | 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); | 1220 | 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); |
1221 | mes += delmess; | 1221 | mes += delmess; |
1222 | } | 1222 | } |
1223 | mes = i18n("Local calendar changed!\n") +mes; | 1223 | mes = i18n("Local calendar changed!\n") +mes; |
1224 | mCalendar->checkAlarmForIncidence( 0, true ); | 1224 | mCalendar->checkAlarmForIncidence( 0, true ); |
1225 | qDebug( mes ); | 1225 | qDebug( mes ); |
1226 | if ( mSyncManager->mShowSyncSummary ) { | 1226 | if ( mSyncManager->mShowSyncSummary ) { |
1227 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, | 1227 | if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes, |
1228 | i18n("KO/Pi Synchronization"),i18n("Write back"))) { | 1228 | i18n("KO/Pi Synchronization"),i18n("Write back"))) { |
1229 | qDebug("KO: WB cancelled "); | 1229 | qDebug("KO: WB cancelled "); |
1230 | return false; | 1230 | mSyncManager->mWriteBackFile = false; |
1231 | return syncOK; | ||
1231 | } | 1232 | } |
1232 | } | 1233 | } |
1233 | return syncOK; | 1234 | return syncOK; |
1234 | } | 1235 | } |
1235 | 1236 | ||
1236 | void CalendarView::setSyncDevice( QString s ) | 1237 | void CalendarView::setSyncDevice( QString s ) |
1237 | { | 1238 | { |
1238 | mCurrentSyncDevice= s; | 1239 | mCurrentSyncDevice= s; |
1239 | } | 1240 | } |
1240 | void CalendarView::setSyncName( QString s ) | 1241 | void CalendarView::setSyncName( QString s ) |
1241 | { | 1242 | { |
1242 | mCurrentSyncName= s; | 1243 | mCurrentSyncName= s; |