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
@@ -1074,27 +1074,31 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                         pref = "t";
                     if ( des.find(pref+ inR->getID(mCurrentSyncDevice)  +"," ) >= 0 && mode != 5) { // delete it
                         inR->setTempSyncStat( SYNC_TEMPSTATE_DELETE );
                         //remote->deleteIncidence( inR );
                         ++deletedEventR; 
                     } else {
-                        inR->setLastModified( modifiedCalendar );
-                        inL = inR->clone();
-                        inL->setIDStr( ":" );
-                        inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
-                        inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
-                        local->addIncidence( inL );
-                        ++addedEvent;
+                        if ( !filterIN || filterIN->filterCalendarItem( inR  ) ){
+                            inR->setLastModified( modifiedCalendar );
+                            inL = inR->clone();
+                            inL->setIDStr( ":" );
+                            inL->setCsum( mCurrentSyncDevice, inR->getCsum(mCurrentSyncDevice) );
+                            inL->setID( mCurrentSyncDevice, inR->getID(mCurrentSyncDevice) );
+                            local->addIncidence( inL );
+                            ++addedEvent;
+                        }
                     }
                 } else {
                     if ( inR->lastModified() > mLastCalendarSync || mode == 5 ) {
-                        inR->setLastModified( modifiedCalendar );
-                        inL = inR->clone();
-                        inL->setIDStr( ":" );
-                        local->addIncidence( inL );
-                        ++addedEvent;
+                        if ( !filterIN || filterIN->filterCalendarItem( inR  ) ){
+                            inR->setLastModified( modifiedCalendar );
+                            inL = inR->clone();
+                            inL->setIDStr( ":" );
+                            local->addIncidence( inL );
+                            ++addedEvent;
+                        }
                     } else {
                         checkExternSyncEvent(eventRSyncSharp, inR);
                         remote->deleteIncidence( inR );
                         ++deletedEventR; 
                     }
                 }
@@ -1131,34 +1135,38 @@ bool  CalendarView::synchronizeCalendar( Calendar* local,  Calendar* remote, int
                     if ( !inL->getID(mCurrentSyncDevice).isEmpty() && mode != 4 ) {
                         checkExternSyncEvent(eventLSyncSharp, inL);
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
                         if ( ! mSyncManager->mWriteBackExistingOnly ) {
-                            inL->removeID(mCurrentSyncDevice );
-                            ++addedEventR; 
-                            //qDebug("remote added Incidence %s ", inL->summary().latin1());
-                            inL->setLastModified( modifiedCalendar );
-                            inR = inL->clone();
-                            inR->setIDStr( ":" );
-                            inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
-                            remote->addIncidence(  inR );
+                            if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){
+                                inL->removeID(mCurrentSyncDevice );
+                                ++addedEventR; 
+                                //qDebug("remote added Incidence %s ", inL->summary().latin1());
+                                inL->setLastModified( modifiedCalendar );
+                                inR = inL->clone();
+                                inR->setIDStr( ":" );
+                                inR->setTempSyncStat( SYNC_TEMPSTATE_INITIAL );
+                                remote->addIncidence(  inR );
+                            }
                         }
                     }
                 } else {
                     if ( inL->lastModified() < mLastCalendarSync && mode != 4 ) {
                         checkExternSyncEvent(eventLSyncSharp, inL);
                         local->deleteIncidence( inL );
                         ++deletedEventL; 
                     } else {
                         if ( ! mSyncManager->mWriteBackExistingOnly ) {
-                            ++addedEventR; 
-                            inL->setLastModified( modifiedCalendar );
-                            inR = inL->clone();
-                            inR->setIDStr( ":" );
-                            remote->addIncidence(  inR );
+                            if ( !filterOUT || filterOUT->filterCalendarItem( inL ) ){
+                                ++addedEventR; 
+                                inL->setLastModified( modifiedCalendar );
+                                inR = inL->clone();
+                                inR->setIDStr( ":" );
+                                remote->addIncidence(  inR );
+                            }
                         }
                     }
                 }
             }
         }
         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
@@ -232,12 +232,16 @@ void FilterEditDialog::readFilter(CalFilter *filter)
 
   mEditor->mCompletedCheck->setChecked(c & CalFilter::HideCompleted);
   mEditor->mRecurringCheck->setChecked(c & CalFilter::HideRecurring);
   mEditor->mPublicCheck->setChecked(c & CalFilter::ShowPublic);
   mEditor->mPrivateCheck->setChecked(c & CalFilter::ShowPrivate);
   mEditor->mConfidentialCheck->setChecked(c & CalFilter::ShowConfidential);
+
+  mEditor->mEventCheck->setChecked(c & CalFilter::HideEvents);
+  mEditor->mTodoCheck->setChecked(c & CalFilter::HideTodos);
+  mEditor->mJournalCheck->setChecked(c & CalFilter::HideJournals);
  
   if (c & CalFilter::ShowCategories) {
     mEditor->mCatShowCheck->setChecked(true);
   } else {
     mEditor->mCatHideCheck->setChecked(true);
   }
@@ -256,12 +260,15 @@ void FilterEditDialog::writeFilter(CalFilter *filter)
   if (mEditor->mCompletedCheck->isChecked()) c |= CalFilter::HideCompleted;
   if (mEditor->mRecurringCheck->isChecked()) c |= CalFilter::HideRecurring;
   if (mEditor->mCatShowCheck->isChecked()) c |= CalFilter::ShowCategories;
   if (mEditor->mPublicCheck->isChecked()) c |= CalFilter::ShowPublic;
   if (mEditor->mPrivateCheck->isChecked()) c |= CalFilter::ShowPrivate;
   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;
 
   filter->setCriteria(c);
 
   QStringList categoryList;
   for(uint i=0;i<mEditor->mCatList->count();++i) {
     categoryList.append(mEditor->mCatList->text(i));
diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp
index c182db5..c425dfc 100644
--- a/libkcal/calfilter.cpp
+++ b/libkcal/calfilter.cpp
@@ -61,43 +61,54 @@ void CalFilter::apply(QPtrList<Event> *eventlist)
 }
 
 // TODO: avoid duplicating apply() code
 void CalFilter::apply(QPtrList<Todo> *eventlist)
 {
   if (!mEnabled) return;
-
-//  kdDebug(5800) << "CalFilter::apply()" << endl;
-
   Todo *event = eventlist->first();
   while(event) {
     if (!filterTodo(event)) {
       eventlist->remove();
       event = eventlist->current();
     } else {
       event = eventlist->next();
     }
   }
 
 //  kdDebug(5800) << "CalFilter::apply() done" << endl;
 }
-
+bool CalFilter::filterCalendarItem(Incidence *in)
+{
+    if ( in->type() == "Event" )
+        return filterEvent( (Event*) in );
+    else if ( in->type() =="Todo" )
+        return filterTodo( (Todo*) in);
+    else if ( in->type() =="Journal" )
+        return filterJournal( (Journal*) in );
+    return false;
+}
 bool CalFilter::filterEvent(Event *event)
 {
-//  kdDebug(5800) << "CalFilter::filterEvent(): " << event->getSummary() << endl;
-
+    if (mCriteria & HideEvents) 
+        return false;
   if (mCriteria & HideRecurring) {
     if (event->recurrence()->doesRecur()) return false;
   }
 
   return filterIncidence(event);
 }
-
+bool CalFilter::filterJournal(Journal *j)
+{
+  if (mCriteria & HideJournals) 
+        return false;
+  return true;
+}
 bool CalFilter::filterTodo(Todo *todo)
 {
-//  kdDebug(5800) << "CalFilter::filterEvent(): " << event->getSummary() << endl;
-
+  if (mCriteria & HideTodos) 
+        return false;
   if (mCriteria & HideCompleted) {
     if (todo->isCompleted()) return false;
   }
 
   return filterIncidence(todo);
 }
diff --git a/libkcal/calfilter.h b/libkcal/calfilter.h
index 5ad0064..29db441 100644
--- a/libkcal/calfilter.h
+++ b/libkcal/calfilter.h
@@ -58,13 +58,14 @@ class CalFilter {
     
     /**
       Apply filter to todolist, all todos not matching filter criterias are
       removed from the list.
     */
     void apply(QPtrList<Todo> *todolist);
-    
+    bool CalFilter::filterCalendarItem(Incidence *in);
+    bool CalFilter::filterJournal(Journal *in);
     /**
       Apply filter criteria on the specified event. Return true, if event passes
       criteria, otherwise return false.
     */
     bool filterEvent(Event *);