| -rw-r--r-- | bin/kdepim/WhatsNew.txt | 5 | ||||
| -rw-r--r-- | desktop/rpm/kdepim_rpm | 2 | ||||
| -rw-r--r-- | korganizer/koagendaview.cpp | 10 | ||||
| -rw-r--r-- | korganizer/kotodoeditor.cpp | 35 | ||||
| -rw-r--r-- | version | 2 |
5 files changed, 17 insertions, 37 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt index beeaf60..05c1afd 100644 --- a/bin/kdepim/WhatsNew.txt +++ b/bin/kdepim/WhatsNew.txt @@ -1,5 +1,10 @@ Info about the changes in new versions of KDE-Pim/Pi +********** VERSION 2.0.12 ************ + +Fixed a bug in todo start/due date handling for non recurring todos with a start and due date. + + ********** VERSION 2.0.11 ************ Fixed some problems in pi-sync mode diff --git a/desktop/rpm/kdepim_rpm b/desktop/rpm/kdepim_rpm index b6a8491..0d4c9d6 100644 --- a/desktop/rpm/kdepim_rpm +++ b/desktop/rpm/kdepim_rpm @@ -1,6 +1,6 @@ Summary: A collection of PIM programs Name: KDE-Pim-Pi -Version: 2.0.11 +Version: 2.0.12 Release: SuSE_9.2 Copyright:GPL Group: Productivity/Pim diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index 4ff6899..db66413 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -1001,16 +1001,10 @@ void KOAgendaView::updateEventDates(KOAgendaItem *item, int type) } else if ( item->incidence()->type() == "Todo" ) { Todo* to = static_cast<Todo*>(item->incidence()); - int len = 0; - if ( to->hasStartDate() && to->hasDueDate() ) - len = to->dtStart().secsTo( to->dtDue()); to->setDtDue(endDt); if ( to->hasStartDate() ) { - if ( len>0 ) - to->setDtStart(to->dtDue().addSecs( -len )); - else - if (to->dtStart() > to->dtDue() ) - to->setDtStart(to->dtDue().addDays( -3 )); + if (to->dtStart() >= to->dtDue() ) + to->setDtStart(to->dtDue().addDays( -2 )); } } diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index f9f037a..51e2524 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp @@ -352,35 +352,16 @@ void KOTodoEditor::writeTodo(Todo *event) } 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 { + if ( event->doesRecur() ) { + event->setRecurrenceID( event->dtStart().addSecs(-1) ); + event->setRecurDates(); + } else { event->setHasRecurrenceID( false ); - event->recurrence()->unsetRecurs(); } -#endif - } else - event->recurrence()->unsetRecurs(); + } else { + event->setHasRecurrenceID( false ); + event->recurrence()->unsetRecurs(); + } } bool KOTodoEditor::validateInput() @@ -1 +1 @@ -version = "2.0.11"; +version = "2.0.12"; |