todo fixi

6 files changed, 44 insertions, 3 deletions

diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 7c8316f..3dac20b 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -2264,4 +2264,7 @@ void  CalendarView::slotSelectPickerDate( QDate  d)
             Todo * to = (Todo *) mMoveIncidence;
             QTime tim;
+            int len  = 0;
+            if ( to->hasStartDate() &&  to->hasDueDate() )
+                len = to->dtStart().secsTo( to->dtDue());
             if ( to->hasDueDate() ) 
                 tim = to->dtDue().time();
@@ -2273,4 +2276,13 @@ void  CalendarView::slotSelectPickerDate( QDate  d)
             QDateTime dt ( d,tim );
             to->setDtDue( dt );
+
+            if ( to->hasStartDate() ) {
+                if ( len>0 ) 
+                    to->setDtStart(to->dtDue().addSecs( -len ));
+                else
+                    if (to->dtStart() > to->dtDue() )
+                        to->setDtStart(to->dtDue().addDays( -3 ));
+            }
+            
             todoChanged( to );
         } else { 
@@ -3811,5 +3823,5 @@ bool  CalendarView::removeCompletedSubTodos( Todo* t )
     }
     if ( deleteTodo ) {
-        if ( t->isCompleted() ) {
+        if ( t->isCompleted() && !t->doesRecur()) {
             checkExternalId(  t );
             mCalendar->deleteTodo( t );
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 13d8398..4ff6899 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1000,5 +1000,18 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type)
         (static_cast<Event*>(item->incidence()))->setDtEnd(endDt);
     } else if ( item->incidence()->type() == "Todo" ) {
-        (static_cast<Todo*>(item->incidence()))->setDtDue(endDt);
+        Todo* to = static_cast<Todo*>(item->incidence());
+
+        int len  = 0;
+        if ( to->hasStartDate() &&  to->hasDueDate() )
+            len = to->dtStart().secsTo( to->dtDue());
+        to->setDtDue(endDt);
+        if ( to->hasStartDate() ) {
+            if ( len>0 ) 
+                to->setDtStart(to->dtDue().addSecs( -len ));
+            else
+                if (to->dtStart() > to->dtDue() )
+                    to->setDtStart(to->dtDue().addDays( -3 ));
+        }
+        
     }
     //qDebug("KOAgendaView::updateEventDates stsart %s end %s ", startDt.toString().latin1(), endDt.toString().latin1() );
diff --git a/korganizer/koeventviewer.cpp b/korganizer/koeventviewer.cpp
index 39921a0..f6c9624 100644
--- a/korganizer/koeventviewer.cpp
+++ b/korganizer/koeventviewer.cpp
@@ -403,4 +403,11 @@ void KOEventViewer::appendTodo(Todo *event, int mode )
         mMailSubject += i18n(" at ") + event->location();
     }
+
+    if (event->recurrence()->doesRecur()) {
+
+        QString recurText = event->recurrence()->recurrenceText();
+        addTag("p","<em>" + i18n("This is a %1 recurring todo.").arg(recurText ) + "</em>");
+            
+    }
     if (event->hasStartDate()) {
         mText.append(i18n("<p><b>Start on:</b> %1</p>").arg(event->dtStartStr(KOPrefs::instance()->mShortDateInViewer)));
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index acd9265..d8e940b 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -157,5 +157,5 @@ bool ListItemVisitor::visit(Todo *t)
     mItem->setText(4,"---");
     mItem->setText(5,t->isAlarmEnabled() ? i18n("Yes") : i18n("No"));
-    mItem->setText(6,"---");
+    mItem->setText(6, t->recurrence()->recurrenceText());
     if (t->hasDueDate()) {
         mItem->setText(7,t->dtDueDateStr());
diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index f595d35..d0380e3 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -582,4 +582,7 @@ void MonthViewCell::insertTodo(Todo *todo)
         }
         item->setPalette( pal );
+        item->setRecur( todo->recurrence()->doesRecur() );
+        item->setAlarm( todo->isAlarmEnabled() );
+        item->setMoreInfo( todo->description().length() > 0  );
         mItemList->insertItem( item );
         mToolTip += text+"\n"; 
diff --git a/korganizer/kowhatsnextview.cpp b/korganizer/kowhatsnextview.cpp
index 391b3bb..18dc656 100644
--- a/korganizer/kowhatsnextview.cpp
+++ b/korganizer/kowhatsnextview.cpp
@@ -669,4 +669,10 @@ bool KOWhatsNextView::appendTodo(Incidence *ev, QString ind , bool isSub )
         needClose =true;
     }
+    if ( ev->doesRecur() ) {
+        if ( !needClose)
+            mText +="[";
+        mText += "r";
+        needClose =true;
+    }
     //  if ( ev->recurrence()->doesRecur() ) {
     //       if ( !needClose)