some kopi usebility fixes

5 files changed, 39 insertions, 7 deletions

diff --git a/libkcal/calendar.cpp b/libkcal/calendar.cpp
index 52daaaa..88351eb 100644
--- a/libkcal/calendar.cpp
+++ b/libkcal/calendar.cpp
@@ -53,5 +53,5 @@ void Calendar::init()
   mObserver = 0;
   mNewObserver = false;
-
+  mUndoIncidence = 0;
   mModified = false;
 
@@ -110,4 +110,6 @@ Calendar::~Calendar()
 {
   delete mDefaultFilter;
+  if ( mUndoIncidence )
+      delete mUndoIncidence;
 }
 
@@ -117,4 +119,11 @@ const QString &Calendar::getOwner() const
 }
 
+bool Calendar::undoDeleteIncidence()
+{
+    if (!mUndoIncidence)
+        return false;
+    addIncidence(mUndoIncidence);
+    mUndoIncidence = 0;
+}
 void Calendar::setOwner(const QString &os)
 {
diff --git a/libkcal/calendar.h b/libkcal/calendar.h
index b7d6a1f..2f2c3aa 100644
--- a/libkcal/calendar.h
+++ b/libkcal/calendar.h
@@ -66,4 +66,6 @@ public:
     Calendar(const QString &timeZoneId);
     virtual ~Calendar();
+    Incidence * undoIncidence() { return mUndoIncidence; };
+    bool undoDeleteIncidence();
     void deleteIncidence(Incidence *in);
     void resetTempSyncStat();
@@ -323,4 +325,5 @@ public:
                                        bool inclusive = false ) = 0; 
     Incidence *mNextAlarmIncidence;
+    Incidence *mUndoIncidence;
 
 private:
diff --git a/libkcal/calendarlocal.cpp b/libkcal/calendarlocal.cpp
index 3f46d53..12294c0 100644
--- a/libkcal/calendarlocal.cpp
+++ b/libkcal/calendarlocal.cpp
@@ -153,9 +153,9 @@ bool CalendarLocal::addEvent( Event *event )
 void CalendarLocal::deleteEvent( Event *event )
 {
- 
-
-  if ( mEventList.removeRef( event ) ) {
-    setModified( true );
-  }
+    if ( mUndoIncidence ) delete mUndoIncidence;
+    mUndoIncidence = event->clone();
+    if ( mEventList.removeRef( event ) ) {
+        setModified( true );
+    }
 }
 
@@ -202,5 +202,7 @@ void CalendarLocal::deleteTodo( Todo *todo )
 {
   // Handle orphaned children
-  removeRelations( todo );
+    if ( mUndoIncidence ) delete mUndoIncidence;
+    mUndoIncidence = todo->clone();
+    removeRelations( todo );
 
   if ( mTodoList.removeRef( todo ) ) {
@@ -688,4 +690,7 @@ bool CalendarLocal::addJournal(Journal *journal)
 void CalendarLocal::deleteJournal( Journal *journal )
 {
+    if ( mUndoIncidence ) delete mUndoIncidence;
+    mUndoIncidence = journal->clone();
+    mUndoIncidence->setSummary( mUndoIncidence->description().left(25));
   if ( mJournalList.removeRef(journal) ) {
     setModified( true );
diff --git a/libkcal/incidence.cpp b/libkcal/incidence.cpp
index 5a9ef0e..28402ae 100644
--- a/libkcal/incidence.cpp
+++ b/libkcal/incidence.cpp
@@ -174,4 +174,18 @@ bool KCal::operator==( const Incidence& i1, const Incidence& i2 )
 }
 
+Incidence* Incidence::recreateCloneException( QDate d  )
+{
+    Incidence* newInc = clone();
+    newInc->recreate();
+    if ( doesRecur() ) {
+        addExDate( d );
+        newInc->recurrence()->unsetRecurs();
+        int len = dtStart().secsTo( ((Event*)this)->dtEnd());
+        QTime tim = dtStart().time();
+        newInc->setDtStart( QDateTime(d, tim) );
+        ((Event*)newInc)->setDtEnd( newInc->dtStart().addSecs( len ) );
+    }
+    return newInc;
+}
 
 void Incidence::recreate()
diff --git a/libkcal/incidence.h b/libkcal/incidence.h
index 7dc6f10..1807bc4 100644
--- a/libkcal/incidence.h
+++ b/libkcal/incidence.h
@@ -123,4 +123,5 @@ class Incidence : public IncidenceBase
     */
     void recreate();
+    Incidence*  recreateCloneException(QDate);
 
     /** set creation date */