From 70b252f280e5bbf74f2b42deed7f507106347b6f Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Fri, 28 Aug 2015 09:18:36 -0400 Subject: [PATCH] CmdColumns: Added 'type' --- src/commands/CmdColumns.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/commands/CmdColumns.cpp b/src/commands/CmdColumns.cpp index 42d5e6b87..7b0b00641 100644 --- a/src/commands/CmdColumns.cpp +++ b/src/commands/CmdColumns.cpp @@ -72,6 +72,7 @@ int CmdColumns::execute (std::string& output) ViewText formats; formats.width (context.getWidth ()); formats.add (Column::factory ("string", STRING_COLUMN_LABEL_COLUMN)); + formats.add (Column::factory ("string", STRING_COLUMN_LABEL_TYPE)); formats.add (Column::factory ("string", STRING_COLUMN_LABEL_STYLES)); formats.add (Column::factory ("string", STRING_COLUMN_LABEL_EXAMPLES)); @@ -94,19 +95,21 @@ int CmdColumns::execute (std::string& output) { int row = formats.addRow (); formats.set (row, 0, i == 0 ? name : ""); - formats.set (row, 1, styles[i] + (i == 0 ? "*" : "")); - formats.set (row, 2, i < examples.size () ? examples[i] : ""); + formats.set (row, 1, i == 0 ? context.columns[name]->type () : ""); + formats.set (row, 2, styles[i] + (i == 0 ? "*" : "")); + formats.set (row, 3, i < examples.size () ? examples[i] : ""); } } } int row = formats.addRow (); formats.set (row, 0, ""); - formats.set (row, 1, "default*"); + formats.set (row, 1, ""); + formats.set (row, 2, "default*"); row = formats.addRow (); formats.set (row, 0, ""); - formats.set (row, 1, "indicator"); + formats.set (row, 2, "indicator"); output = optionalBlankLine () + formats.render ()