author | zautrix <zautrix> | 2005-02-03 00:58:41 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-02-03 00:58:41 (UTC) |
commit | 7e3c508b7ee613c534c2bf0cacf38f96efaef613 (patch) (unidiff) | |
tree | 5e70a8653c9620fda7ce2e4c1c427efbbb2127b6 | |
parent | ca3c58c09b1b7d2733eeacc9e8ca568134926e93 (diff) | |
download | kdepimpi-7e3c508b7ee613c534c2bf0cacf38f96efaef613.zip kdepimpi-7e3c508b7ee613c534c2bf0cacf38f96efaef613.tar.gz kdepimpi-7e3c508b7ee613c534c2bf0cacf38f96efaef613.tar.bz2 |
todo fix
-rw-r--r-- | korganizer/kotodoview.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp index c5b9a21..03a8f1c 100644 --- a/korganizer/kotodoview.cpp +++ b/korganizer/kotodoview.cpp | |||
@@ -670,48 +670,52 @@ void KOTodoView::updateView() | |||
670 | 670 | ||
671 | // qDebug("yytodo %s ", todo->summary().latin1()); | 671 | // qDebug("yytodo %s ", todo->summary().latin1()); |
672 | // } | 672 | // } |
673 | //qDebug("for "); | 673 | //qDebug("for "); |
674 | for(todo = todoList.first(); todo; todo = todoList.next()) { | 674 | for(todo = todoList.first(); todo; todo = todoList.next()) { |
675 | if (!mTodoMap.contains(todo) && checkTodo( todo ) ) | 675 | if (!mTodoMap.contains(todo) && checkTodo( todo ) ) |
676 | { | 676 | { |
677 | insertTodoItem(todo); | 677 | insertTodoItem(todo); |
678 | } | 678 | } |
679 | } | 679 | } |
680 | //qDebug("for end "); | 680 | //qDebug("for end "); |
681 | // Restore opened/closed state | 681 | // Restore opened/closed state |
682 | mTodoListView->blockSignals( true ); | 682 | mTodoListView->blockSignals( true ); |
683 | if( mDocPrefs ) restoreItemState( mTodoListView->firstChild() ); | 683 | if( mDocPrefs ) restoreItemState( mTodoListView->firstChild() ); |
684 | mTodoListView->blockSignals( false ); | 684 | mTodoListView->blockSignals( false ); |
685 | mTodoListView->setFocus(); | 685 | mTodoListView->setFocus(); |
686 | processSelectionChange(); | 686 | processSelectionChange(); |
687 | } | 687 | } |
688 | 688 | ||
689 | bool KOTodoView::checkTodo( Todo * todo ) | 689 | bool KOTodoView::checkTodo( Todo * todo ) |
690 | { | 690 | { |
691 | 691 | ||
692 | if ( !KOPrefs::instance()->mShowCompletedTodo && todo->isCompleted() ) | 692 | if ( !KOPrefs::instance()->mShowCompletedTodo && todo->isCompleted() ) |
693 | return false; | 693 | return false; |
694 | if ( !todo->isCompleted() ) { | ||
695 | if ( todo->hasDueDate() && todo->dtDue().date() <= QDate::currentDate() ) | ||
696 | return true; | ||
697 | } | ||
694 | if ( KOPrefs::instance()->mHideNonStartedTodos && mNavigator ) { | 698 | if ( KOPrefs::instance()->mHideNonStartedTodos && mNavigator ) { |
695 | if ( todo->hasStartDate() ) | 699 | if ( todo->hasStartDate() ) |
696 | if ( mNavigator->selectedDates().last() < todo->dtStart().date() ) | 700 | if ( mNavigator->selectedDates().last() < todo->dtStart().date() ) |
697 | return false; | 701 | return false; |
698 | if ( todo->hasDueDate() ) | 702 | if ( todo->hasDueDate() ) |
699 | if ( mNavigator->selectedDates().first() > todo->dtDue().date() ) | 703 | if ( mNavigator->selectedDates().first() > todo->dtDue().date() ) |
700 | return false; | 704 | return false; |
701 | } | 705 | } |
702 | return true; | 706 | return true; |
703 | } | 707 | } |
704 | 708 | ||
705 | void KOTodoView::restoreItemState( QListViewItem *item ) | 709 | void KOTodoView::restoreItemState( QListViewItem *item ) |
706 | { | 710 | { |
707 | pendingSubtodo = 0; | 711 | pendingSubtodo = 0; |
708 | while( item ) { | 712 | while( item ) { |
709 | KOTodoViewItem *todoItem = (KOTodoViewItem *)item; | 713 | KOTodoViewItem *todoItem = (KOTodoViewItem *)item; |
710 | todoItem->setOpen( mDocPrefs->readBoolEntry( todoItem->todo()->uid() ) ); | 714 | todoItem->setOpen( mDocPrefs->readBoolEntry( todoItem->todo()->uid() ) ); |
711 | if( item->childCount() > 0 ) restoreItemState( item->firstChild() ); | 715 | if( item->childCount() > 0 ) restoreItemState( item->firstChild() ); |
712 | item = item->nextSibling(); | 716 | item = item->nextSibling(); |
713 | } | 717 | } |
714 | } | 718 | } |
715 | 719 | ||
716 | 720 | ||
717 | QMap<Todo *,KOTodoViewItem *>::ConstIterator | 721 | QMap<Todo *,KOTodoViewItem *>::ConstIterator |