-rw-r--r-- | korganizer/calendarview.cpp | 58 | ||||
-rw-r--r-- | korganizer/filtereditdialog.cpp | 7 | ||||
-rw-r--r-- | libkcal/calfilter.cpp | 29 | ||||
-rw-r--r-- | libkcal/calfilter.h | 3 |
4 files changed, 62 insertions, 35 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index 8258c74..02c5e45 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -1056,127 +1056,135 @@ bool CalendarView::synchronizeCalendar( Calendar* local, Calendar* remote, int | |||
1056 | local->deleteIncidence( inL ); | 1056 | local->deleteIncidence( inL ); |
1057 | inL = inR->clone(); | 1057 | inL = inR->clone(); |
1058 | if ( mSyncManager->syncWithDesktop() ) | 1058 | if ( mSyncManager->syncWithDesktop() ) |
1059 | inL->setPilotId( pid ); | 1059 | inL->setPilotId( pid ); |
1060 | inL->setIDStr( idS ); | 1060 | inL->setIDStr( idS ); |
1061 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1061 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1062 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); | 1062 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); |
1063 | inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) ); | 1063 | inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) ); |
1064 | } | 1064 | } |
1065 | local->addIncidence( inL ); | 1065 | local->addIncidence( inL ); |
1066 | ++changedLocal; | 1066 | ++changedLocal; |
1067 | } | 1067 | } |
1068 | } | 1068 | } |
1069 | } else { // no conflict ********** add or delete remote | 1069 | } else { // no conflict ********** add or delete remote |
1070 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1070 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1071 | QString des = eventLSync->description(); | 1071 | QString des = eventLSync->description(); |
1072 | QString pref = "e"; | 1072 | QString pref = "e"; |
1073 | if ( inR->type() == "Todo" ) | 1073 | if ( inR->type() == "Todo" ) |
1074 | pref = "t"; | 1074 | pref = "t"; |
1075 | if ( des.find(pref+ inR->getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it | 1075 | if ( des.find(pref+ inR->getID(mCurrentSyncDevice) +"," ) >= 0 && mode != 5) { // delete it |
1076 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); | 1076 | inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE ); |
1077 | //remote->deleteIncidence( inR ); | 1077 | //remote->deleteIncidence( inR ); |
1078 | ++deletedEventR; | 1078 | ++deletedEventR; |
1079 | } else { | 1079 | } else { |
1080 | inR->setLastModified( modifiedCalendar ); | 1080 | if ( !filterIN || filterIN->filterCalendarItem( inR ) ){ |
1081 | inL = inR->clone(); | 1081 | inR->setLastModified( modifiedCalendar ); |
1082 | inL->setIDStr( ":" ); | 1082 | inL = inR->clone(); |
1083 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); | 1083 | inL->setIDStr( ":" ); |
1084 | inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) ); | 1084 | inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) ); |
1085 | local->addIncidence( inL ); | 1085 | inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) ); |
1086 | ++addedEvent; | 1086 | local->addIncidence( inL ); |
1087 | ++addedEvent; | ||
1088 | } | ||
1087 | } | 1089 | } |
1088 | } else { | 1090 | } else { |
1089 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { | 1091 | if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) { |
1090 | inR->setLastModified( modifiedCalendar ); | 1092 | if ( !filterIN || filterIN->filterCalendarItem( inR ) ){ |
1091 | inL = inR->clone(); | 1093 | inR->setLastModified( modifiedCalendar ); |
1092 | inL->setIDStr( ":" ); | 1094 | inL = inR->clone(); |
1093 | local->addIncidence( inL ); | 1095 | inL->setIDStr( ":" ); |
1094 | ++addedEvent; | 1096 | local->addIncidence( inL ); |
1097 | ++addedEvent; | ||
1098 | } | ||
1095 | } else { | 1099 | } else { |
1096 | checkExternSyncEvent(eventRSyncSharp, inR); | 1100 | checkExternSyncEvent(eventRSyncSharp, inR); |
1097 | remote->deleteIncidence( inR ); | 1101 | remote->deleteIncidence( inR ); |
1098 | ++deletedEventR; | 1102 | ++deletedEventR; |
1099 | } | 1103 | } |
1100 | } | 1104 | } |
1101 | } | 1105 | } |
1102 | } | 1106 | } |
1103 | inR = er.next(); | 1107 | inR = er.next(); |
1104 | } | 1108 | } |
1105 | QPtrList<Incidence> el = local->rawIncidences(); | 1109 | QPtrList<Incidence> el = local->rawIncidences(); |
1106 | inL = el.first(); | 1110 | inL = el.first(); |
1107 | modulo = (el.count()/10)+1; | 1111 | modulo = (el.count()/10)+1; |
1108 | bar.setCaption (i18n("Add / remove events") ); | 1112 | bar.setCaption (i18n("Add / remove events") ); |
1109 | bar.setTotalSteps ( el.count() ) ; | 1113 | bar.setTotalSteps ( el.count() ) ; |
1110 | bar.show(); | 1114 | bar.show(); |
1111 | incCounter = 0; | 1115 | incCounter = 0; |
1112 | 1116 | ||
1113 | while ( inL ) { | 1117 | while ( inL ) { |
1114 | 1118 | ||
1115 | qApp->processEvents(); | 1119 | qApp->processEvents(); |
1116 | if ( ! bar.isVisible() ) | 1120 | if ( ! bar.isVisible() ) |
1117 | return false; | 1121 | return false; |
1118 | if ( incCounter % modulo == 0 ) | 1122 | if ( incCounter % modulo == 0 ) |
1119 | bar.setProgress( incCounter ); | 1123 | bar.setProgress( incCounter ); |
1120 | ++incCounter; | 1124 | ++incCounter; |
1121 | uid = inL->uid(); | 1125 | uid = inL->uid(); |
1122 | bool skipIncidence = false; | 1126 | bool skipIncidence = false; |
1123 | if ( uid.left(15) == QString("last-syncEvent-") ) | 1127 | if ( uid.left(15) == QString("last-syncEvent-") ) |
1124 | skipIncidence = true; | 1128 | skipIncidence = true; |
1125 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" ) | 1129 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL && inL->type() == "Journal" ) |
1126 | skipIncidence = true; | 1130 | skipIncidence = true; |
1127 | if ( !skipIncidence ) { | 1131 | if ( !skipIncidence ) { |
1128 | inR = remote->incidence( uid ); | 1132 | inR = remote->incidence( uid ); |
1129 | if ( ! inR ) { // no conflict ********** add or delete local | 1133 | if ( ! inR ) { // no conflict ********** add or delete local |
1130 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { | 1134 | if ( mGlobalSyncMode == SYNC_MODE_EXTERNAL ) { |
1131 | if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { | 1135 | if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) { |
1132 | checkExternSyncEvent(eventLSyncSharp, inL); | 1136 | checkExternSyncEvent(eventLSyncSharp, inL); |
1133 | local->deleteIncidence( inL ); | 1137 | local->deleteIncidence( inL ); |
1134 | ++deletedEventL; | 1138 | ++deletedEventL; |
1135 | } else { | 1139 | } else { |
1136 | if ( ! mSyncManager->mWriteBackExistingOnly ) { | 1140 | if ( ! mSyncManager->mWriteBackExistingOnly ) { |
1137 | inL->removeID(mCurrentSyncDevice ); | 1141 | if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ |
1138 | ++addedEventR; | 1142 | inL->removeID(mCurrentSyncDevice ); |
1139 | //qDebug("remote added Incidence %s ", inL->summary().latin1()); | 1143 | ++addedEventR; |
1140 | inL->setLastModified( modifiedCalendar ); | 1144 | //qDebug("remote added Incidence %s ", inL->summary().latin1()); |
1141 | inR = inL->clone(); | 1145 | inL->setLastModified( modifiedCalendar ); |
1142 | inR->setIDStr( ":" ); | 1146 | inR = inL->clone(); |
1143 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); | 1147 | inR->setIDStr( ":" ); |
1144 | remote->addIncidence( inR ); | 1148 | inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL ); |
1149 | remote->addIncidence( inR ); | ||
1150 | } | ||
1145 | } | 1151 | } |
1146 | } | 1152 | } |
1147 | } else { | 1153 | } else { |
1148 | if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) { | 1154 | if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) { |
1149 | checkExternSyncEvent(eventLSyncSharp, inL); | 1155 | checkExternSyncEvent(eventLSyncSharp, inL); |
1150 | local->deleteIncidence( inL ); | 1156 | local->deleteIncidence( inL ); |
1151 | ++deletedEventL; | 1157 | ++deletedEventL; |
1152 | } else { | 1158 | } else { |
1153 | if ( ! mSyncManager->mWriteBackExistingOnly ) { | 1159 | if ( ! mSyncManager->mWriteBackExistingOnly ) { |
1154 | ++addedEventR; | 1160 | if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){ |
1155 | inL->setLastModified( modifiedCalendar ); | 1161 | ++addedEventR; |
1156 | inR = inL->clone(); | 1162 | inL->setLastModified( modifiedCalendar ); |
1157 | inR->setIDStr( ":" ); | 1163 | inR = inL->clone(); |
1158 | remote->addIncidence( inR ); | 1164 | inR->setIDStr( ":" ); |
1165 | remote->addIncidence( inR ); | ||
1166 | } | ||
1159 | } | 1167 | } |
1160 | } | 1168 | } |
1161 | } | 1169 | } |
1162 | } | 1170 | } |
1163 | } | 1171 | } |
1164 | inL = el.next(); | 1172 | inL = el.next(); |
1165 | } | 1173 | } |
1166 | int delFut = 0; | 1174 | int delFut = 0; |
1167 | int remRem = 0; | 1175 | int remRem = 0; |
1168 | if ( mSyncManager->mWriteBackInFuture ) { | 1176 | if ( mSyncManager->mWriteBackInFuture ) { |
1169 | er = remote->rawIncidences(); | 1177 | er = remote->rawIncidences(); |
1170 | remRem = er.count(); | 1178 | remRem = er.count(); |
1171 | inR = er.first(); | 1179 | inR = er.first(); |
1172 | QDateTime dt; | 1180 | QDateTime dt; |
1173 | QDateTime cur = QDateTime::currentDateTime().addDays( -(mSyncManager->mWriteBackInPast * 7) ); | 1181 | QDateTime cur = QDateTime::currentDateTime().addDays( -(mSyncManager->mWriteBackInPast * 7) ); |
1174 | QDateTime end = QDateTime::currentDateTime().addDays( (mSyncManager->mWriteBackInFuture ) *7 ); | 1182 | QDateTime end = QDateTime::currentDateTime().addDays( (mSyncManager->mWriteBackInFuture ) *7 ); |
1175 | while ( inR ) { | 1183 | while ( inR ) { |
1176 | if ( inR->type() == "Todo" ) { | 1184 | if ( inR->type() == "Todo" ) { |
1177 | Todo * t = (Todo*)inR; | 1185 | Todo * t = (Todo*)inR; |
1178 | if ( t->hasDueDate() ) | 1186 | if ( t->hasDueDate() ) |
1179 | dt = t->dtDue(); | 1187 | dt = t->dtDue(); |
1180 | else | 1188 | else |
1181 | dt = cur.addSecs( 62 ); | 1189 | dt = cur.addSecs( 62 ); |
1182 | } | 1190 | } |
diff --git a/korganizer/filtereditdialog.cpp b/korganizer/filtereditdialog.cpp index ca09844..df84911 100644 --- a/korganizer/filtereditdialog.cpp +++ b/korganizer/filtereditdialog.cpp | |||
@@ -214,57 +214,64 @@ void FilterEditDialog::editCategorySelection() | |||
214 | 214 | ||
215 | void FilterEditDialog::updateCategorySelection(const QStringList &categories) | 215 | void FilterEditDialog::updateCategorySelection(const QStringList &categories) |
216 | { | 216 | { |
217 | mCategories = categories; | 217 | mCategories = categories; |
218 | 218 | ||
219 | mEditor->mCatList->clear(); | 219 | mEditor->mCatList->clear(); |
220 | mEditor->mCatList->insertStringList(mCategories); | 220 | mEditor->mCatList->insertStringList(mCategories); |
221 | } | 221 | } |
222 | 222 | ||
223 | void FilterEditDialog::filterSelected() | 223 | void FilterEditDialog::filterSelected() |
224 | { | 224 | { |
225 | CalFilter *f = mFilters->at(mSelectionCombo->currentItem()); | 225 | CalFilter *f = mFilters->at(mSelectionCombo->currentItem()); |
226 | if (f) readFilter(f); | 226 | if (f) readFilter(f); |
227 | } | 227 | } |
228 | 228 | ||
229 | void FilterEditDialog::readFilter(CalFilter *filter) | 229 | void FilterEditDialog::readFilter(CalFilter *filter) |
230 | { | 230 | { |
231 | int c = filter->criteria(); | 231 | int c = filter->criteria(); |
232 | 232 | ||
233 | mEditor->mCompletedCheck->setChecked(c & CalFilter::HideCompleted); | 233 | mEditor->mCompletedCheck->setChecked(c & CalFilter::HideCompleted); |
234 | mEditor->mRecurringCheck->setChecked(c & CalFilter::HideRecurring); | 234 | mEditor->mRecurringCheck->setChecked(c & CalFilter::HideRecurring); |
235 | mEditor->mPublicCheck->setChecked(c & CalFilter::ShowPublic); | 235 | mEditor->mPublicCheck->setChecked(c & CalFilter::ShowPublic); |
236 | mEditor->mPrivateCheck->setChecked(c & CalFilter::ShowPrivate); | 236 | mEditor->mPrivateCheck->setChecked(c & CalFilter::ShowPrivate); |
237 | mEditor->mConfidentialCheck->setChecked(c & CalFilter::ShowConfidential); | 237 | mEditor->mConfidentialCheck->setChecked(c & CalFilter::ShowConfidential); |
238 | |||
239 | mEditor->mEventCheck->setChecked(c & CalFilter::HideEvents); | ||
240 | mEditor->mTodoCheck->setChecked(c & CalFilter::HideTodos); | ||
241 | mEditor->mJournalCheck->setChecked(c & CalFilter::HideJournals); | ||
238 | 242 | ||
239 | if (c & CalFilter::ShowCategories) { | 243 | if (c & CalFilter::ShowCategories) { |
240 | mEditor->mCatShowCheck->setChecked(true); | 244 | mEditor->mCatShowCheck->setChecked(true); |
241 | } else { | 245 | } else { |
242 | mEditor->mCatHideCheck->setChecked(true); | 246 | mEditor->mCatHideCheck->setChecked(true); |
243 | } | 247 | } |
244 | 248 | ||
245 | mEditor->mCatList->clear(); | 249 | mEditor->mCatList->clear(); |
246 | mEditor->mCatList->insertStringList(filter->categoryList()); | 250 | mEditor->mCatList->insertStringList(filter->categoryList()); |
247 | mCategories = filter->categoryList(); | 251 | mCategories = filter->categoryList(); |
248 | 252 | ||
249 | setCaption( i18n("Filter position: ") + QString::number ( mSelectionCombo->currentItem()+1 )); | 253 | setCaption( i18n("Filter position: ") + QString::number ( mSelectionCombo->currentItem()+1 )); |
250 | } | 254 | } |
251 | 255 | ||
252 | void FilterEditDialog::writeFilter(CalFilter *filter) | 256 | void FilterEditDialog::writeFilter(CalFilter *filter) |
253 | { | 257 | { |
254 | int c = 0; | 258 | int c = 0; |
255 | 259 | ||
256 | if (mEditor->mCompletedCheck->isChecked()) c |= CalFilter::HideCompleted; | 260 | if (mEditor->mCompletedCheck->isChecked()) c |= CalFilter::HideCompleted; |
257 | if (mEditor->mRecurringCheck->isChecked()) c |= CalFilter::HideRecurring; | 261 | if (mEditor->mRecurringCheck->isChecked()) c |= CalFilter::HideRecurring; |
258 | if (mEditor->mCatShowCheck->isChecked()) c |= CalFilter::ShowCategories; | 262 | if (mEditor->mCatShowCheck->isChecked()) c |= CalFilter::ShowCategories; |
259 | if (mEditor->mPublicCheck->isChecked()) c |= CalFilter::ShowPublic; | 263 | if (mEditor->mPublicCheck->isChecked()) c |= CalFilter::ShowPublic; |
260 | if (mEditor->mPrivateCheck->isChecked()) c |= CalFilter::ShowPrivate; | 264 | if (mEditor->mPrivateCheck->isChecked()) c |= CalFilter::ShowPrivate; |
261 | if (mEditor->mConfidentialCheck->isChecked()) c |= CalFilter::ShowConfidential; | 265 | if (mEditor->mConfidentialCheck->isChecked()) c |= CalFilter::ShowConfidential; |
266 | if (mEditor->mEventCheck->isChecked()) c |= CalFilter::HideEvents; | ||
267 | if (mEditor->mTodoCheck->isChecked()) c |= CalFilter::HideTodos; | ||
268 | if (mEditor->mJournalCheck->isChecked()) c |= CalFilter::HideJournals; | ||
262 | 269 | ||
263 | filter->setCriteria(c); | 270 | filter->setCriteria(c); |
264 | 271 | ||
265 | QStringList categoryList; | 272 | QStringList categoryList; |
266 | for(uint i=0;i<mEditor->mCatList->count();++i) { | 273 | for(uint i=0;i<mEditor->mCatList->count();++i) { |
267 | categoryList.append(mEditor->mCatList->text(i)); | 274 | categoryList.append(mEditor->mCatList->text(i)); |
268 | } | 275 | } |
269 | filter->setCategoryList(categoryList); | 276 | filter->setCategoryList(categoryList); |
270 | } | 277 | } |
diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp index c182db5..c425dfc 100644 --- a/libkcal/calfilter.cpp +++ b/libkcal/calfilter.cpp | |||
@@ -43,79 +43,90 @@ CalFilter::~CalFilter() | |||
43 | 43 | ||
44 | void CalFilter::apply(QPtrList<Event> *eventlist) | 44 | void CalFilter::apply(QPtrList<Event> *eventlist) |
45 | { | 45 | { |
46 | if (!mEnabled) return; | 46 | if (!mEnabled) return; |
47 | 47 | ||
48 | // kdDebug(5800) << "CalFilter::apply()" << endl; | 48 | // kdDebug(5800) << "CalFilter::apply()" << endl; |
49 | 49 | ||
50 | Event *event = eventlist->first(); | 50 | Event *event = eventlist->first(); |
51 | while(event) { | 51 | while(event) { |
52 | if (!filterEvent(event)) { | 52 | if (!filterEvent(event)) { |
53 | eventlist->remove(); | 53 | eventlist->remove(); |
54 | event = eventlist->current(); | 54 | event = eventlist->current(); |
55 | } else { | 55 | } else { |
56 | event = eventlist->next(); | 56 | event = eventlist->next(); |
57 | } | 57 | } |
58 | } | 58 | } |
59 | 59 | ||
60 | // kdDebug(5800) << "CalFilter::apply() done" << endl; | 60 | // kdDebug(5800) << "CalFilter::apply() done" << endl; |
61 | } | 61 | } |
62 | 62 | ||
63 | // TODO: avoid duplicating apply() code | 63 | // TODO: avoid duplicating apply() code |
64 | void CalFilter::apply(QPtrList<Todo> *eventlist) | 64 | void CalFilter::apply(QPtrList<Todo> *eventlist) |
65 | { | 65 | { |
66 | if (!mEnabled) return; | 66 | if (!mEnabled) return; |
67 | |||
68 | // kdDebug(5800) << "CalFilter::apply()" << endl; | ||
69 | |||
70 | Todo *event = eventlist->first(); | 67 | Todo *event = eventlist->first(); |
71 | while(event) { | 68 | while(event) { |
72 | if (!filterTodo(event)) { | 69 | if (!filterTodo(event)) { |
73 | eventlist->remove(); | 70 | eventlist->remove(); |
74 | event = eventlist->current(); | 71 | event = eventlist->current(); |
75 | } else { | 72 | } else { |
76 | event = eventlist->next(); | 73 | event = eventlist->next(); |
77 | } | 74 | } |
78 | } | 75 | } |
79 | 76 | ||
80 | // kdDebug(5800) << "CalFilter::apply() done" << endl; | 77 | // kdDebug(5800) << "CalFilter::apply() done" << endl; |
81 | } | 78 | } |
82 | 79 | bool CalFilter::filterCalendarItem(Incidence *in) | |
80 | { | ||
81 | if ( in->type() == "Event" ) | ||
82 | return filterEvent( (Event*) in ); | ||
83 | else if ( in->type() =="Todo" ) | ||
84 | return filterTodo( (Todo*) in); | ||
85 | else if ( in->type() =="Journal" ) | ||
86 | return filterJournal( (Journal*) in ); | ||
87 | return false; | ||
88 | } | ||
83 | bool CalFilter::filterEvent(Event *event) | 89 | bool CalFilter::filterEvent(Event *event) |
84 | { | 90 | { |
85 | // kdDebug(5800) << "CalFilter::filterEvent(): " << event->getSummary() << endl; | 91 | if (mCriteria & HideEvents) |
86 | 92 | return false; | |
87 | if (mCriteria & HideRecurring) { | 93 | if (mCriteria & HideRecurring) { |
88 | if (event->recurrence()->doesRecur()) return false; | 94 | if (event->recurrence()->doesRecur()) return false; |
89 | } | 95 | } |
90 | 96 | ||
91 | return filterIncidence(event); | 97 | return filterIncidence(event); |
92 | } | 98 | } |
93 | 99 | bool CalFilter::filterJournal(Journal *j) | |
100 | { | ||
101 | if (mCriteria & HideJournals) | ||
102 | return false; | ||
103 | return true; | ||
104 | } | ||
94 | bool CalFilter::filterTodo(Todo *todo) | 105 | bool CalFilter::filterTodo(Todo *todo) |
95 | { | 106 | { |
96 | // kdDebug(5800) << "CalFilter::filterEvent(): " << event->getSummary() << endl; | 107 | if (mCriteria & HideTodos) |
97 | 108 | return false; | |
98 | if (mCriteria & HideCompleted) { | 109 | if (mCriteria & HideCompleted) { |
99 | if (todo->isCompleted()) return false; | 110 | if (todo->isCompleted()) return false; |
100 | } | 111 | } |
101 | 112 | ||
102 | return filterIncidence(todo); | 113 | return filterIncidence(todo); |
103 | } | 114 | } |
104 | bool CalFilter::showCategories() | 115 | bool CalFilter::showCategories() |
105 | { | 116 | { |
106 | return mCriteria & ShowCategories; | 117 | return mCriteria & ShowCategories; |
107 | } | 118 | } |
108 | int CalFilter::getSecrecy() | 119 | int CalFilter::getSecrecy() |
109 | { | 120 | { |
110 | if ( (mCriteria & ShowPublic )) | 121 | if ( (mCriteria & ShowPublic )) |
111 | return Incidence::SecrecyPublic; | 122 | return Incidence::SecrecyPublic; |
112 | if ( (mCriteria & ShowPrivate )) | 123 | if ( (mCriteria & ShowPrivate )) |
113 | return Incidence::SecrecyPrivate; | 124 | return Incidence::SecrecyPrivate; |
114 | if ( (mCriteria & ShowConfidential )) | 125 | if ( (mCriteria & ShowConfidential )) |
115 | return Incidence::SecrecyConfidential; | 126 | return Incidence::SecrecyConfidential; |
116 | return Incidence::SecrecyPublic; | 127 | return Incidence::SecrecyPublic; |
117 | } | 128 | } |
118 | bool CalFilter::filterIncidence(Incidence *incidence) | 129 | bool CalFilter::filterIncidence(Incidence *incidence) |
119 | { | 130 | { |
120 | if ( mCriteria > 7 ) { | 131 | if ( mCriteria > 7 ) { |
121 | switch (incidence->secrecy()) { | 132 | switch (incidence->secrecy()) { |
diff --git a/libkcal/calfilter.h b/libkcal/calfilter.h index 5ad0064..29db441 100644 --- a/libkcal/calfilter.h +++ b/libkcal/calfilter.h | |||
@@ -40,49 +40,50 @@ class CalFilter { | |||
40 | CalFilter(const QString &name); | 40 | CalFilter(const QString &name); |
41 | /** Destruct filter. */ | 41 | /** Destruct filter. */ |
42 | ~CalFilter(); | 42 | ~CalFilter(); |
43 | 43 | ||
44 | /** | 44 | /** |
45 | Set name of filter. | 45 | Set name of filter. |
46 | */ | 46 | */ |
47 | void setName(const QString &name) { mName = name; } | 47 | void setName(const QString &name) { mName = name; } |
48 | /** | 48 | /** |
49 | Return name of filter. | 49 | Return name of filter. |
50 | */ | 50 | */ |
51 | QString name() const { return mName; } | 51 | QString name() const { return mName; } |
52 | 52 | ||
53 | /** | 53 | /** |
54 | Apply filter to eventlist, all events not matching filter criterias are | 54 | Apply filter to eventlist, all events not matching filter criterias are |
55 | removed from the list. | 55 | removed from the list. |
56 | */ | 56 | */ |
57 | void apply(QPtrList<Event> *eventlist); | 57 | void apply(QPtrList<Event> *eventlist); |
58 | 58 | ||
59 | /** | 59 | /** |
60 | Apply filter to todolist, all todos not matching filter criterias are | 60 | Apply filter to todolist, all todos not matching filter criterias are |
61 | removed from the list. | 61 | removed from the list. |
62 | */ | 62 | */ |
63 | void apply(QPtrList<Todo> *todolist); | 63 | void apply(QPtrList<Todo> *todolist); |
64 | 64 | bool CalFilter::filterCalendarItem(Incidence *in); | |
65 | bool CalFilter::filterJournal(Journal *in); | ||
65 | /** | 66 | /** |
66 | Apply filter criteria on the specified event. Return true, if event passes | 67 | Apply filter criteria on the specified event. Return true, if event passes |
67 | criteria, otherwise return false. | 68 | criteria, otherwise return false. |
68 | */ | 69 | */ |
69 | bool filterEvent(Event *); | 70 | bool filterEvent(Event *); |
70 | 71 | ||
71 | /** | 72 | /** |
72 | Apply filter criteria on the specified todo. Return true, if event passes | 73 | Apply filter criteria on the specified todo. Return true, if event passes |
73 | criteria, otherwise return false. | 74 | criteria, otherwise return false. |
74 | */ | 75 | */ |
75 | bool filterTodo(Todo *); | 76 | bool filterTodo(Todo *); |
76 | 77 | ||
77 | /** | 78 | /** |
78 | Apply filter criteria on the specified incidence. Return true, if event passes | 79 | Apply filter criteria on the specified incidence. Return true, if event passes |
79 | criteria, otherwise return false. | 80 | criteria, otherwise return false. |
80 | */ | 81 | */ |
81 | bool filterIncidence(Incidence *); | 82 | bool filterIncidence(Incidence *); |
82 | 83 | ||
83 | /** | 84 | /** |
84 | Enable or disable filter. | 85 | Enable or disable filter. |
85 | */ | 86 | */ |
86 | void setEnabled(bool); | 87 | void setEnabled(bool); |
87 | /** | 88 | /** |
88 | Return wheter the filter is enabled or not. | 89 | Return wheter the filter is enabled or not. |