diff --git a/NEWS b/NEWS index 83ac4fcf1..de3298f15 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Welcome to Task 1.3.0. +Welcome to Task 1.4.0. Task has been built and tested on the following configurations: diff --git a/TUTORIAL b/TUTORIAL index 00acedf1b..292647a68 100644 --- a/TUTORIAL +++ b/TUTORIAL @@ -1,4 +1,4 @@ -Task program tutorial, for version 1.3.0 +Task program tutorial, for version 1.4.0 ---------------------------------------- This guide shows how to quickly set up the task program, and become proficient @@ -21,10 +21,10 @@ Build the task program according to the directions in the INSTALL file. This transcript illustrates a typical installation: % ls - task-1.3.0.tar.gz - % gunzip task-1.3.0.tar.gz - % tar xf task-1.3.0.tar - % cd task-1.3.0 + task-1.4.0.tar.gz + % gunzip task-1.4.0.tar.gz + % tar xf task-1.4.0.tar + % cd task-1.4.0 % ./configure ... % make diff --git a/configure.ac b/configure.ac index ba8fa6674..1239b9938 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT(task, 1.3.0, bugs@beckingham.net) +AC_INIT(task, 1.4.0, bugs@beckingham.net) AM_INIT_AUTOMAKE AC_CONFIG_SRCDIR([src/task.cpp]) AC_CONFIG_HEADER([auto.h]) diff --git a/src/task.cpp b/src/task.cpp index c29ea99c5..1b6f30b4d 100644 --- a/src/task.cpp +++ b/src/task.cpp @@ -992,6 +992,8 @@ void handleLongList (const TDB& tdb, T& task, Config& conf) initializeColorRules (conf); + bool showAge = conf.get ("showage", true); + // Create a table for output. Table table; table.setTableWidth (width); @@ -1002,7 +1004,7 @@ void handleLongList (const TDB& tdb, T& task, Config& conf) table.addColumn ("Entry"); table.addColumn ("Start"); table.addColumn ("Due"); - table.addColumn ("Age"); + if (showAge) table.addColumn ("Age"); table.addColumn ("Tags"); table.addColumn ("Description"); @@ -1014,7 +1016,7 @@ void handleLongList (const TDB& tdb, T& task, Config& conf) table.setColumnUnderline (5); table.setColumnUnderline (6); table.setColumnUnderline (7); - table.setColumnUnderline (8); + if (showAge) table.setColumnUnderline (8); table.setColumnWidth (0, Table::minimum); table.setColumnWidth (1, Table::minimum); @@ -1022,15 +1024,15 @@ void handleLongList (const TDB& tdb, T& task, Config& conf) table.setColumnWidth (3, Table::minimum); table.setColumnWidth (4, Table::minimum); table.setColumnWidth (5, Table::minimum); - table.setColumnWidth (6, Table::minimum); - table.setColumnWidth (7, Table::minimum); - table.setColumnWidth (8, Table::flexible); + if (showAge) table.setColumnWidth (6, Table::minimum); + table.setColumnWidth ((showAge ? 7 : 6), Table::minimum); + table.setColumnWidth ((showAge ? 8 : 7), Table::flexible); table.setColumnJustification (0, Table::right); table.setColumnJustification (3, Table::right); table.setColumnJustification (4, Table::right); table.setColumnJustification (5, Table::right); - table.setColumnJustification (6, Table::right); + if (showAge) table.setColumnJustification (6, Table::right); table.sortOn (5, Table::ascendingDate); table.sortOn (2, Table::descendingPriority); @@ -1094,9 +1096,9 @@ void handleLongList (const TDB& tdb, T& task, Config& conf) table.addCell (row, 3, entered); table.addCell (row, 4, started); table.addCell (row, 5, due); - table.addCell (row, 6, age); - table.addCell (row, 7, tags); - table.addCell (row, 8, refTask.getDescription ()); + if (showAge) table.addCell (row, 6, age); + table.addCell (row, (showAge ? 7 : 6), tags); + table.addCell (row, (showAge ? 8 : 7), refTask.getDescription ()); if (conf.get ("color", true)) { diff --git a/task.html b/task.html index 9858c065a..6cf998fda 100644 --- a/task.html +++ b/task.html @@ -1,7 +1,7 @@ - Task 1.3.0 + Task 1.4.0