summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore 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
@@ -7,3 +7,4 @@ Bugfix:
7Fixed a problem with agenda popup on the desktop in KO/Pi. 7Fixed a problem with agenda popup on the desktop in KO/Pi.
8Fixed a crash when reloading file, e.g. after a passive pi-sync operation. 8Fixed a crash when reloading file, e.g. after a passive pi-sync synchronization.
9Added config option to not display completed todos in agenda view.
9 10
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
@@ -670,3 +670,3 @@
670{ "Show Sat/Sun together","Zeige Sam/Son zusammen" }, 670{ "Show Sat/Sun together","Zeige Sam/Son zusammen" },
671{ "Categorie colors are applied to text","Kategorie Farben färben Text" }, 671{ "Category colors are applied to text","Kategorie Farben färben Text" },
672{ "Month view uses day colors","Monatsansicht zeigt Tagesfarben" }, 672{ "Month view uses day colors","Monatsansicht zeigt Tagesfarben" },
@@ -1088,3 +1088,3 @@
1088{ "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" }, 1088{ "Color for Sundays + category "Holiday"","Farbe für Sonntags + Kategorie "Feiertag"" },
1089{ "Show events, that are done","Zeige abgelaufene Termine" }, 1089{ "Show events that are done","Zeige abgelaufene Termine" },
1090{ "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" }, 1090{ "Hide not running Todos in To-do view","Verstecke nicht laufende Todos" },
@@ -1202,3 +1202,3 @@
1202{ "Set Alarm!","Setze Alarm!" }, 1202{ "Set Alarm!","Setze Alarm!" },
1203{ "Canged alarm for %1 items","Alarm für %1 Items geändert" }, 1203{ "Changed alarm for %1 items","Alarm für %1 Items geändert" },
1204{ " and "," und " }, 1204{ " and "," und " },
@@ -1371,2 +1371,8 @@
1371{ "Stop+note","Stop+Notiz" }, 1371{ "Stop+note","Stop+Notiz" },
1372{ "Agenda view shows completed todos","Agenda Ansicht zeigt erledigte Todos" },
1373{ "","" },
1374{ "","" },
1375{ "","" },
1376{ "","" },
1377{ "","" },
1372{ "","" }, 1378{ "","" },
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)
1586 } 1586 }
1587 if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda )
1588 return;
1587 //qDebug("updateTodo+++++++++++++++++++++++++++++++++++++ "); 1589 //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()
1238 if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue; // todo shall not be displayed if it has no date 1238 if ( ! todo->hasDueDate() && !todo->hasCompletedDate()) continue; // todo shall not be displayed if it has no date
1239 1239 if ( todo->hasCompletedDate() && !KOPrefs::instance()->mShowCompletedTodoInAgenda ) continue;
1240 // ToDo items shall be displayed for the day they are due, but only showed today if they are already overdue. 1240 // 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()
437 } 437 }
438 topLevelWidget()->setCaption( i18n("Canged alarm for %1 items").arg( count ) ); 438 topLevelWidget()->setCaption( i18n("Changed alarm for %1 items").arg( count ) );
439 qDebug("KO: Set alarm for %d items", count); 439 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() :
122 addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true); 122 addItemBool("ShowTodoInAgenda",&mShowTodoInAgenda,true);
123 addItemBool("ShowCompletedTodoInAgenda",&mShowCompletedTodoInAgenda,true);
123 addItemBool("ShowTimeInAgenda",&mShowTimeInAgenda,true); 124 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
221 bool mShowTodoInAgenda; 221 bool mShowTodoInAgenda;
222 bool mShowCompletedTodoInAgenda;
222 bool mShowTimeInAgenda; 223 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()
718 718
719 dummy =
720 addWidBool(i18n("Allday Agenda view shows todos"),
721 &(KOPrefs::instance()->mShowTodoInAgenda),topFrame);
722 topLayout->addWidget(dummy->checkBox(),ii++,0);
723
724
725
726 dummy =
727 addWidBool(i18n("Agenda view shows completed todos"),
728 &(KOPrefs::instance()->mShowCompletedTodoInAgenda),topFrame);
729 topLayout->addWidget(dummy->checkBox(),ii++,0);
719 730
@@ -792,3 +803,3 @@ void KOPrefsDialog::setupViewsTab()
792 dummy = 803 dummy =
793 addWidBool(i18n("Categorie colors are applied to text"), 804 addWidBool(i18n("Category colors are applied to text"),
794 &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); 805 &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
@@ -845,3 +856,3 @@ void KOPrefsDialog::setupViewsTab()
845 856
846 addWidBool(i18n("Show events, that are done"), 857 addWidBool(i18n("Show events that are done"),
847 &(KOPrefs::instance()->mWNViewShowsPast),topFrame); 858 &(KOPrefs::instance()->mWNViewShowsPast),topFrame);
@@ -940,6 +951,2 @@ dummy =
940 951
941 dummy =
942 addWidBool(i18n("Allday Agenda view shows todos"),
943 &(KOPrefs::instance()->mShowTodoInAgenda),topFrame);
944 topLayout->addWidget(dummy->checkBox(),ii++,0);
945 952