1 files changed, 11 insertions, 6 deletions

diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 158a7d3..b9a028b 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -102,206 +102,211 @@ void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout)
   
   
   mDueDateEdit = new KDateEdit(timeBoxFrame);
   layoutTimeBox->addWidget(mDueDateEdit,0,1);
 
   mDueTimeEdit = new KOTimeEdit(timeBoxFrame);
   layoutTimeBox->addWidget(mDueTimeEdit,0,2);
 
 
   mStartCheck = new QCheckBox(i18n("Start:"),timeBoxFrame);
   layoutTimeBox->addWidget(mStartCheck,1,0);
   connect(mStartCheck,SIGNAL(toggled(bool)),SLOT(enableStartEdit(bool)));
 
   mStartDateEdit = new KDateEdit(timeBoxFrame);
   layoutTimeBox->addWidget(mStartDateEdit,1,1);
 
   mStartTimeEdit = new KOTimeEdit(timeBoxFrame);
   layoutTimeBox->addWidget(mStartTimeEdit,1,2);
 
 
   mTimeButton = new QCheckBox(i18n("Time associated"),timeBoxFrame);
   layoutTimeBox->addMultiCellWidget(mTimeButton,2,2,0,1);
 
   connect(mTimeButton,SIGNAL(toggled(bool)),SLOT(enableTimeEdits(bool)));
   
   // some more layouting
   //layoutTimeBox->setColStretch(3,1);  
 }
 
 
 void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
 {
   mCompletedCombo = new QComboBox(parent);
   // xgettext:no-c-format
   mCompletedCombo->insertItem(i18n("  0 %"));
   // xgettext:no-c-format
   mCompletedCombo->insertItem(i18n(" 20 %"));
   // xgettext:no-c-format
   mCompletedCombo->insertItem(i18n(" 40 %"));
   // xgettext:no-c-format
   mCompletedCombo->insertItem(i18n(" 60 %"));
   // xgettext:no-c-format
   mCompletedCombo->insertItem(i18n(" 80 %"));
   // xgettext:no-c-format
   mCompletedCombo->insertItem(i18n("100 %"));
   connect(mCompletedCombo,SIGNAL(activated(int)),SLOT(completedChanged(int)));
   topLayout->addWidget(mCompletedCombo);
 
   mCompletedLabel = new QLabel(i18n("completed"),parent);
   topLayout->addWidget(mCompletedLabel);
 }
 
 void KOEditorGeneralTodo::initPriority(QWidget *parent, QBoxLayout *topLayout)
 {
 
     QHBox* h = new QHBox ( parent );
     topLayout->addWidget( h );
   QLabel *priorityLabel = new QLabel(i18n("Priority:"), h);
   // topLayout->addWidget(priorityLabel);
 
   mPriorityCombo = new QComboBox( h );
   mPriorityCombo->insertItem(i18n("1 (high)"));
   mPriorityCombo->insertItem(i18n("2"));
   mPriorityCombo->insertItem(i18n("3"));
   mPriorityCombo->insertItem(i18n("4"));
   mPriorityCombo->insertItem(i18n("5 (low)"));
   //topLayout->addWidget(mPriorityCombo);
 }
 
 void KOEditorGeneralTodo::initStatus(QWidget *parent,QBoxLayout *topLayout)
 {
   QBoxLayout *statusLayout = new QHBoxLayout(topLayout);
 
   initCompletion( parent, statusLayout );
 
   statusLayout->addStretch( 1 );
 
   initPriority( parent, statusLayout );
 }
 
 void KOEditorGeneralTodo::setDefaults(QDateTime due,bool allDay)
 {
 
   mSummaryEdit->load(KOLocationBox::SUMMARYTODO);
   mLocationEdit->load(KOLocationBox::LOCATION);
   KOEditorGeneral::setDefaults(allDay);
 
   mTimeButton->setChecked( !allDay );
   if(mTimeButton->isChecked()) {
     mTimeButton->setEnabled(true);
   }
   else {
     mTimeButton->setEnabled(false);
   }
   
   enableTimeEdits( !allDay );
-  
-  mDueCheck->setChecked(false);
-  enableDueEdit(false);
+  if ( due.isValid() ) {
+      mDueCheck->setChecked(true);
+      enableDueEdit(true);
+  } else {
+      mDueCheck->setChecked(false);
+      enableDueEdit(false);
+      due = QDateTime::currentDateTime().addDays(7);
+  }
 
   alarmDisable(true);
   
   mStartCheck->setChecked(false);
   enableStartEdit(false);
 
   mDueDateEdit->setDate(due.date());
   mDueTimeEdit->setTime(due.time());
-  
-  mStartDateEdit->setDate(QDate::currentDate());
-  mStartTimeEdit->setTime(QTime::currentTime());  
+  due = due.addDays(-7);
+  mStartDateEdit->setDate(due.date());
+  mStartTimeEdit->setTime(due.time());  
 
   mPriorityCombo->setCurrentItem(2);
   mCompletedLabel->setText(i18n("completed"));;
   mCompletedCombo->setCurrentItem(0);
 }
 
 void KOEditorGeneralTodo::readTodo(Todo *todo)
 {
 
   mSummaryEdit->load(KOLocationBox::SUMMARYTODO);
   mLocationEdit->load(KOLocationBox::LOCATION);
   KOEditorGeneral::readIncidence(todo);
 
   QDateTime dueDT;
   
   if (todo->hasDueDate()) {
     enableAlarmEdit(true);
     dueDT = todo->dtDue();
     mDueDateEdit->setDate(todo->dtDue().date());
     mDueTimeEdit->setTime(todo->dtDue().time());
     mDueCheck->setChecked(true);
   } else {
     alarmDisable(true);
     mDueDateEdit->setEnabled(false);
     mDueTimeEdit->setEnabled(false);
     mDueDateEdit->setDate(QDate::currentDate());
     mDueTimeEdit->setTime(QTime::currentTime());
     mDueCheck->setChecked(false);
   }
 
   if (todo->hasStartDate()) {
     mStartDateEdit->setDate(todo->dtStart().date());
     mStartTimeEdit->setTime(todo->dtStart().time());
     mStartCheck->setChecked(true);
   } else {
     mStartDateEdit->setEnabled(false);
     mStartTimeEdit->setEnabled(false);
     mStartDateEdit->setDate(QDate::currentDate());
     mStartTimeEdit->setTime(QTime::currentTime());
     mStartCheck->setChecked(false);
   }
 
   mTimeButton->setChecked( !todo->doesFloat() );
 
   mCompletedCombo->setCurrentItem(todo->percentComplete() / 20);
   if (todo->isCompleted() && todo->hasCompletedDate()) {
     mCompleted = todo->completed();
   }
   setCompletedDate();
 
   mPriorityCombo->setCurrentItem(todo->priority()-1);
 }
 
 void KOEditorGeneralTodo::writeTodo(Todo *todo)
 {
   KOEditorGeneral::writeIncidence(todo);
 
   // temp. until something better happens.
   QString tmpStr;
   
   todo->setHasDueDate(mDueCheck->isChecked());
   todo->setHasStartDate(mStartCheck->isChecked());
 
   QDate tmpDate;
   QTime tmpTime;
   QDateTime tmpDT;
   if ( mTimeButton->isChecked() ) {
     todo->setFloats(false);
     
     // set due date/time
     tmpDate = mDueDateEdit->date();
     tmpTime = mDueTimeEdit->getTime();
     tmpDT.setDate(tmpDate);
     tmpDT.setTime(tmpTime);
     todo->setDtDue(tmpDT);
 
     // set start date/time
     tmpDate = mStartDateEdit->date();
     tmpTime = mStartTimeEdit->getTime();
     tmpDT.setDate(tmpDate);
     tmpDT.setTime(tmpTime);
     todo->setDtStart(tmpDT);
   } else {
     todo->setFloats(true);
 
     // need to change this.
     tmpDate = mDueDateEdit->date();
     tmpTime.setHMS(0,0,0);
     tmpDT.setDate(tmpDate);
     tmpDT.setTime(tmpTime);
     todo->setDtDue(tmpDT);
     
     tmpDate = mStartDateEdit->date();
     tmpTime.setHMS(0,0,0);
     tmpDT.setDate(tmpDate);
     tmpDT.setTime(tmpTime);