4 files changed, 13 insertions, 5 deletions

diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index 7c41cab..0aef929 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1470,5 +1470,5 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
         currentDate = dt.date();
     
-    if ( todo->doesFloat() || overdue ) {  
+    if (( todo->doesFloat() || overdue) && !todo->hasCompletedDate() ) {  
         if ( ! mAllDayMode ) return;
         // aldayagenda
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 42a6f7c..8b79788 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1508,5 +1508,4 @@ void  KOAgendaView::setStartHour( int h )
 void  KOAgendaView::updateTodo( Todo * t, int )
 { 
-
     bool remove = false;
     bool removeAD = false;
@@ -1541,5 +1540,5 @@ void  KOAgendaView::updateTodo( Todo * t, int )
     }
     int days = mSelectedDates.first().daysTo( da  );
-    // qDebug("daysto %d ", days );
+    //qDebug("daysto %d  %d %d", days, remove,removeAD );
     mAgenda->updateTodo( t , days, remove); 
     if ( KOPrefs::instance()->mShowTodoInAgenda )
diff --git a/korganizer/koeditorgeneraltodo.h b/korganizer/koeditorgeneraltodo.h
index f6c30f8..5f1c3cc 100644
--- a/korganizer/koeditorgeneraltodo.h
+++ b/korganizer/koeditorgeneraltodo.h
@@ -86,4 +86,5 @@ class KOEditorGeneralTodo : public KOEditorGeneral
 
  private:
+    friend class KOTodoEditor;
     KDateEdit               *mStartDateEdit;
     KOTimeEdit               *mStartTimeEdit;
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 16c19a4..ec5c2d1 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -46,4 +46,5 @@
 
 #include "koprefs.h"
+#include "kolocationbox.h"
 
 #include "kotodoeditor.h"
@@ -277,6 +278,13 @@ void KOTodoEditor::setDefaults(QDateTime due,Todo *relatedEvent,bool allDay)
       mGeneral->setCategories (mRelatedTodo->categoriesStr ());
       mGeneral->setSecrecy (mRelatedTodo->secrecy ());
-      
-  }
+      if ( mRelatedTodo->priority() < 3 )
+          mGeneral->mPriorityCombo->setCurrentItem(mRelatedTodo->priority()-1);
+      mGeneral->mSummaryEdit->lineEdit()->setText(mRelatedTodo->summary()+": ");
+      int len = mRelatedTodo->summary().length();
+      mGeneral->mSummaryEdit->lineEdit()->setSelection ( 0, len+2 );
+      mGeneral->mSummaryEdit->lineEdit()->setCursorPosition ( len+2 ); 
+      mGeneral->mSummaryEdit->lineEdit()->setFocus();
+      
+  } else
   mGeneral->setFocusOn( 2 );
 }