author | zautrix <zautrix> | 2005-01-17 12:47:46 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-01-17 12:47:46 (UTC) |
commit | 214b82c86bd5365d7a5fc786c8c9c7231ec6dc77 (patch) (unidiff) | |
tree | 9b6052411933ccd1a15428c8f747f0143db4690d | |
parent | ba5e5a22ad492f798b2626026cc1838b731e055b (diff) | |
download | kdepimpi-214b82c86bd5365d7a5fc786c8c9c7231ec6dc77.zip kdepimpi-214b82c86bd5365d7a5fc786c8c9c7231ec6dc77.tar.gz kdepimpi-214b82c86bd5365d7a5fc786c8c9c7231ec6dc77.tar.bz2 |
small cal fix
-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 | |||
@@ -925,4 +925,6 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
925 | int changedLocal = 0; | 925 | int changedLocal = 0; |
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(); |
928 | Event* eventR; | 930 | Event* eventR; |
@@ -1102,4 +1104,6 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1102 | } | 1104 | } |
1103 | } | 1105 | } |
1106 | } else { | ||
1107 | ++filteredIN; | ||
1104 | } | 1108 | } |
1105 | } | 1109 | } |
@@ -1129,10 +1133,9 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1129 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" ) | 1133 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" ) |
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 ) { |
1138 | if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { | 1141 | if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { |
@@ -1167,4 +1170,7 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1167 | } | 1170 | } |
1168 | } | 1171 | } |
1172 | } else { | ||
1173 | ++filteredOUT; | ||
1174 | } | ||
1169 | } | 1175 | } |
1170 | } | 1176 | } |
@@ -1219,5 +1225,5 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1219 | delete eventRSync; | 1225 | delete eventRSync; |
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; |
1223 | if ( delFut ) { | 1229 | if ( delFut ) { |