summaryrefslogtreecommitdiffabout
path: root/korganizer/calendarview.cpp
Unidiff
Diffstat (limited to 'korganizer/calendarview.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/calendarview.cpp1
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
@@ -1175,48 +1175,49 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int
1175 inR = er.next(); 1175 inR = er.next();
1176 } 1176 }
1177 } 1177 }
1178 bar.hide(); 1178 bar.hide();
1179 mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); 1179 mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 );
1180 eventLSync->setReadOnly( false ); 1180 eventLSync->setReadOnly( false );
1181 eventLSync->setDtStart( mLastCalendarSync ); 1181 eventLSync->setDtStart( mLastCalendarSync );
1182 eventRSync->setDtStart( mLastCalendarSync ); 1182 eventRSync->setDtStart( mLastCalendarSync );
1183 eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); 1183 eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
1184 eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); 1184 eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) );
1185 eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; 1185 eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ;
1186 eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); 1186 eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName );
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
1211void CalendarView::setSyncDevice( QString s ) 1212void CalendarView::setSyncDevice( QString s )
1212{ 1213{
1213 mCurrentSyncDevice= s; 1214 mCurrentSyncDevice= s;
1214} 1215}
1215void CalendarView::setSyncName( QString s ) 1216void CalendarView::setSyncName( QString s )
1216{ 1217{
1217 mCurrentSyncName= s; 1218 mCurrentSyncName= s;
1218} 1219}
1219bool CalendarView::syncCalendar(QString filename, int mode) 1220bool CalendarView::syncCalendar(QString filename, int mode)
1220{ 1221{
1221 //qDebug("syncCalendar %s ", filename.latin1()); 1222 //qDebug("syncCalendar %s ", filename.latin1());
1222 mGlobalSyncMode = SYNC_MODE_NORMAL; 1223 mGlobalSyncMode = SYNC_MODE_NORMAL;