-rw-r--r-- | korganizer/koeditorgeneraltodo.cpp | 12 |
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 | |||
@@ -205,18 +205,13 @@ void KOEditorGeneralTodo::setDefaults(QDateTime due,bool allDay) | |||
205 | 205 | ||
206 | mSummaryEdit->load(KOLocationBox::SUMMARYTODO); | 206 | mSummaryEdit->load(KOLocationBox::SUMMARYTODO); |
207 | mLocationEdit->load(KOLocationBox::LOCATION); | 207 | mLocationEdit->load(KOLocationBox::LOCATION); |
208 | KOEditorGeneral::setDefaults(allDay); | 208 | KOEditorGeneral::setDefaults(allDay); |
209 | 209 | ||
210 | mTimeButton->setChecked( !allDay ); | 210 | mTimeButton->setChecked( !allDay ); |
211 | if(mTimeButton->isChecked()) { | 211 | mTimeButton->setEnabled( !allDay ); |
212 | mTimeButton->setEnabled(true); | ||
213 | } | ||
214 | else { | ||
215 | mTimeButton->setEnabled(false); | ||
216 | } | ||
217 | 212 | ||
218 | enableTimeEdits( !allDay ); | 213 | enableTimeEdits( !allDay ); |
219 | if ( due.isValid() ) { | 214 | if ( due.isValid() ) { |
220 | mDueCheck->setChecked(true); | 215 | mDueCheck->setChecked(true); |
221 | enableDueEdit(true); | 216 | enableDueEdit(true); |
222 | alarmDisable(false); | 217 | alarmDisable(false); |
@@ -249,19 +244,22 @@ void KOEditorGeneralTodo::readTodo(Todo *todo) | |||
249 | 244 | ||
250 | mSummaryEdit->load(KOLocationBox::SUMMARYTODO); | 245 | mSummaryEdit->load(KOLocationBox::SUMMARYTODO); |
251 | mLocationEdit->load(KOLocationBox::LOCATION); | 246 | mLocationEdit->load(KOLocationBox::LOCATION); |
252 | KOEditorGeneral::readIncidence(todo); | 247 | KOEditorGeneral::readIncidence(todo); |
253 | 248 | ||
254 | QDateTime dueDT; | 249 | QDateTime dueDT; |
250 | mTimeButton->setChecked( !todo->doesFloat() ); | ||
251 | mTimeButton->setEnabled( !todo->doesFloat() ); | ||
255 | 252 | ||
256 | if (todo->hasDueDate()) { | 253 | if (todo->hasDueDate()) { |
257 | enableAlarmEdit(true); | 254 | enableAlarmEdit(true); |
258 | dueDT = todo->dtDue(); | 255 | dueDT = todo->dtDue(); |
259 | mDueDateEdit->setDate(todo->dtDue().date()); | 256 | mDueDateEdit->setDate(todo->dtDue().date()); |
260 | mDueTimeEdit->setTime(todo->dtDue().time()); | 257 | mDueTimeEdit->setTime(todo->dtDue().time()); |
261 | mDueCheck->setChecked(true); | 258 | mDueCheck->setChecked(true); |
259 | mTimeButton->setEnabled( true ); | ||
262 | } else { | 260 | } else { |
263 | alarmDisable(true); | 261 | alarmDisable(true); |
264 | mDueDateEdit->setEnabled(false); | 262 | mDueDateEdit->setEnabled(false); |
265 | mDueTimeEdit->setEnabled(false); | 263 | mDueTimeEdit->setEnabled(false); |
266 | mDueDateEdit->setDate(QDate::currentDate()); | 264 | mDueDateEdit->setDate(QDate::currentDate()); |
267 | mDueTimeEdit->setTime(QTime::currentTime()); | 265 | mDueTimeEdit->setTime(QTime::currentTime()); |
@@ -269,21 +267,21 @@ void KOEditorGeneralTodo::readTodo(Todo *todo) | |||
269 | } | 267 | } |
270 | 268 | ||
271 | if (todo->hasStartDate()) { | 269 | if (todo->hasStartDate()) { |
272 | mStartDateEdit->setDate(todo->dtStart().date()); | 270 | mStartDateEdit->setDate(todo->dtStart().date()); |
273 | mStartTimeEdit->setTime(todo->dtStart().time()); | 271 | mStartTimeEdit->setTime(todo->dtStart().time()); |
274 | mStartCheck->setChecked(true); | 272 | mStartCheck->setChecked(true); |
273 | mTimeButton->setEnabled( true ); | ||
275 | } else { | 274 | } else { |
276 | mStartDateEdit->setEnabled(false); | 275 | mStartDateEdit->setEnabled(false); |
277 | mStartTimeEdit->setEnabled(false); | 276 | mStartTimeEdit->setEnabled(false); |
278 | mStartDateEdit->setDate(QDate::currentDate()); | 277 | mStartDateEdit->setDate(QDate::currentDate()); |
279 | mStartTimeEdit->setTime(QTime::currentTime()); | 278 | mStartTimeEdit->setTime(QTime::currentTime()); |
280 | mStartCheck->setChecked(false); | 279 | mStartCheck->setChecked(false); |
281 | } | 280 | } |
282 | 281 | ||
283 | mTimeButton->setChecked( !todo->doesFloat() ); | ||
284 | 282 | ||
285 | mCompletedCombo->setCurrentItem(todo->percentComplete() / 20); | 283 | mCompletedCombo->setCurrentItem(todo->percentComplete() / 20); |
286 | if (todo->isCompleted() && todo->hasCompletedDate()) { | 284 | if (todo->isCompleted() && todo->hasCompletedDate()) { |
287 | mCompleted = todo->completed(); | 285 | mCompleted = todo->completed(); |
288 | } | 286 | } |
289 | setCompletedDate(); | 287 | setCompletedDate(); |