| -rw-r--r-- | korganizer/calendarview.cpp | 8 | ||||
| -rw-r--r-- | korganizer/filtereditdialog.cpp | 7 |
2 files changed, 15 insertions, 0 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 8258c74..02c5e45 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp @@ -1079,2 +1079,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } else { + if ( !filterIN || filterIN->filterCalendarItem( inR ) ){ inR->setLastModified( modifiedCalendar ); @@ -1087,4 +1088,6 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } + } } else { if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { + if ( !filterIN || filterIN->filterCalendarItem( inR ) ){ inR->setLastModified( modifiedCalendar ); @@ -1094,2 +1097,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int ++addedEvent; + } } else { @@ -1136,2 +1140,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int if ( ! mSyncManager->mWriteBackExistingOnly ) { + if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ inL->removeID(mCurrentSyncDevice ); @@ -1146,2 +1151,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } + } } else { @@ -1153,2 +1159,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int if ( ! mSyncManager->mWriteBackExistingOnly ) { + if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ ++addedEventR; @@ -1163,2 +1170,3 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int } + } inL = el.next(); diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp index ca09844..df84911 100644 --- a/korganizer/filtereditdialog.cpp +++ b/korganizer/filtereditdialog.cpp @@ -238,2 +238,6 @@ void FilterEditDialog::readFilter(CalFilter *filter) + mEditor->mEventCheck->setChecked(c & CalFilter::HideEvents); + mEditor->mTodoCheck->setChecked(c & CalFilter::HideTodos); + mEditor->mJournalCheck->setChecked(c & CalFilter::HideJournals); + if (c & CalFilter::ShowCategories) { @@ -261,2 +265,5 @@ void FilterEditDialog::writeFilter(CalFilter *filter) if (mEditor->mConfidentialCheck->isChecked()) c |= CalFilter::ShowConfidential; + if (mEditor->mEventCheck->isChecked()) c |= CalFilter::HideEvents; + if (mEditor->mTodoCheck->isChecked()) c |= CalFilter::HideTodos; + if (mEditor->mJournalCheck->isChecked()) c |= CalFilter::HideJournals; |