1 files changed, 5 insertions, 7 deletions

diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp
index 10d9a8c..d32d5a5 100644
--- a/korganizer/koeditorgeneraltodo.cpp
+++ b/korganizer/koeditorgeneraltodo.cpp
@@ -163,169 +163,167 @@ void KOEditorGeneralTodo::initCompletion(QWidget *parent, QBoxLayout *topLayout)
   mCompletedCombo->setSizePolicy( QSizePolicy( QSizePolicy::Preferred,QSizePolicy::Preferred) );
   mCompletedLabel->setSizePolicy( QSizePolicy( QSizePolicy::Expanding,QSizePolicy::Preferred) );
   connect(mCompleteDateEdit,SIGNAL(setTimeTo(QTime)),mCompleteTimeEdit,SLOT(setTime(QTime)));
 
   if (  QApplication::desktop()->width() <= 480 ) {
       if (  QApplication::desktop()->width() < 320 )
           mCompleteDateEdit->setMaximumWidth( 85 );
       else 
           mCompleteDateEdit->setMaximumWidth( 140 );
       topLayout->setSpacing( 0 );
   }
 }
 
 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);
-  }
+  mTimeButton->setEnabled( !allDay );
   
   enableTimeEdits( !allDay );
   if ( due.isValid() ) {
       mDueCheck->setChecked(true);
       enableDueEdit(true);
       alarmDisable(false);
   } 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());
   due = due.addDays(-7);
   mStartDateEdit->setDate(due.date());
   mStartTimeEdit->setTime(due.time());  
 
   mPriorityCombo->setCurrentItem(2);
   mCompletedLabel->setText(i18n(" completed"));;
   mCompletedCombo->setCurrentItem(0);
   mCompleteDateEdit->hide();
   mCompleteTimeEdit->hide();
 }
 
 void KOEditorGeneralTodo::readTodo(Todo *todo)
 {
 
   mSummaryEdit->load(KOLocationBox::SUMMARYTODO);
   mLocationEdit->load(KOLocationBox::LOCATION);
   KOEditorGeneral::readIncidence(todo);
 
   QDateTime dueDT;
+  mTimeButton->setChecked( !todo->doesFloat() );
+  mTimeButton->setEnabled( !todo->doesFloat() );
   
   if (todo->hasDueDate()) {
     enableAlarmEdit(true);
     dueDT = todo->dtDue();
     mDueDateEdit->setDate(todo->dtDue().date());
     mDueTimeEdit->setTime(todo->dtDue().time());
     mDueCheck->setChecked(true);
+    mTimeButton->setEnabled( 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);
+    mTimeButton->setEnabled( 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);