author | zautrix <zautrix> | 2004-10-15 14:26:07 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-15 14:26:07 (UTC) |
commit | 4f276d80bd977401d656851515474cc00c661e5b (patch) (unidiff) | |
tree | 0d3a747bef0431ef791b69876f5bda554f9ca83f /korganizer | |
parent | c2fb960297c4b08980921c818a4d347057732390 (diff) | |
download | kdepimpi-4f276d80bd977401d656851515474cc00c661e5b.zip kdepimpi-4f276d80bd977401d656851515474cc00c661e5b.tar.gz kdepimpi-4f276d80bd977401d656851515474cc00c661e5b.tar.bz2 |
many phone and sync fixes
-rw-r--r-- | korganizer/calendarview.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 3e0a27d..e4a11f5 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1121,26 +1121,28 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1121 | if ( ! mSyncManager->mWriteBackExistingOnly ) { | 1121 | if ( ! mSyncManager->mWriteBackExistingOnly ) { |
1122 | ++addedEventR; | 1122 | ++addedEventR; |
1123 | inL->setLastModified( modifiedCalendar ); | 1123 | inL->setLastModified( modifiedCalendar ); |
1124 | remote->addIncidence( inL->clone() ); | 1124 | remote->addIncidence( inL->clone() ); |
1125 | } | 1125 | } |
1126 | } | 1126 | } |
1127 | } | 1127 | } |
1128 | } | 1128 | } |
1129 | } | 1129 | } |
1130 | inL = el.next(); | 1130 | inL = el.next(); |
1131 | } | 1131 | } |
1132 | int delFut = 0; | 1132 | int delFut = 0; |
1133 | int remRem = 0; | ||
1133 | if ( mSyncManager->mWriteBackInFuture ) { | 1134 | if ( mSyncManager->mWriteBackInFuture ) { |
1134 | er = remote->rawIncidences(); | 1135 | er = remote->rawIncidences(); |
1136 | remRem = er.count(); | ||
1135 | inR = er.first(); | 1137 | inR = er.first(); |
1136 | QDateTime dt; | 1138 | QDateTime dt; |
1137 | QDateTime cur = QDateTime::currentDateTime().addDays( -7 ); | 1139 | QDateTime cur = QDateTime::currentDateTime().addDays( -7 ); |
1138 | QDateTime end = cur.addDays( (mSyncManager->mWriteBackInFuture +1 ) *7 ); | 1140 | QDateTime end = cur.addDays( (mSyncManager->mWriteBackInFuture +1 ) *7 ); |
1139 | while ( inR ) { | 1141 | while ( inR ) { |
1140 | if ( inR->type() == "Todo" ) { | 1142 | if ( inR->type() == "Todo" ) { |
1141 | Todo * t = (Todo*)inR; | 1143 | Todo * t = (Todo*)inR; |
1142 | if ( t->hasDueDate() ) | 1144 | if ( t->hasDueDate() ) |
1143 | dt = t->dtDue(); | 1145 | dt = t->dtDue(); |
1144 | else | 1146 | else |
1145 | dt = cur.addSecs( 62 ); | 1147 | dt = cur.addSecs( 62 ); |
1146 | } | 1148 | } |
@@ -1166,25 +1168,25 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1166 | eventRSync->setDtStart( mLastCalendarSync ); | 1168 | eventRSync->setDtStart( mLastCalendarSync ); |
1167 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1169 | eventLSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1168 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); | 1170 | eventRSync->setDtEnd( mLastCalendarSync.addSecs( 3600 ) ); |
1169 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; | 1171 | eventRSync->setLocation( i18n("Remote from: ")+mCurrentSyncName ) ; |
1170 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); | 1172 | eventLSync->setLocation(i18n("Local from: ") + mCurrentSyncName ); |
1171 | eventLSync->setReadOnly( true ); | 1173 | eventLSync->setReadOnly( true ); |
1172 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) | 1174 | if ( mGlobalSyncMode == SYNC_MODE_NORMAL) |
1173 | remote->addEvent( eventRSync ); | 1175 | remote->addEvent( eventRSync ); |
1174 | QString mes; | 1176 | QString mes; |
1175 | 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 ); | 1177 | 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 ); |
1176 | QString delmess; | 1178 | QString delmess; |
1177 | if ( delFut ) { | 1179 | if ( delFut ) { |
1178 | delmess.sprintf( i18n("%d items skipped on remote,\nbecause they are in the past or\nmore than %d weeks in the future.\n"),delFut, mSyncManager->mWriteBackInFuture ); | 1180 | 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); |
1179 | mes += delmess; | 1181 | mes += delmess; |
1180 | } | 1182 | } |
1181 | if ( mSyncManager->mShowSyncSummary ) { | 1183 | if ( mSyncManager->mShowSyncSummary ) { |
1182 | KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); | 1184 | KMessageBox::information(this, mes, i18n("KO/Pi Synchronization") ); |
1183 | } | 1185 | } |
1184 | qDebug( mes ); | 1186 | qDebug( mes ); |
1185 | mCalendar->checkAlarmForIncidence( 0, true ); | 1187 | mCalendar->checkAlarmForIncidence( 0, true ); |
1186 | return syncOK; | 1188 | return syncOK; |
1187 | } | 1189 | } |
1188 | 1190 | ||
1189 | void CalendarView::setSyncDevice( QString s ) | 1191 | void CalendarView::setSyncDevice( QString s ) |
1190 | { | 1192 | { |