-rw-r--r-- | korganizer/kotodoeditor.cpp | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index f9f037a..51e2524 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp @@ -343,53 +343,34 @@ void KOTodoEditor::readTodo(Todo *todo) void KOTodoEditor::writeTodo(Todo *event) { mGeneral->writeTodo(event); mDetails->writeEvent(event); // set related event, i.e. parent to-do in this case. if (mRelatedTodo) { event->setRelatedTo(mRelatedTodo); } if ( mGeneral->mDueCheck->isChecked() && mGeneral->mStartCheck->isChecked()) { mRecurrence->writeEvent(event); + if ( event->doesRecur() ) { event->setRecurrenceID( event->dtStart().addSecs(-1) ); event->setRecurDates(); -#if 0 - bool ok; - QDateTime next = event->getNextOccurence( event->dtStart().addSecs(-1), &ok ); - if ( ok ) { - QDateTime from,to; - bool time = mGeneral->mTimeButton->isChecked(); - if ( time ) { - to = QDateTime( mGeneral->mDueDateEdit->date(), mGeneral->mDueTimeEdit->getTime() ) ; - from = QDateTime( mGeneral->mStartDateEdit->date(),mGeneral->mStartTimeEdit->getTime( )) ; } else { - to = QDateTime( mGeneral->mDueDateEdit->date(), QTime( 0,0,0) ) ; - from = QDateTime( mGeneral->mStartDateEdit->date(),QTime( 0,0,0) ) ; - } - if ( to < from ) - to = from; - int secs = from.secsTo( to ); - event->setRecurrenceID( next ); - event->setDtStart( next ); - event->setDtDue( next.addSecs( secs ) ); + event->setHasRecurrenceID( false ); } - else { + } else { event->setHasRecurrenceID( false ); event->recurrence()->unsetRecurs(); } -#endif - } else - event->recurrence()->unsetRecurs(); } bool KOTodoEditor::validateInput() { if (!mGeneral->validateInput()) return false; if (!mDetails->validateInput()) return false; return true; } int KOTodoEditor::msgItemDelete() { return KMessageBox::warningContinueCancel(this, |