From 3d4bad303467254f6e52873dd29c045b0c253f1f Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 24 Feb 2013 16:31:31 -0500 Subject: [PATCH] Horizontal Space - Modified default report definitions to use shorter column labels, namely 'Proj' and 'Urg'. This results in less horizontal space use. - Adjusted unit tests accordingly. --- src/Config.cpp | 34 +++++++++++++++++----------------- src/ViewTask.cpp | 4 ++-- src/columns/ColTags.cpp | 1 - test/bug.804.t | 9 +++++---- test/verbose.t | 2 +- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Config.cpp b/src/Config.cpp index b43b9a245..82e8a4952 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -314,103 +314,103 @@ std::string Config::_defaults = "\n" "report.long.description=Lists all pending tasks\n" "report.long.columns=id,project,priority,entry,start,due,recur,due.countdown,entry.age,depends,tags,description\n" - "report.long.labels=ID,Project,Pri,Added,Started,Due,Recur,Countdown,Age,Deps,Tags,Description\n" + "report.long.labels=ID,Proj,Pri,Added,Started,Due,Recur,Countdown,Age,Deps,Tags,Description\n" "report.long.sort=due+,priority-,project+\n" "report.long.filter=status:pending\n" "\n" "report.list.description=Lists all pending tasks\n" "report.list.columns=id,project,priority,due,start.active,entry.age,description\n" - "report.list.labels=ID,Project,Pri,Due,Active,Age,Description\n" + "report.list.labels=ID,Proj,Pri,Due,Active,Age,Description\n" "report.list.sort=due+,priority-,start-,project+\n" "report.list.filter=status:pending\n" "\n" "report.ls.description=Minimal listing of all pending tasks\n" "report.ls.columns=id,project,priority,description\n" - "report.ls.labels=ID,Project,Pri,Description\n" + "report.ls.labels=ID,Proj,Pri,Description\n" "report.ls.sort=priority-,project+\n" "report.ls.filter=status:pending\n" "\n" "report.minimal.description=Minimal listing of all pending tasks\n" "report.minimal.columns=id,project,description.truncated\n" - "report.minimal.labels=ID,Project,Description\n" + "report.minimal.labels=ID,Proj,Description\n" "report.minimal.sort=project+,description+\n" "report.minimal.filter=status:pending\n" "\n" "report.newest.description=Shows the newest tasks\n" "report.newest.columns=id,project,priority,due,start.active,entry.age,description\n" - "report.newest.labels=ID,Project,Pri,Due,Active,Age,Description\n" + "report.newest.labels=ID,Proj,Pri,Due,Active,Age,Description\n" "report.newest.sort=id-\n" "report.newest.filter=status:pending limit:10\n" "\n" "report.oldest.description=Shows the oldest tasks\n" "report.oldest.columns=id,project,priority,due,start.active,entry.age,description\n" - "report.oldest.labels=ID,Project,Pri,Due,Active,Age,Description\n" + "report.oldest.labels=ID,Proj,Pri,Due,Active,Age,Description\n" "report.oldest.sort=id+\n" "report.oldest.filter=status:pending limit:10\n" "\n" "report.overdue.description=Lists overdue tasks\n" "report.overdue.columns=id,project,priority,due,start.active,entry.age,description\n" - "report.overdue.labels=ID,Project,Pri,Due,Active,Age,Description\n" + "report.overdue.labels=ID,Proj,Pri,Due,Active,Age,Description\n" "report.overdue.sort=due+,priority-,start-,project+\n" "report.overdue.filter=status:pending +OVERDUE\n" "\n" "report.active.description=Lists active tasks\n" "report.active.columns=id,project,priority,due,start.active,entry.age,description\n" - "report.active.labels=ID,Project,Pri,Due,Active,Age,Description\n" + "report.active.labels=ID,Proj,Pri,Due,Active,Age,Description\n" "report.active.sort=due+,priority-,project+\n" "report.active.filter=status:pending start.any:\n" "\n" "report.completed.description=Lists completed tasks\n" "report.completed.columns=end,project,priority,entry.age,description,uuid\n" - "report.completed.labels=Complete,Project,Pri,Age,Description,UUID\n" + "report.completed.labels=Complete,Proj,Pri,Age,Description,UUID\n" "report.completed.sort=end+,priority-,project+\n" "report.completed.filter=status:completed\n" "\n" "report.recurring.description=Lists recurring tasks\n" "report.recurring.columns=id,project,priority,due,recur,start.active,entry.age,description\n" - "report.recurring.labels=ID,Project,Pri,Due,Recur,Active,Age,Description\n" + "report.recurring.labels=ID,Proj,Pri,Due,Recur,Active,Age,Description\n" "report.recurring.sort=due+,priority-,start-,project+\n" "report.recurring.filter=status:pending parent.any:\n" "\n" "report.waiting.description=Lists all waiting tasks\n" "report.waiting.columns=id,project,priority,wait,entry.age,description\n" - "report.waiting.labels=ID,Project,Pri,Wait,Age,Description\n" + "report.waiting.labels=ID,Proj,Pri,Wait,Age,Description\n" "report.waiting.sort=wait+,priority-,project+\n" "report.waiting.filter=status:waiting\n" "\n" "report.all.description=Lists all pending and completed tasks\n" "report.all.columns=id,status,project,priority,due,end,start.active,entry.age,description\n" - "report.all.labels=ID,Status,Project,Pri,Due,Completed,Active,Age,Description\n" + "report.all.labels=ID,Status,Proj,Pri,Due,Completed,Active,Age,Description\n" "report.all.sort=entry+\n" "report.all.filter=status.not:deleted\n" "\n" "report.next.description=Lists the most urgent tasks\n" "report.next.columns=id,project,priority,due,start.active,entry.age,urgency,description\n" - "report.next.labels=ID,Project,Pri,Due,A,Age,Urgency,Description\n" + "report.next.labels=ID,Proj,Pri,Due,A,Age,Urg,Description\n" "report.next.sort=urgency-,due+,priority-,start-,project+\n" "report.next.filter=status:pending limit:page\n" "\n" "report.ready.description=Lists the most urgent tasks\n" "report.ready.columns=id,project,priority,due,start.active,entry.age,urgency,description\n" - "report.ready.labels=ID,Project,Pri,Due,A,Age,Urgency,Description\n" + "report.ready.labels=ID,Proj,Pri,Due,A,Age,Urg,Description\n" "report.ready.sort=urgency-,due+,priority-,start-,project+\n" "report.ready.filter=status:pending limit:page wait.none: '(scheduled.none: or scheduled.before:now )'\n" "\n" "report.blocked.description=Lists all blocked tasks\n" "report.blocked.columns=id,depends,project,priority,due,start.active,entry.age,description\n" - "report.blocked.labels=ID,Deps,Project,Pri,Due,Active,Age,Description\n" + "report.blocked.labels=ID,Deps,Proj,Pri,Due,Active,Age,Description\n" "report.blocked.sort=due+,priority-,start-,project+\n" "report.blocked.filter=status:pending +BLOCKED\n" "\n" "report.unblocked.description=Lists all unblocked tasks\n" "report.unblocked.columns=id,depends,project,priority,due,start.active,entry.age,description\n" - "report.unblocked.labels=ID,Deps,Project,Pri,Due,Active,Age,Description\n" + "report.unblocked.labels=ID,Deps,Proj,Pri,Due,Active,Age,Description\n" "report.unblocked.sort=due+,priority-,start-,project+\n" "report.unblocked.filter=status:pending -BLOCKED\n" "\n" "report.blocking.description=Lists all blocking tasks\n" "report.blocking.columns=id,depends,project,priority,due,start.active,entry.age,description\n" - "report.blocking.labels=ID,Deps,Project,Pri,Due,Active,Age,Description\n" + "report.blocking.labels=ID,Deps,Proj,Pri,Due,Active,Age,Description\n" "report.blocking.sort=due+,priority-,start-,project+\n" "report.blocking.filter=status:pending +BLOCKING\n" "\n"; diff --git a/src/ViewTask.cpp b/src/ViewTask.cpp index 395a91cd0..5379c323d 100644 --- a/src/ViewTask.cpp +++ b/src/ViewTask.cpp @@ -140,14 +140,14 @@ std::string ViewTask::render (std::vector & data, std::vector & seque unsigned int ideal; (*i)->measure (data[sequence[s]], min, ideal); - if (min > global_min) global_min = min; + if (min > global_min) global_min = min; if (ideal > global_ideal) global_ideal = ideal; } if (print_empty_columns || global_min != 0) { unsigned int label_length = utf8_length ((*i)->label ()); - if (label_length > global_min) global_min = label_length; + if (label_length > global_min) global_min = label_length; if (label_length > global_ideal) global_ideal = label_length; minimal.push_back (global_min); ideal.push_back (global_ideal); diff --git a/src/columns/ColTags.cpp b/src/columns/ColTags.cpp index 2d6ac5634..0b716db87 100644 --- a/src/columns/ColTags.cpp +++ b/src/columns/ColTags.cpp @@ -85,7 +85,6 @@ void ColumnTags::setStyle (const std::string& value) // Set the minimum and maximum widths for the value. void ColumnTags::measure (Task& task, unsigned int& minimum, unsigned int& maximum) { - if (_style == "indicator") minimum = maximum = context.config.get ("tag.indicator").length (); else if (_style == "count") minimum = maximum = 3; else if (_style == "default" || diff --git a/test/bug.804.t b/test/bug.804.t index c1f6c4d35..f02e16daf 100755 --- a/test/bug.804.t +++ b/test/bug.804.t @@ -33,10 +33,11 @@ use Test::More tests => 6; # Create the rc file. if (open my $fh, '>', 'bug.rc') { - print $fh "data.location=.\n"; - print $fh "bulk=100\n"; - print $fh "confirmation=no\n"; - print $fh "print.empty.columns=yes\n"; + print $fh "data.location=.\n", + "bulk=100\n", + "confirmation=no\n", + "print.empty.columns=yes\n", + "report.ls.labels=ID,Project,Pri,Description\n"; close $fh; ok (-r 'bug.rc', 'Created bug.rc'); } diff --git a/test/verbose.t b/test/verbose.t index e6a9805c7..42057616a 100755 --- a/test/verbose.t +++ b/test/verbose.t @@ -49,7 +49,7 @@ unlike ($output, qr/Created task \d/, '\'new-id\' verbosity good'); # Verbosity: 'label' $output = qx{../src/task rc:verbose.rc ls rc.verbose:label 2>&1}; -like ($output, qr/ID.+Project.+Pri.+Description/, '\'label\' verbosity good'); +like ($output, qr/ID.+Proj.+Pri.+Description/, '\'label\' verbosity good'); # Verbosity: 'affected' $output = qx{../src/task rc:verbose.rc ls rc.verbose:affected 2>&1};