GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

CmdCalendar: Migrated from ViewText to Table

Browse source
This commit is contained in:
Paul Beckingham 2016-12-17 17:37:47 -05:00
parent d8d5a15321
commit cc438b4411
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/commands/CmdCalendar.cpp
View file

@ -30,7 +30,7 @@
#include <iomanip> #include <iomanip>
#include <stdlib.h> #include <stdlib.h>
#include <Context.h> #include <Context.h>
#include <ViewText.h> #include <Table.h>
#include <Lexer.h> #include <Lexer.h>
#include <i18n.h> #include <i18n.h>
#include <shared.h> #include <shared.h>
@ -368,10 +368,10 @@ int CmdCalendar::execute (std::string& output)
// Table with holiday information // Table with holiday information
if (context.config.get ("calendar.holidays") == "full") if (context.config.get ("calendar.holidays") == "full")
{ {
ViewText holTable; Table holTable;
holTable.width (context.getWidth ()); holTable.width (context.getWidth ());
holTable.add (Column::factory ("string", STRING_CMD_CAL_LABEL_DATE)); holTable.add (STRING_CMD_CAL_LABEL_DATE);
holTable.add (Column::factory ("string", STRING_CMD_CAL_LABEL_HOL)); holTable.add (STRING_CMD_CAL_LABEL_HOL);
holTable.colorHeader (color_label); holTable.colorHeader (color_label);
std::map <time_t, std::vector<std::string>> hm; // we need to store multiple holidays per day std::map <time_t, std::vector<std::string>> hm; // we need to store multiple holidays per day
@ -434,32 +434,32 @@ std::string CmdCalendar::renderMonths (
// Build table for the number of months to be displayed. // Build table for the number of months to be displayed.
Color label (context.config.get ("color.label")); Color label (context.config.get ("color.label"));
ViewText view; Table view;
view.colorHeader (label); view.colorHeader (label);
view.width (context.getWidth ()); view.width (context.getWidth ());
for (int i = 0 ; i < (monthsPerLine * 8); i += 8) for (int i = 0 ; i < (monthsPerLine * 8); i += 8)
{ {
if (weekStart == 1) if (weekStart == 1)
{ {
view.add (Column::factory ("string.right", "")); view.add ("", false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (1), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (1), 0, 2), false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (2), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (2), 0, 2), false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (3), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (3), 0, 2), false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (4), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (4), 0, 2), false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (5), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (5), 0, 2), false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (6), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (6), 0, 2), false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (0), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (0), 0, 2), false);
} }
else else
{ {
view.add (Column::factory ("string.right", "")); view.add ("", false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (0), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (0), 0, 2), false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (1), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (1), 0, 2), false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (2), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (2), 0, 2), false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (3), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (3), 0, 2), false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (4), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (4), 0, 2), false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (5), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (5), 0, 2), false);
view.add (Column::factory ("string.right", utf8_substr (ISO8601d::dayName (6), 0, 2))); view.add (utf8_substr (ISO8601d::dayName (6), 0, 2), false);
} }
} }