diff --git a/ChangeLog b/ChangeLog index 41018682f..9ffbbce77 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,7 @@ sort order, with optional filtering in the configuration file. This means user-defined reports can be written, and the reports currently in the configuration file can be renamed. + + New algorithm for determining when the "nag" message is displayed. ------ old releases ------------------------------ diff --git a/Makefile.am b/Makefile.am index 549946a75..fb05a3a4a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,3 @@ SUBDIRS = src -EXTRA_DIST = DEVELOPERS README.1.5.0 +EXTRA_DIST = DEVELOPERS diff --git a/README.1.5.0 b/README.1.5.0 deleted file mode 100644 index 23dc8bd5d..000000000 --- a/README.1.5.0 +++ /dev/null @@ -1,15 +0,0 @@ -Task 1.5.0 has a custom reports feature. Three of the existing task reports -are no longer implemented in task, and need to be added as custom reports. -Simply copy the following six lines into your existing .taskrc file. - -New task users need not do this - task will create an initial .taskrc file -on first startup. - - -report.long.columns=id,project,priority,entry,start,due,age,tags,description -report.long.sort=due+,priority-,project+ -report.list.columns=id,project,priority,due,active,age,description -report.list.sort=due+,priority-,project+ -report.ls.columns=id,project,priority,description -report.ls.sort=priority-,project+ - diff --git a/configure.ac b/configure.ac index 0d4bf6556..d6e95db0f 100644 --- a/configure.ac +++ b/configure.ac @@ -74,9 +74,3 @@ AC_CHECK_FUNC(srandom, [AC_DEFINE([HAVE_SRANDOM], [1], [Found srandom])]) AC_CONFIG_FILES([Makefile src/Makefile]) AC_OUTPUT -AC_MSG_NOTICE([...]) -AC_MSG_NOTICE([...]) -AC_MSG_NOTICE([Existing task users please read the README.1.5.0 file!]) -AC_MSG_NOTICE([...]) -AC_MSG_NOTICE([...]) - diff --git a/html/task.html b/html/task.html index 696a0a6b5..03c8eee60 100644 --- a/html/task.html +++ b/html/task.html @@ -112,23 +112,9 @@ sort order, with optional filtering in the configuration file. This means user-defined reports can be written, and the reports currently in the configuration file can be renamed. +
- Note that users of task prior to version 1.5.0 will need to add - the following six lines to their .taskrc file. See also the - README.1.5.0 file in the distribution for more details. -
- -report.long.columns=id,project,priority,entry,start,due,age,tags,description
-report.long.sort=due+,priority-,project+
-
-report.list.columns=id,project,priority,due,active,age,description
-report.list.sort=due+,priority-,project+
-
-report.ls.columns=id,project,priority,description
-report.ls.sort=priority-,project+
-
(Find out what was new in prior versions)
diff --git a/src/Config.cpp b/src/Config.cpp index f63a58700..3f46613a0 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -38,6 +38,15 @@ //////////////////////////////////////////////////////////////////////////////// Config::Config () { + // These are default (but overridable) reports. + (*this)["report.large.columns"] = "id,uuid,project,priority,entry,start,due,age,active,tags,description"; + (*this)["report.large.sort"] = "due+,priority-,project+"; + (*this)["report.long.columns"] = "id,project,priority,entry,start,due,age,tags,description"; + (*this)["report.long.sort"] = "due+,priority-,project+"; + (*this)["report.list.columns"] = "id,project,priority,due,active,age,description"; + (*this)["report.list.sort"] = "due+,priority-,project+"; + (*this)["report.ls.columns"] = "id,project,priority,description"; + (*this)["report.ls.sort"] = "priority-,project+"; } ////////////////////////////////////////////////////////////////////////////////