todo rec fixes

1 files changed, 29 insertions, 0 deletions

diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 069dda8..9232e09 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -260,157 +260,186 @@ void KOTodoEditor::deleteTodo()
   if (mTodo) {
     if (KOPrefs::instance()->mConfirm) {
       switch (msgItemDelete()) {
         case KMessageBox::Continue: // OK
           emit todoToBeDeleted(mTodo);
           emit dialogClose(mTodo);
           mCalendar->deleteTodo(mTodo);
           emit todoDeleted();
           reject();
           break;
       }
     }
     else {
       emit todoToBeDeleted(mTodo);
       emit dialogClose(mTodo);
       mCalendar->deleteTodo(mTodo);
       emit todoDeleted();
       reject();
     }
   } else {
     reject();
   }
 }
 
 void KOTodoEditor::setDefaults(QDateTime due,Todo *relatedEvent,bool allDay)
 {
   mRelatedTodo = relatedEvent;
       
   mGeneral->setDefaults(due,allDay);
   mDetails->setDefaults(); 
   showPage( 0 );
   if ( mRelatedTodo ) {
       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()->setFocus();
       mGeneral->mSummaryEdit->lineEdit()->setCursorPosition ( len+2 ); 
       mGeneral->mSummaryEdit->lineEdit()->setSelection ( 0, len+2 );
       
   } else
       mGeneral->setFocusOn( 2 );
   tabWidget()->setTabEnabled ( mRecurrence->parentWidget(), false );
   mRecurrence->setDefaults(QDateTime::currentDateTime(),QDateTime::currentDateTime().addSecs( 3600 ),true);
 }
 void KOTodoEditor::checkRecurrence()
 {
     if ( mGeneral->mDueCheck->isChecked() && mGeneral->mStartCheck->isChecked()) {
         tabWidget()->setTabEnabled ( mRecurrence->parentWidget(), true );
 
         if ( mTodo )
             mRecurrence->readEvent( mTodo );
         else {
             bool time = mGeneral->mTimeButton->isChecked();
             QDateTime from,to;
             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;
             mRecurrence->setDefaults(from,to,!time);
         }
     } else {
         tabWidget()->setTabEnabled ( mRecurrence->parentWidget(), false );
         mRecurrence->setDefaults(QDateTime::currentDateTime(),QDateTime::currentDateTime().addSecs( 3600 ),true);
     }
 }
 void KOTodoEditor::readTodo(Todo *todo)
 {
   mGeneral->readTodo(todo);
   mDetails->readEvent(todo);
   mRelatedTodo = 0;//todo->relatedTo();
   // categories
   // mCategoryDialog->setSelected(todo->categories());
 
   // We should handle read-only events here.
 }
 
 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);
+      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 ) );
+      }
+      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,
       i18n("This item will be permanently deleted."),
       i18n("KOrganizer Confirmation"),i18n("Delete"));
 }
 
 void KOTodoEditor::modified (int modification)
 {
   if (modification == KOGlobals::CATEGORY_MODIFIED || 
       KOGlobals::UNKNOWN_MODIFIED == modification )
       //  mCategoryDialog->setSelected (mTodo->categories ());
   mGeneral->modified (mTodo, modification);
 
 }
 
 void KOTodoEditor::slotLoadTemplate()
 {
 
   QString fileName =locateLocal( "templates", "todos" ); 
   QDir t_dir;
   if ( !t_dir.exists(fileName) )
       t_dir.mkdir ( fileName );
   fileName += "/todo";
   fileName = KFileDialog::getSaveFileName(  fileName , "Load Todo template", this );
     if ( fileName.length() == 0 )
         return;
     CalendarLocal cal;
     ICalFormat format;
     if ( !format.load( &cal, fileName ) ) {
         KMessageBox::error( this, i18n("Error loading template file\n '%1'.")
                             .arg( fileName ) );
         return ;
     }
     QPtrList<Todo> todos = cal.todos();
     Todo * todo = todos.first();
     if ( !todo ) {
         KMessageBox::error( this,
                             i18n("Template does not\ncontain a valid Todo."));
     } else {
         readTodo( todo );
     }
   
 }
 
 void KOTodoEditor::slotSaveTemplate()
 {
     QString fileName =locateLocal( "templates", "todos" ); 
     QDir t_dir;
     if ( !t_dir.exists(fileName) )
         t_dir.mkdir ( fileName );
     fileName += "/todo";
     fileName = KFileDialog::getSaveFileName(  fileName , "Save as Todo template", this );