4 files changed, 71 insertions, 5 deletions

diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index f4350d9..5092d1a 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -55,2 +55,3 @@ void Calendar::init()
   mUndoIncidence = 0;
+  mDeleteIncidencesOnClose = true;
   mModified = false;
@@ -114,2 +115,6 @@ Calendar::~Calendar()
 }
+void Calendar::setDontDeleteIncidencesOnClose ()
+{
+    mDeleteIncidencesOnClose = false;
+}
 void Calendar::setDefaultCalendar( int d )
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 4c6760f..73f82bb 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -76,2 +76,4 @@ public:
     virtual void close() = 0;
+    virtual void addCalendar( Calendar*  ) = 0;
+    virtual bool addCalendarFile( QString name, int id ) = 0;
   
@@ -304,6 +306,9 @@ public:
     QString loadedProductId();
-    void setDefaultCalendar( int );
     int defaultCalendar();
+    void setDontDeleteIncidencesOnClose ();
+    public slots:
+    void setDefaultCalendar( int );
     virtual void setCalendarEnabled( int id, bool enable ) = 0;
     virtual void setAlarmEnabled( int id, bool enable ) = 0;
+    virtual void setReadOnly( int id, bool enable ) = 0;
     virtual void setDefaultCalendarEnabledOnly() = 0;
@@ -336,2 +341,3 @@ public:
     int mDefaultCalendar;
+    bool mDeleteIncidencesOnClose;
 
@@ -345,2 +351,3 @@ private:
 
+
     CalFilter *mFilter;
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index c5500bf..e48122a 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -67,5 +67,43 @@ CalendarLocal::~CalendarLocal()
 {
-  close();
+    if ( mDeleteIncidencesOnClose )
+        close();
+}
+bool CalendarLocal::addCalendarFile( QString name, int id )
+{
+    CalendarLocal calendar( timeZoneId() );
+    calendar.setDefaultCalendar( id );
+    if ( calendar.load( name ) ) {
+        addCalendar( &calendar  );
+        return true;
+    }
+    return false;
+}
+void CalendarLocal::addCalendar( Calendar* cal )
+{
+    cal->setDontDeleteIncidencesOnClose();
+    {
+        QPtrList<Event> EventList = cal->rawEvents();
+        Event * ev = EventList.first();
+        while ( ev ) {
+            mEventList.append( ev );
+            ev = EventList.next();
+        }
+    }
+    {
+        QPtrList<Todo> TodoList = cal->rawTodos();
+        Todo * ev = TodoList.first();
+        while ( ev ) {
+            mTodoList.append( ev );
+            ev = TodoList.next();
+        }
+    }
+    {
+        QPtrList<Journal> JournalList = cal->journals();
+        Journal * ev = JournalList.first();
+        while ( ev ) {
+            mJournalList.append( ev );
+            ev = JournalList.next();
+        }
+    }
 }
-
 bool CalendarLocal::load( const QString &fileName )
@@ -758,2 +796,16 @@ void CalendarLocal::setCalendarEnabled( int id, bool enable )
 }
+
+void CalendarLocal::setReadOnly( int id, bool enable )
+{
+    for ( Journal *it = mJournalList.first(); it; it = mJournalList.next() )
+        if ( it->calID() == id ) it->setReadOnly( enable );
+
+    for ( Event *it = mEventList.first(); it; it = mEventList.next() )
+        if ( it->calID() == id ) it->setReadOnly( enable );
+
+    for ( Todo *it = mTodoList.first(); it; it = mTodoList.next() )
+        if ( it->calID() == id ) it->setReadOnly( enable );
+
+}
+
 void CalendarLocal::setAlarmEnabled( int id, bool enable )
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index b25fcbe..65f6aa7 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -45,3 +45,4 @@ class CalendarLocal : public Calendar
     ~CalendarLocal();
-  
+    void addCalendar( Calendar*  );
+    bool addCalendarFile( QString name, int id );
     /**
@@ -181,5 +182,6 @@ class CalendarLocal : public Calendar
  
-
+public slots:
     void setCalendarEnabled( int id, bool enable );
     void setAlarmEnabled( int id, bool enable );
+    void setReadOnly( int id, bool enable );
     void setDefaultCalendarEnabledOnly();