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/calendarview.cpp | |
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 | |||
@@ -1182,97 +1182,98 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1182 | else | 1182 | else |
1183 | dt = cur.addSecs( 62 ); | 1183 | dt = cur.addSecs( 62 ); |
1184 | } | 1184 | } |
1185 | else if (inR->type() == "Event" ) { | 1185 | else if (inR->type() == "Event" ) { |
1186 | bool ok; | 1186 | bool ok; |
1187 | dt = inR->getNextOccurence( cur, &ok ); | 1187 | dt = inR->getNextOccurence( cur, &ok ); |
1188 | if ( !ok ) | 1188 | if ( !ok ) |
1189 | dt = cur.addSecs( -62 ); | 1189 | dt = cur.addSecs( -62 ); |
1190 | } | 1190 | } |
1191 | else | 1191 | else |
1192 | dt = inR->dtStart(); | 1192 | dt = inR->dtStart(); |
1193 | if ( dt < cur || dt > end ) { | 1193 | if ( dt < cur || dt > end ) { |
1194 | remote->deleteIncidence( inR ); | 1194 | remote->deleteIncidence( inR ); |
1195 | ++delFut; | 1195 | ++delFut; |
1196 | } | 1196 | } |
1197 | inR = er.next(); | 1197 | inR = er.next(); |
1198 | } | 1198 | } |
1199 | } | 1199 | } |
1200 | bar.hide(); | 1200 | bar.hide(); |
1201 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); | 1201 | mLastCalendarSync = QDateTime::currentDateTime().addSecs( 1 ); |
1202 | eventLSync->setReadOnly( false ); | 1202 | eventLSync->setReadOnly( false ); |
1203 | eventLSync->setDtStart( mLastCalendarSync ); | 1203 | eventLSync->setDtStart( mLastCalendarSync ); |
1204 | eventRSync->setDtStart( mLastCalendarSync ); | 1204 | eventRSync->setDtStart( mLastCalendarSync ); |
1205 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1205 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1206 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1206 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1207 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; | 1207 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; |
1208 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); | 1208 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); |
1209 | eventLSync->setReadOnly( true ); | 1209 | eventLSync->setReadOnly( true ); |
1210 | qDebug("KO: Normal sync: %d ",mGlobalSyncMode == SYNC_MODE_NORMAL ); | 1210 | qDebug("KO: Normal sync: %d ",mGlobalSyncMode == SYNC_MODE_NORMAL ); |
1211 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // kde is abnormal... | 1211 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL && !mSyncManager->syncWithDesktop()) // kde is abnormal... |
1212 | remote->addEvent( eventRSync ); | 1212 | remote->addEvent( eventRSync ); |
1213 | else | 1213 | else |
1214 | delete eventRSync; | 1214 | delete eventRSync; |
1215 | qDebug("KO: Sync with desktop %d ",mSyncManager->syncWithDesktop() ); | 1215 | qDebug("KO: Sync with desktop %d ",mSyncManager->syncWithDesktop() ); |
1216 | QString mes; | 1216 | QString mes; |
1217 | 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 %d incoming filtered out\n %d outgoing filtered out\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR, filteredIN, filteredOUT ); | 1217 | 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 %d incoming filtered out\n %d outgoing filtered out\n"),addedEvent, addedEventR, changedLocal, changedRemote, deletedEventL, deletedEventR, filteredIN, filteredOUT ); |
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; |
1243 | } | 1244 | } |
1244 | bool CalendarView::syncCalendar(QString filename, int mode) | 1245 | bool CalendarView::syncCalendar(QString filename, int mode) |
1245 | { | 1246 | { |
1246 | //qDebug("syncCalendar %s ", filename.latin1()); | 1247 | //qDebug("syncCalendar %s ", filename.latin1()); |
1247 | mGlobalSyncMode = SYNC_MODE_NORMAL; | 1248 | mGlobalSyncMode = SYNC_MODE_NORMAL; |
1248 | CalendarLocal* calendar = new CalendarLocal(); | 1249 | CalendarLocal* calendar = new CalendarLocal(); |
1249 | calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); | 1250 | calendar->setTimeZoneId(KPimGlobalPrefs::instance()->mTimeZoneId); |
1250 | FileStorage* storage = new FileStorage( calendar ); | 1251 | FileStorage* storage = new FileStorage( calendar ); |
1251 | bool syncOK = false; | 1252 | bool syncOK = false; |
1252 | storage->setFileName( filename ); | 1253 | storage->setFileName( filename ); |
1253 | // qDebug("loading ... "); | 1254 | // qDebug("loading ... "); |
1254 | if ( storage->load() ) { | 1255 | if ( storage->load() ) { |
1255 | getEventViewerDialog()->setSyncMode( true ); | 1256 | getEventViewerDialog()->setSyncMode( true ); |
1256 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); | 1257 | syncOK = synchronizeCalendar( mCalendar, calendar, mode ); |
1257 | getEventViewerDialog()->setSyncMode( false ); | 1258 | getEventViewerDialog()->setSyncMode( false ); |
1258 | if ( syncOK ) { | 1259 | if ( syncOK ) { |
1259 | if ( mSyncManager->mWriteBackFile ) | 1260 | if ( mSyncManager->mWriteBackFile ) |
1260 | { | 1261 | { |
1261 | storage->setSaveFormat( new ICalFormat() ); | 1262 | storage->setSaveFormat( new ICalFormat() ); |
1262 | storage->save(); | 1263 | storage->save(); |
1263 | } | 1264 | } |
1264 | } | 1265 | } |
1265 | setModified( true ); | 1266 | setModified( true ); |
1266 | } | 1267 | } |
1267 | delete storage; | 1268 | delete storage; |
1268 | delete calendar; | 1269 | delete calendar; |
1269 | if ( syncOK ) | 1270 | if ( syncOK ) |
1270 | updateView(); | 1271 | updateView(); |
1271 | return syncOK; | 1272 | return syncOK; |
1272 | } | 1273 | } |
1273 | 1274 | ||
1274 | void CalendarView::syncExternal( int mode ) | 1275 | void CalendarView::syncExternal( int mode ) |
1275 | { | 1276 | { |
1276 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; | 1277 | mGlobalSyncMode = SYNC_MODE_EXTERNAL; |
1277 | 1278 | ||
1278 | qApp->processEvents(); | 1279 | qApp->processEvents(); |