gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch '1.9.0' of tasktools.org:task into 1.9.0

Browse Source
This commit is contained in:
Paul Beckingham
2010-02-15 11:12:30 -05:00
parent 69f2669bee dfc35f3744
commit d917215417
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
doc/man/taskrc.5
View File

@@ -439,6 +439,9 @@ The coloration rules and their defaults are:
.B color.overdue=bold red
The color for overdue tasks.
.br
.B color.due.today=bold magenta
The color of tasks due today.
.br
.B color.due=bold yellow
The color of due tasks.
.br
@@ -511,6 +514,10 @@ Color of today in calendar.
.B color.calendar.due=black on green
Color of days with due tasks in calendar.
.TP
.B color.calendar.due.today=black on magenta
Color of today with due tasks in calendar.
.TP
.B color.calendar.overdue=black on red
Color of days with overdue tasks in calendar.
@@ -630,7 +637,8 @@ The description for report X when running the "task help" command.
.B report.X.columns
The columns that will be used when generating the report X. Valid columns are:
id, uuid, project, priority, entry, start, due, recur, recur_indicator, age,
age_compact, active, tags, tag_indicator, description, description_only.
age_compact, active, tags, tag_indicator, description, description_only,
countdown, countdown_compact.
The IDs are separated by commas.
.TP

6
src/Config.cpp
View File

@@ -89,9 +89,9 @@ std::string Config::defaults =
"#color.header=bold green # Color of header messages\n"
"#color.footnote=bold green # Color of footnote messages\n"
"color.calendar.today=black on cyan # Color of today in calendar\n"
"color.calendar.due=black on green # Color of days with due tasks in calendar\n"
"color.calendar.due.today=black on magenta # Color of days with due tasks in calendar\n"
"color.calendar.overdue=black on red # Color of days with overdue tasks in calendar\n"
"color.calendar.due=black on green # Color of days with due tasks in calendar\n"
"color.calendar.due.today=black on magenta # Color of today with due tasks in calendar\n"
"color.calendar.overdue=black on red # Color of days with overdue tasks in calendar\n"
"color.calendar.weekend=bright white on black # Color of weekend days in calendar\n"
"color.calendar.holiday=black on bright yellow # Color of public holidays in calendar\n"
"color.calendar.weeknumber=black on white # Color of the weeknumbers in calendar\n"

11
src/tests/cal.t
View File

@@ -44,7 +44,7 @@ if (open my $fh, '>', 'cal.rc')
}
my @months = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
my ($nday, $nmon, $nyear) = (localtime)[3,4,5];
my ($nday, $nmon, $nyear, $wday) = (localtime)[3,4,5,6];
my $day = $nday;
my $prevmonth = $months[($nmon-1) % 12];
my $month = $months[($nmon) % 12];
@@ -59,7 +59,14 @@ if ( $day <= 9)
# task cal and task cal y
my $output = qx{../task rc:cal.rc rc._forcecolor:on cal};
like ($output, qr/\[30;46m$day/, 'Current day is highlighted');
if ( $wday == 6 || $wday == 0)
{
like ($output, qr/\[30;106m$day/, 'Current day is highlighted');
}
else
{
like ($output, qr/\[30;46m$day/, 'Current day is highlighted');
}
like ($output, qr/$month\w+?\s+?$year/, 'Current month and year are displayed');
$output = qx{../task rc:cal.rc add zero};
unlike ($output, qr/\[41m\d+/, 'No overdue tasks are present');