1 files changed, 23 insertions, 2 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index c530037..bd7376a 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2659,101 +2659,122 @@ void CalendarView::showTodoEditor()
 
 void CalendarView::cloneIncidence()
 {
     Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         cloneIncidence(incidence);
     }
 }
 void CalendarView::moveIncidence()
 {
   Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         moveIncidence(incidence);
     }
 }
 void CalendarView::beamIncidence()
 {
   Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         beamIncidence(incidence);
     }
 }
 void CalendarView::toggleCancelIncidence()
 {
   Incidence *incidence = currentSelection();
     if ( !incidence ) incidence = mTodoList->selectedIncidences().first();
     if ( incidence ) {
         cancelIncidence(incidence);
     }
 }
 
 
 void CalendarView::cancelIncidence(Incidence * inc )
 {
     inc->setCancelled( ! inc->cancelled() );
     changeIncidenceDisplay( inc,KOGlobals::EVENTEDITED );
     updateView();
 }
 void CalendarView::cloneIncidence(Incidence * orgInc )
 { 
     Incidence * newInc = orgInc->clone();
     newInc->recreate();
  
     if ( newInc->type() == "Todo" ) {
         Todo* t = (Todo*) newInc; 
+        bool cloneSub = false;
+        if (  orgInc->relations().count() ) {
+            int result = KMessageBox::warningYesNoCancel(this, 
+                                                         i18n("The todo\n%1\nwill be cloned!\nIt has subtodos!\nDo you want to clone\nall subtodos as well?").arg( newInc->summary().left ( 25 ) ),
+                                                         i18n("Todo has subtodos"),
+                                                         i18n("Yes"),
+                                                         i18n("No"));
+            
+            if ( result == KMessageBox::Cancel ) {
+                delete t;
+                return;
+            }
+            if (result == KMessageBox::Yes) cloneSub = true;
+        }
         showTodoEditor();
         mTodoEditor->editTodo( t );
         if ( mTodoEditor->exec() ) {
-            mCalendar->addTodo( t );
-            updateView();
+            if ( cloneSub ) {
+                orgInc->cloneRelations( t );
+                mCalendar->addIncidenceBranch( t );
+                updateView();
+
+            } else {
+                mCalendar->addTodo( t );
+                updateView();
+            }
         } else {
             delete t;
         }
     }
     else {
         Event*  e = (Event*)  newInc;
         showEventEditor();
         mEventEditor->editEvent( e );
         if ( mEventEditor->exec() ) {
             mCalendar->addEvent( e );
             updateView();
         } else {
             delete e;
         }
     }
     setActiveWindow();
 }
 
 void CalendarView::newEvent()
 {
     // TODO: Replace this code by a common eventDurationHint of KOBaseView.
     KOAgendaView *aView = mViewManager->agendaView();
     if (aView) {
         if (aView->selectionStart().isValid()) {
             if (aView->selectedIsAllDay()) {
                 newEvent(aView->selectionStart(),aView->selectionEnd(),true);
             } else {
                 newEvent(aView->selectionStart(),aView->selectionEnd());
             }
             return;
         }
     }
 
     QDate date = mNavigator->selectedDates().first();
     QDateTime current =  QDateTime::currentDateTime();
     if ( date <= current.date() ) {
         int hour = current.time().hour() +1;
         newEvent( QDateTime(  current.date(), QTime( hour, 0, 0 ) ),
                   QDateTime( current.date(), QTime( hour+ KOPrefs::instance()->mDefaultDuration, 0, 0 ) ) );
     } else
         newEvent( QDateTime( date, QTime( KOPrefs::instance()->mStartTime, 0, 0 ) ),
                   QDateTime( date, QTime( KOPrefs::instance()->mStartTime +
                                           KOPrefs::instance()->mDefaultDuration, 0, 0 ) ) );
 }
 
 void CalendarView::newEvent(QDateTime fh)
 {
     newEvent(fh,