-rw-r--r-- | korganizer/calendarview.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 685bb60..da1edea 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -926,2 +926,4 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
926 | int changedRemote = 0; | 926 | int changedRemote = 0; |
927 | int filteredIN = 0; | ||
928 | int filteredOUT = 0; | ||
927 | //QPtrList<Event> el = local->rawEvents(); | 929 | //QPtrList<Event> el = local->rawEvents(); |
@@ -1103,2 +1105,4 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1103 | } | 1105 | } |
1106 | } else { | ||
1107 | ++filteredIN; | ||
1104 | } | 1108 | } |
@@ -1130,8 +1134,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1130 | skipIncidence = true; | 1134 | skipIncidence = true; |
1131 | if ( filterOUT && ! filterOUT->filterCalendarItem( inL ) ){ | ||
1132 | skipIncidence = true; | ||
1133 | } | ||
1134 | if ( !skipIncidence ) { | 1135 | if ( !skipIncidence ) { |
1135 | inR = remote->incidence( uid ); | 1136 | inR = remote->incidence( uid ); |
1136 | if ( ! inR ) { // no conflict ********** add or delete local | 1137 | if ( ! inR ) { |
1138 | if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ | ||
1139 | // no conflict ********** add or delete local | ||
1137 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1140 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
@@ -1168,2 +1171,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1168 | } | 1171 | } |
1172 | } else { | ||
1173 | ++filteredOUT; | ||
1174 | } | ||
1169 | } | 1175 | } |
@@ -1220,3 +1226,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1220 | QString mes; | 1226 | QString mes; |
1221 | 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 ); | 1227 | 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 ); |
1222 | QString delmess; | 1228 | QString delmess; |