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

ColUDA: Now uses ::renderString{Left,Right}

Browse Source
This commit is contained in:
Paul Beckingham
2015-10-31 16:56:25 -04:00
parent cd70d56260
commit ce507c0011
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/columns/ColUDA.cpp
View File

@@ -145,42 +145,34 @@ void ColumnUDA::render (
// rc.dateformat. // rc.dateformat.
std::string format = context.config.get ("report." + _report + ".dateformat"); std::string format = context.config.get ("report." + _report + ".dateformat");
if (format == "") if (format == "")
{
format = context.config.get ("dateformat.report"); format = context.config.get ("dateformat.report");
if (format == "") if (format == "")
format = context.config.get ("dateformat"); format = context.config.get ("dateformat");
}
lines.push_back ( renderStringLeft (lines, width, color, ISO8601d ((time_t) strtol (value.c_str (), NULL, 10)).toString (format));
color.colorize (
leftJustify (
ISO8601d ((time_t) strtol (value.c_str (), NULL, 10)).toString (format), width)));
} }
else if (_type == "duration") else if (_type == "duration")
{ renderStringRight (lines, width, color, ISO8601p (value).format ());
lines.push_back (
color.colorize (
rightJustify (
ISO8601p (value).format (),
width)));
}
else if (_type == "string") else if (_type == "string")
{ {
std::vector <std::string> raw; std::vector <std::string> raw;
wrapText (raw, value, width, _hyphenate); wrapText (raw, value, width, _hyphenate);
for (auto& i : raw) for (auto& i : raw)
lines.push_back (color.colorize (leftJustify (i, width))); renderStringLeft (lines, width, color, i);
} }
else if (_type == "numeric") else if (_type == "numeric")
{ renderStringRight (lines, width, color, value);
lines.push_back (color.colorize (rightJustify (value, width)));
}
} }
else if (_style == "indicator") else if (_style == "indicator")
{ {
if (task.has (_name)) if (task.has (_name))
lines.push_back ( renderStringRight (lines, width, color, context.config.get ("uda." + _name + ".indicator"));
color.colorize (
rightJustify (context.config.get ("uda." + _name + ".indicator"), width)));
} }
} }
} }