| -rw-r--r-- | korganizer/koagenda.cpp | 2 | ||||
| -rw-r--r-- | korganizer/koagendaview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/kolistview.cpp | 2 | ||||
| -rw-r--r-- | korganizer/koprefs.cpp | 1 | ||||
| -rw-r--r-- | korganizer/koprefs.h | 1 | ||||
| -rw-r--r-- | korganizer/koprefsdialog.cpp | 19 |
6 files changed, 19 insertions, 8 deletions
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp index cdeeac5..2a2acb1 100644 --- a/korganizer/koagenda.cpp +++ b/korganizer/koagenda.cpp @@ -1586,2 +1586,4 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove) } + if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda ) + return; //qDebug("updateTodo+++++++++++++++++++++++++++++++++++++ "); diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp index b5a4199..fd9bf29 100644 --- a/korganizer/koagendaview.cpp +++ b/korganizer/koagendaview.cpp @@ -1238,3 +1238,3 @@ void KOAgendaView::fillAgenda() if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue; // todo shall not be displayed if it has no date - + if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda ) continue; // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index 02247c8..5f32e79 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -437,3 +437,3 @@ void KOListView::setAlarm() } - topLevelWidget()->setCaption( i18n("Canged alarm for %1 items").arg( count ) ); + topLevelWidget()->setCaption( i18n("Changed alarm for %1 items").arg( count ) ); qDebug("KO: Set alarm for %d items", count); diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp index 34044ab..8f951ee 100644 --- a/korganizer/koprefs.cpp +++ b/korganizer/koprefs.cpp @@ -122,2 +122,3 @@ KOPrefs::KOPrefs() : addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true); + addItemBool("ShowCompletedTodoInAgenda",&mShowCompletedTodoInAgenda,true); addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true); diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h index e06df1c..864cf1b 100644 --- a/korganizer/koprefs.h +++ b/korganizer/koprefs.h @@ -221,2 +221,3 @@ class KOPrefs : public KPimPrefs bool mShowTodoInAgenda; + bool mShowCompletedTodoInAgenda; bool mShowTimeInAgenda; diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp index e4bee63..c9477e3 100644 --- a/korganizer/koprefsdialog.cpp +++ b/korganizer/koprefsdialog.cpp @@ -718,2 +718,13 @@ void KOPrefsDialog::setupViewsTab() + dummy = + addWidBool(i18n("Allday Agenda view shows todos"), + &(KOPrefs::instance()->mShowTodoInAgenda),topFrame); + topLayout->addWidget(dummy->checkBox(),ii++,0); + + + + dummy = + addWidBool(i18n("Agenda view shows completed todos"), + &(KOPrefs::instance()->mShowCompletedTodoInAgenda),topFrame); + topLayout->addWidget(dummy->checkBox(),ii++,0); @@ -792,3 +803,3 @@ void KOPrefsDialog::setupViewsTab() dummy = - addWidBool(i18n("Categorie colors are applied to text"), + addWidBool(i18n("Category colors are applied to text"), &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); @@ -845,3 +856,3 @@ void KOPrefsDialog::setupViewsTab() - addWidBool(i18n("Show events, that are done"), + addWidBool(i18n("Show events that are done"), &(KOPrefs::instance()->mWNViewShowsPast),topFrame); @@ -940,6 +951,2 @@ dummy = - dummy = - addWidBool(i18n("Allday Agenda view shows todos"), - &(KOPrefs::instance()->mShowTodoInAgenda),topFrame); - topLayout->addWidget(dummy->checkBox(),ii++,0); |