summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/WhatsNew.txt3
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt12
-rw-r--r--korganizer/koagenda.cpp2
-rw-r--r--korganizer/koagendaview.cpp2
-rw-r--r--korganizer/kolistview.cpp2
-rw-r--r--korganizer/koprefs.cpp1
-rw-r--r--korganizer/koprefs.h1
-rw-r--r--korganizer/koprefsdialog.cpp19
8 files changed, 30 insertions, 12 deletions
diff --git a/bin/kdepim/WhatsNew.txt b/bin/kdepim/WhatsNew.txt
index 05cffbf..3532084 100644
--- a/bin/kdepim/WhatsNew.txt
+++ b/bin/kdepim/WhatsNew.txt
@@ -5,7 +5,8 @@ Info about the changes in new versions of KDE-Pim/Pi
This is the new stable version.
Bugfix:
Fixed a problem with agenda popup on the desktop in KO/Pi.
-Fixed a crash when reloading file, e.g. after a passive pi-sync operation.
+Fixed a crash when reloading file, e.g. after a passive pi-sync synchronization.
+Added config option to not display completed todos in agenda view.
********** VERSION 2.1.4 ************
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 2cb0132..41868d9 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -668,7 +668,7 @@
{ "short month","kurzen Monat" },
{ "icons","Icons" },
{ "Show Sat/Sun together","Zeige Sam/Son zusammen" },
-{ "Categorie colors are applied to text","Kategorie Farben färben Text" },
+{ "Category colors are applied to text","Kategorie Farben färben Text" },
{ "Month view uses day colors","Monatsansicht zeigt Tagesfarben" },
{ "Day color odd months","Tagesfarbe ungerade Monate" },
{ "Day color even months","Tagesfarbe gerade Monate" },
@@ -1086,7 +1086,7 @@
{ "Language","Sprache" },
{ "Show time in agenda items","Zeige Zeit in Agenda Items" },
{ "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" },
-{ "Show events, that are done","Zeige abgelaufene Termine" },
+{ "Show events that are done","Zeige abgelaufene Termine" },
{ "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" },
{ "+01:00 Europe/Oslo(CET)","+01:00 Europe/Oslo(CET)" },
{ "KO/Pi","KO/Pi" },
@@ -1200,7 +1200,7 @@
{ "Select Week","Wähle Woche" },
{ "Set alarm for selected...","Setze Alarm für Selekt..." },
{ "Set Alarm!","Setze Alarm!" },
-{ "Canged alarm for %1 items","Alarm für %1 Items geändert" },
+{ "Changed alarm for %1 items","Alarm für %1 Items geändert" },
{ " and "," und " },
{ "<IMG src="%1"> only )","nur <IMG src="%1"> )" },
{ "Mail to selected","Mail an Ausgewählte" },
@@ -1369,6 +1369,12 @@
{ "Choose action","Wähle Aktion" },
{ "Comment for todo:","Kommentar zum Todo:" },
{ "Stop+note","Stop+Notiz" },
+{ "Agenda view shows completed todos","Agenda Ansicht zeigt erledigte Todos" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
{ "","" },
{ "","" },
{ "","" },
diff --git a/korganizer/koagenda.cpp b/korganizer/koagenda.cpp
index cdeeac5..2a2acb1 100644
--- a/korganizer/koagenda.cpp
+++ b/korganizer/koagenda.cpp
@@ -1584,6 +1584,8 @@ void KOAgenda::updateTodo( Todo * todo, int days, bool remove)
//qDebug("remove****************************************** ");
return;
}
+ if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda )
+ return;
//qDebug("updateTodo+++++++++++++++++++++++++++++++++++++ ");
bool overdue = (!todo->isCompleted()) && (todo->dtDue() < QDate::currentDate())&& ( KOPrefs::instance()->mShowTodoInAgenda );
QDate currentDate;
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index b5a4199..fd9bf29 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -1236,7 +1236,7 @@ void KOAgendaView::fillAgenda()
Todo *todo = todos.at(numTodo);
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.
// Already completed items can be displayed on their original due date
//if not KOPrefs::instance()->mShowTodoInAgenda, show overdue in agenda
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index 02247c8..5f32e79 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -435,7 +435,7 @@ void KOListView::setAlarm()
inc->accept(v);
item = sel.next();
}
- 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);
calendar()->reInitAlarmSettings();
QTimer::singleShot( 1, this, SLOT ( resetFocus() ) );
diff --git a/korganizer/koprefs.cpp b/korganizer/koprefs.cpp
index 34044ab..8f951ee 100644
--- a/korganizer/koprefs.cpp
+++ b/korganizer/koprefs.cpp
@@ -120,6 +120,7 @@ KOPrefs::KOPrefs() :
addItemInt("Whats Next Prios",&mWhatsNextPrios,1);
addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
+ addItemBool("ShowCompletedTodoInAgenda",&mShowCompletedTodoInAgenda,true);
addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true);
addItemBool("HideNonStartedTodos",&mHideNonStartedTodos,false);
addItemBool("ShowCompletedTodo",&mShowCompletedTodo,true);
diff --git a/korganizer/koprefs.h b/korganizer/koprefs.h
index e06df1c..864cf1b 100644
--- a/korganizer/koprefs.h
+++ b/korganizer/koprefs.h
@@ -219,6 +219,7 @@ class KOPrefs : public KPimPrefs
bool mUsePassWd;
bool mShowSyncEvents;
bool mShowTodoInAgenda;
+ bool mShowCompletedTodoInAgenda;
bool mShowTimeInAgenda;
bool mHideNonStartedTodos;
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index e4bee63..c9477e3 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -716,6 +716,17 @@ void KOPrefsDialog::setupViewsTab()
topLayout->addWidget(dummy->checkBox(),ii++,0);
+ 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);
@@ -790,7 +801,7 @@ void KOPrefsDialog::setupViewsTab()
topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
dummy =
- addWidBool(i18n("Categorie colors are applied to text"),
+ addWidBool(i18n("Category colors are applied to text"),
&(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
topLayout->addWidget(dummy->checkBox(),ii++,0);
coloredCategoriesInMonthView =
@@ -843,7 +854,7 @@ void KOPrefsDialog::setupViewsTab()
KPrefsDialogWidBool *passwdk =
- addWidBool(i18n("Show events, that are done"),
+ addWidBool(i18n("Show events that are done"),
&(KOPrefs::instance()->mWNViewShowsPast),topFrame);
topLayout->addWidget(passwdk->checkBox(), ii++,0);
passwdk =
@@ -938,10 +949,6 @@ dummy =
&(KOPrefs::instance()->mTodoViewUsesForegroundColor),topFrame);
topLayout->addWidget(dummy->checkBox(),ii++,0);
- dummy =
- addWidBool(i18n("Allday Agenda view shows todos"),
- &(KOPrefs::instance()->mShowTodoInAgenda),topFrame);
- topLayout->addWidget(dummy->checkBox(),ii++,0);
topFrame = addPage(i18n("View Options"),0,0);