5 files changed, 60 insertions, 0 deletions

diff --git a/libkcal/alarm.cpp b/libkcal/alarm.cpp
index 0afa0a7..79e0464 100644
--- a/libkcal/alarm.cpp
+++ b/libkcal/alarm.cpp
@@ -373,2 +373,4 @@ QString Alarm::offsetText()
          message = i18n("%1min").arg( 0 );
+    if ( !mParent->alarmEnabled() )
+        return "!"+message + i18n("(disabled)");
     return message; 
diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index 5092d1a..a662eeb 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index 73f82bb..2243e28 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -314,2 +314,3 @@ public:
     virtual void setDefaultCalendarEnabledOnly() = 0;
+    virtual void setCalendarRemove( int id ) = 0;
   signals:
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index e48122a..749d9f6 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -87,2 +87,4 @@ void CalendarLocal::addCalendar( Calendar* cal )
         while ( ev ) {
+            ev->unRegisterObserver( cal );
+            ev->registerObserver( this );
             mEventList.append( ev );
@@ -92,2 +94,3 @@ void CalendarLocal::addCalendar( Calendar* cal )
     {
+
         QPtrList<Todo> TodoList = cal->rawTodos();
@@ -95,3 +98,16 @@ void CalendarLocal::addCalendar( Calendar* cal )
         while ( ev ) {
+            QString rel = ev->relatedToUid();
+            if ( !rel.isEmpty() ){
+                ev->setRelatedTo ( 0 );
+                ev->setRelatedToUid( rel );
+            }
+            ev = TodoList.next();
+        }
+        //TodoList = cal->rawTodos();
+        ev = TodoList.first();
+        while ( ev ) {
+            ev->unRegisterObserver( cal );
+            ev->registerObserver( this );
             mTodoList.append( ev );
+            setupRelations( ev );
             ev = TodoList.next();
@@ -103,2 +119,4 @@ void CalendarLocal::addCalendar( Calendar* cal )
         while ( ev ) {
+            ev->unRegisterObserver( cal );
+            ev->registerObserver( this );
             mJournalList.append( ev );
@@ -107,2 +125,3 @@ void CalendarLocal::addCalendar( Calendar* cal )
     }
+    setModified( true );
 }
@@ -783,2 +802,38 @@ QPtrList<Journal> CalendarLocal::journals()
 }
+void CalendarLocal::setCalendarRemove( int id )
+{
+   
+    {
+        QPtrList<Event> EventList = mEventList;
+        Event * ev = EventList.first();
+        while ( ev ) {
+            if ( ev->calID() == id )
+                deleteEvent( ev );
+            ev = EventList.next();
+        }
+    }
+    {
+
+        QPtrList<Todo> TodoList = mTodoList;
+        Todo * ev = TodoList.first();
+        while ( ev ) {
+            if ( ev->calID() == id )
+                deleteTodo( ev );
+            ev = TodoList.next();
+        }
+    }
+    {
+        QPtrList<Journal> JournalList = mJournalList;
+        Journal * ev = JournalList.first();
+        while ( ev ) {
+            if ( ev->calID() == id )
+                deleteJournal( ev );
+            ev = JournalList.next();
+        }
+    }
+
+    if ( mUndoIncidence ) delete mUndoIncidence;
+    mUndoIncidence = 0;
+
+}
 
@@ -820,2 +875,3 @@ void CalendarLocal::setAlarmEnabled( int id, bool enable )
         if ( it->calID() == id ) it->setAlarmEnabled( enable );
+    reInitAlarmSettings();
 
diff --git a/libkcal/calendarlocal.h b/libkcal/calendarlocal.h
index 65f6aa7..5bbe55f 100644
--- a/libkcal/calendarlocal.h
+++ b/libkcal/calendarlocal.h
@@ -187,2 +187,3 @@ public slots:
     void setDefaultCalendarEnabledOnly();
+    void setCalendarRemove( int id );