10 files changed, 146 insertions, 18 deletions

diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index 7e8e2c5..f4350d9 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -54,7 +54,7 @@ void Calendar::init()
   mNewObserver = false;
   mUndoIncidence = 0;
   mModified = false;
-
+  mDefaultCalendar = 1;
   // Setup default filter, which does nothing
   mDefaultFilter = new CalFilter;
   mFilter = mDefaultFilter;
@@ -112,7 +112,14 @@ Calendar::~Calendar()
   if ( mUndoIncidence )
       delete mUndoIncidence;
 }
-
+void Calendar::setDefaultCalendar( int d )
+{
+    mDefaultCalendar = d;
+}
+int Calendar::defaultCalendar()
+{
+    return mDefaultCalendar;
+}
 const QString &Calendar::getOwner() const
 {
   return mOwner;
@@ -348,7 +355,8 @@ void Calendar::addIncidenceBranch(Incidence *i)
 bool Calendar::addIncidence(Incidence *i)
 {
   Incidence::AddVisitor<Calendar> v(this);
-
+  i->setCalID( mDefaultCalendar );
+  i->setCalEnabled( true );
   return i->accept(v);
 }
 void Calendar::deleteIncidence(Incidence *in)
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index ab40970..4c6760f 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -302,7 +302,11 @@ public:
       QString::null, if no calendar has been loaded.
     */
     QString loadedProductId();
-
+    void setDefaultCalendar( int );
+    int defaultCalendar();
+    virtual void setCalendarEnabled( int id, bool enable ) = 0;
+    virtual void setAlarmEnabled( int id, bool enable ) = 0;
+    virtual void setDefaultCalendarEnabledOnly() = 0;
   signals:
     void calendarChanged();
     void calendarSaved();
@@ -326,8 +330,10 @@ public:
     */
     virtual QPtrList<Event> rawEvents( const QDate &start, const QDate &end,
                                        bool inclusive = false ) = 0; 
+
     Incidence *mNextAlarmIncidence;
     Incidence *mUndoIncidence;
+    int mDefaultCalendar;
 
 private:
     void init();
@@ -339,6 +345,7 @@ private:
 
     CalFilter *mFilter;
     CalFilter *mDefaultFilter;
+
     
     QString mTimeZoneId;
 
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index fe74052..c5500bf 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -150,6 +150,8 @@ bool CalendarLocal::addEvent( Event *event )
   event->registerObserver( this );
 
   setModified( true );
+  event->setCalID( mDefaultCalendar );
+  event->setCalEnabled( true );
 
   return true;
 }
@@ -170,7 +172,7 @@ Event *CalendarLocal::event( const QString &uid )
   Event *event;
 
   for ( event = mEventList.first(); event; event = mEventList.next() ) {
-    if ( event->uid() == uid ) {
+      if ( event->uid() == uid && event->calEnabled() ) {
       return event;
     }
   }
@@ -198,7 +200,8 @@ bool CalendarLocal::addTodo( Todo *todo )
   setupRelations( todo );
 
   setModified( true );
-
+  todo->setCalID( mDefaultCalendar );
+  todo->setCalEnabled( true );
   return true;
 }
 
@@ -216,13 +219,16 @@ void CalendarLocal::deleteTodo( Todo *todo )
 
 QPtrList<Todo> CalendarLocal::rawTodos()
 {
-  return mTodoList;
+    QPtrList<Todo> el;
+    for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
+        if ( it->calEnabled() ) el.append( it );
+    return el;
 }
 Todo *CalendarLocal::todo( QString syncProf, QString id )
 {
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
-      if ( todo->getID( syncProf ) == id ) return todo;
+      if ( todo->calEnabled() && todo->getID( syncProf ) == id ) return todo;
   }
 
   return 0;
@@ -267,7 +273,7 @@ Event *CalendarLocal::event( QString syncProf,  QString id )
 {
   Event *todo;
   for ( todo = mEventList.first(); todo; todo = mEventList.next() ) {
-      if ( todo->getID( syncProf ) == id ) return todo;
+      if ( todo->calEnabled() && todo->getID( syncProf ) == id ) return todo;
   }
 
   return 0;
@@ -276,7 +282,7 @@ Todo *CalendarLocal::todo( const QString &uid )
 {
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
-    if ( todo->uid() == uid ) return todo;
+    if ( todo->calEnabled() && todo->uid() == uid ) return todo;
   }
 
   return 0;
@@ -389,6 +395,7 @@ QPtrList<Todo> CalendarLocal::todos( const QDate &date )
 
   Todo *todo;
   for ( todo = mTodoList.first(); todo; todo = mTodoList.next() ) {
+      if ( !todo->calEnabled() ) continue; 
     if ( todo->hasDueDate() && todo->dtDue().date() == date ) {
       todos.append( todo );
     }
@@ -421,6 +428,7 @@ QDateTime  CalendarLocal::nextAlarm( int daysTo )
     int offset;
     mNextAlarmIncidence = 0;
     for( e = mEventList.first(); e; e = mEventList.next() ) {
+        if ( !e->calEnabled() ) continue;
         next = e->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ;
         if ( ok ) {
             if (  next < nextA ) {
@@ -434,6 +442,7 @@ QDateTime  CalendarLocal::nextAlarm( int daysTo )
     }
     Todo *t;
     for( t = mTodoList.first(); t; t = mTodoList.next() ) {
+      if ( !t->calEnabled() ) continue; 
         next = t->getNextAlarmDateTime(& ok, &offset, QDateTime::currentDateTime() ) ;
         if ( ok ) {
             if (  next < nextA ) {
@@ -464,13 +473,15 @@ Alarm::List CalendarLocal::alarms( const QDateTime &from, const QDateTime &to )
   Event *e;
 
   for( e = mEventList.first(); e; e = mEventList.next() ) {
+      if ( !e->calEnabled() ) continue;
     if ( e->doesRecur() ) appendRecurringAlarms( alarms, e, from, to );
     else appendAlarms( alarms, e, from, to );
   }
 
   Todo *t;
   for( t = mTodoList.first(); t; t = mTodoList.next() ) {
-    appendAlarms( alarms, t, from, to );
+      if ( !t->calEnabled() ) continue; 
+      appendAlarms( alarms, t, from, to );
   }
 
   return alarms;
@@ -543,6 +554,7 @@ QPtrList<Event> CalendarLocal::rawEventsForDate( const QDate &qd, bool sorted )
 
   Event *event;
   for( event = mEventList.first(); event; event = mEventList.next() ) {
+      if ( !event->calEnabled() ) continue;
     if ( event->doesRecur() ) {
       if ( event->isMultiDay() ) {
         int extraDays = event->dtStart().date().daysTo( event->dtEnd().date() );
@@ -595,6 +607,7 @@ QPtrList<Event> CalendarLocal::rawEvents( const QDate &start, const QDate &end,
 
   // Get non-recurring events
   for( event = mEventList.first(); event; event = mEventList.next() ) {
+      if ( !event->calEnabled() ) continue;
     if ( event->doesRecur() ) {
       QDate rStart = event->dtStart().date();
       bool found = false;
@@ -670,7 +683,10 @@ QPtrList<Event> CalendarLocal::rawEventsForDate( const QDateTime &qdt )
 
 QPtrList<Event> CalendarLocal::rawEvents()
 {
-  return mEventList;
+    QPtrList<Event> el;
+    for ( Event *it = mEventList.first(); it; it = mEventList.next() )
+        if ( it->calEnabled() ) el.append( it );
+    return el;
 }
 
 bool CalendarLocal::addJournal(Journal *journal)
@@ -685,7 +701,8 @@ bool CalendarLocal::addJournal(Journal *journal)
   journal->registerObserver( this );
 
   setModified( true );
-
+  journal->setCalID( mDefaultCalendar );
+  journal->setCalEnabled( true );
   return true;
 }
 
@@ -704,7 +721,7 @@ Journal *CalendarLocal::journal( const QDate &date )
 //  kdDebug(5800) << "CalendarLocal::journal() " << date.toString() << endl;
 
   for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
-    if ( it->dtStart().date() == date )
+      if ( it->calEnabled() && it->dtStart().date() == date )
       return it;
 
   return 0;
@@ -713,7 +730,7 @@ Journal *CalendarLocal::journal( const QDate &date )
 Journal *CalendarLocal::journal( const QString &uid )
 {
   for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
-    if ( it->uid() == uid )
+    if ( it->calEnabled() && it->uid() == uid )
       return it;
 
   return 0;
@@ -721,6 +738,45 @@ Journal *CalendarLocal::journal( const QString &uid )
 
 QPtrList<Journal> CalendarLocal::journals()
 {
-  return mJournalList;
+    QPtrList<Journal> el;
+    for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
+        if ( it->calEnabled() ) el.append( it );
+    return el;
 }
 
+void CalendarLocal::setCalendarEnabled( int id, bool enable )
+{
+    for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
+        if ( it->calID() == id ) it->setCalEnabled( enable );
+
+    for ( Event *it = mEventList.first(); it; it = mEventList.next() )
+        if ( it->calID() == id ) it->setCalEnabled( enable );
+
+    for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
+        if ( it->calID() == id ) it->setCalEnabled( enable );
+
+}
+void CalendarLocal::setAlarmEnabled( int id, bool enable )
+{
+    for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
+        if ( it->calID() == id ) it->setAlarmEnabled( enable );
+
+    for ( Event *it = mEventList.first(); it; it = mEventList.next() )
+        if ( it->calID() == id ) it->setAlarmEnabled( enable );
+
+    for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
+        if ( it->calID() == id ) it->setAlarmEnabled( enable );
+
+}
+void CalendarLocal::setDefaultCalendarEnabledOnly()
+{
+    for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
+        it->setCalEnabled( it->calID() == mDefaultCalendar );
+
+    for ( Event *it = mEventList.first(); it; it = mEventList.next() )
+        it->setCalEnabled( it->calID() == mDefaultCalendar);
+
+    for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
+        it->setCalEnabled( it->calID() == mDefaultCalendar);
+
+}
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index 98ec710..b25fcbe 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -180,6 +180,9 @@ class CalendarLocal : public Calendar
     Event *event( QString, QString );
  
 
+    void setCalendarEnabled( int id, bool enable );
+    void setAlarmEnabled( int id, bool enable );
+    void setDefaultCalendarEnabledOnly();
 
   protected:
 
diff --git a/libkcal/calfilter.cpp b/libkcal/calfilter.cpp
index 20078a7..3510c7d 100644
--- a/libkcal/calfilter.cpp
+++ b/libkcal/calfilter.cpp
@@ -78,6 +78,8 @@ void CalFilter::apply(QPtrList<Todo> *eventlist)
 }
 bool CalFilter::filterCalendarItem(Incidence *in)
 {
+    if ( !in->calEnabled() )
+        return false;
     if ( in->typeID() == eventID )
         return filterEvent( (Event*) in );
     else if ( in->typeID() == todoID )
@@ -88,6 +90,9 @@ bool CalFilter::filterCalendarItem(Incidence *in)
 }
 bool CalFilter::filterEvent(Event *event)
 {
+ 
+    if ( !event->calEnabled() )
+        return false;
     if (mCriteria & HideEvents) 
         return false;
   if (mCriteria & HideRecurring) {
@@ -98,12 +103,16 @@ bool CalFilter::filterEvent(Event *event)
 }
 bool CalFilter::filterJournal(Journal *j)
 {
+  if ( !j->calEnabled() )
+        return false;
   if (mCriteria & HideJournals) 
         return false;
   return true;
 }
 bool CalFilter::filterTodo(Todo *todo)
 {
+  if ( !todo->calEnabled() )
+        return false;
   if (mCriteria & HideTodos) 
         return false;
   if (mCriteria & HideCompleted) {
diff --git a/libkcal/calfilter.h b/libkcal/calfilter.h
index 29db441..e349770 100644
--- a/libkcal/calfilter.h
+++ b/libkcal/calfilter.h
@@ -26,6 +26,7 @@
 
 #include "event.h"
 #include "todo.h"
+#include "journal.h"
 
 namespace KCal {
 
diff --git a/libkcal/event.cpp b/libkcal/event.cpp
index 9b99855..7cd81fa 100644
--- a/libkcal/event.cpp
+++ b/libkcal/event.cpp
@@ -173,7 +173,9 @@ void Event::setDuration(int seconds)
 }
 QDateTime Event::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const
 {
-  
+    *ok = false;
+    if ( !alarmEnabled() )
+        return QDateTime ();
     bool yes;
      QDateTime incidenceStart = getNextOccurence( start_dt, &yes );
      if ( ! yes || cancelled() ) {
diff --git a/libkcal/incidencebase.cpp b/libkcal/incidencebase.cpp
index b5fe2e6..2ddbb01 100644
--- a/libkcal/incidencebase.cpp
+++ b/libkcal/incidencebase.cpp
@@ -44,17 +44,24 @@ IncidenceBase::IncidenceBase() :
   mTempSyncStat =  SYNC_TEMPSTATE_INITIAL;
   mSyncStatus = 0;
   mAttendees.setAutoDelete( true );
+  mCalEnabled = true;
+  mAlarmEnabled = true;
+  mCalID = 0;
 }
 
 IncidenceBase::IncidenceBase(const IncidenceBase &i) :
   CustomProperties( i )
 {
+
   mReadOnly = i.mReadOnly;
   mDtStart = i.mDtStart;
   mDuration = i.mDuration;
   mHasDuration = i.mHasDuration;
   mOrganizer = i.mOrganizer;
   mUid = i.mUid;
+  mCalEnabled = i.mCalEnabled;
+  mAlarmEnabled = i.mAlarmEnabled;
+  mCalID = i.mCalID;
   QPtrList<Attendee> attendees = i.attendees();
   for( Attendee *a = attendees.first(); a; a = attendees.next() ) {
     mAttendees.append( new Attendee( *a ) );
@@ -132,6 +139,32 @@ QDateTime IncidenceBase::getEvenTime( QDateTime dt )
     return dt;
 }     
 
+void IncidenceBase::setCalID( int id )
+{
+    mCalID = id;
+}
+int IncidenceBase::calID() const
+{
+    return mCalID;
+}
+void IncidenceBase::setCalEnabled( bool b )
+{
+    mCalEnabled = b;
+}
+bool IncidenceBase::calEnabled() const
+{
+    return mCalEnabled;
+}
+
+void IncidenceBase::setAlarmEnabled( bool b )
+{
+    mAlarmEnabled = b;
+}
+bool IncidenceBase::alarmEnabled() const
+{
+    return mAlarmEnabled;
+}
+
 
 void IncidenceBase::setUid(const QString &uid)
 {
diff --git a/libkcal/incidencebase.h b/libkcal/incidencebase.h
index 05209e0..dc6024a 100644
--- a/libkcal/incidencebase.h
+++ b/libkcal/incidencebase.h
@@ -141,6 +141,12 @@ class IncidenceBase : public CustomProperties
     void registerObserver( Observer * );
     void unRegisterObserver( Observer * );
     void updated();
+    void setCalID( int id );
+    int calID() const;
+    void setCalEnabled( bool );
+    bool calEnabled() const; 
+    void setAlarmEnabled( bool );
+    bool alarmEnabled() const;
 
   protected:
     QDateTime mDtStart;
@@ -151,6 +157,9 @@ class IncidenceBase : public CustomProperties
     // base components
     QString mOrganizer;
     QString mUid;
+    int mCalID;
+    bool mCalEnabled;
+    bool mAlarmEnabled;
     QDateTime mLastModified;
     QPtrList<Attendee> mAttendees;
 
diff --git a/libkcal/todo.cpp b/libkcal/todo.cpp
index c97a61e..42274ff 100644
--- a/libkcal/todo.cpp
+++ b/libkcal/todo.cpp
@@ -517,7 +517,7 @@ void Todo::setPercentComplete(int v)
 }
 QDateTime Todo::getNextAlarmDateTime( bool * ok, int * offset, QDateTime start_dt ) const
 {
-    if ( isCompleted() || ! hasDueDate() || cancelled() ) {
+    if ( isCompleted() || ! hasDueDate() || cancelled() || !alarmEnabled() ) {
          *ok = false;
          return QDateTime ();
      }