From 28d872dd313469da2071073a221353ac7a88bff5 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 29 Aug 2015 12:32:17 -0400 Subject: [PATCH] CmdCommands: Added command description column - Shrunk the default widths of all the columns, for better spacing. --- src/commands/CmdCommands.cpp | 13 ++++++++----- src/commands/CmdCount.cpp | 2 +- src/commands/CmdIDs.cpp | 4 ++-- src/commands/CmdInfo.cpp | 2 +- src/commands/CmdProjects.cpp | 2 +- src/commands/CmdStats.cpp | 2 +- src/commands/CmdTags.cpp | 2 +- src/commands/Command.cpp | 2 +- src/commands/Command.h | 2 +- src/l10n/deu-DEU.h | 12 ++++++------ src/l10n/eng-USA.h | 12 ++++++------ src/l10n/epo-RUS.h | 12 ++++++------ src/l10n/esp-ESP.h | 12 ++++++------ src/l10n/fra-FRA.h | 12 ++++++------ src/l10n/ita-ITA.h | 12 ++++++------ src/l10n/jpn-JPN.h | 12 ++++++------ src/l10n/pol-POL.h | 12 ++++++------ src/l10n/por-PRT.h | 12 ++++++------ 18 files changed, 71 insertions(+), 68 deletions(-) diff --git a/src/commands/CmdCommands.cpp b/src/commands/CmdCommands.cpp index b79d736c6..98d5d1565 100644 --- a/src/commands/CmdCommands.cpp +++ b/src/commands/CmdCommands.cpp @@ -51,7 +51,7 @@ CmdCommands::CmdCommands () _accepts_filter = false; _accepts_modifications = false; _accepts_miscellaneous = false; - _category = Command::Category::interrogator; + _category = Command::Category::metadata; } //////////////////////////////////////////////////////////////////////////////// @@ -68,6 +68,7 @@ int CmdCommands::execute (std::string& output) view.add (Column::factory ("string.right", STRING_COLUMN_LABEL_FILTER)); view.add (Column::factory ("string.right", STRING_COLUMN_LABEL_MODS)); view.add (Column::factory ("string.right", STRING_COLUMN_LABEL_MISC)); + view.add (Column::factory ("string.left", STRING_COLUMN_LABEL_DESC)); Color label (context.config.get ("color.label")); view.colorHeader (label); @@ -98,16 +99,18 @@ int CmdCommands::execute (std::string& output) view.set (row, 4, "GC"); if (command.second->uses_context ()) - view.set (row, 5, "Context"); + view.set (row, 5, "Ctxt"); if (command.second->accepts_filter ()) - view.set (row, 6, "Filter"); + view.set (row, 6, "Filt"); if (command.second->accepts_modifications ()) - view.set (row, 7, "Modifications"); + view.set (row, 7, "Mods"); if (command.second->accepts_miscellaneous ()) - view.set (row, 8, "Args"); + view.set (row, 8, "Misc"); + + view.set (row, 9, command.second->description ()); } output = optionalBlankLine () diff --git a/src/commands/CmdCount.cpp b/src/commands/CmdCount.cpp index 097d1c2c7..c82f5910c 100644 --- a/src/commands/CmdCount.cpp +++ b/src/commands/CmdCount.cpp @@ -47,7 +47,7 @@ CmdCount::CmdCount () _accepts_filter = true; _accepts_modifications = false; _accepts_miscellaneous = false; - _category = Command::Category::interrogator; + _category = Command::Category::metadata; } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/commands/CmdIDs.cpp b/src/commands/CmdIDs.cpp index 53896e29d..e6b749f02 100644 --- a/src/commands/CmdIDs.cpp +++ b/src/commands/CmdIDs.cpp @@ -51,7 +51,7 @@ CmdIDs::CmdIDs () _accepts_filter = true; _accepts_modifications = false; _accepts_miscellaneous = false; - _category = Command::Category::interrogator; + _category = Command::Category::metadata; } //////////////////////////////////////////////////////////////////////////////// @@ -223,7 +223,7 @@ CmdUUIDs::CmdUUIDs () _accepts_filter = true; _accepts_modifications = false; _accepts_miscellaneous = false; - _category = Command::Category::interrogator; + _category = Command::Category::metadata; } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/commands/CmdInfo.cpp b/src/commands/CmdInfo.cpp index 415ffddd5..d22d6e39f 100644 --- a/src/commands/CmdInfo.cpp +++ b/src/commands/CmdInfo.cpp @@ -58,7 +58,7 @@ CmdInfo::CmdInfo () _accepts_filter = true; _accepts_modifications = false; _accepts_miscellaneous = false; - _category = Command::Category::interrogator; + _category = Command::Category::metadata; } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/commands/CmdProjects.cpp b/src/commands/CmdProjects.cpp index f08400d11..cd118ede7 100644 --- a/src/commands/CmdProjects.cpp +++ b/src/commands/CmdProjects.cpp @@ -51,7 +51,7 @@ CmdProjects::CmdProjects () _accepts_filter = true; _accepts_modifications = false; _accepts_miscellaneous = false; - _category = Command::Category::interrogator; + _category = Command::Category::metadata; } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/commands/CmdStats.cpp b/src/commands/CmdStats.cpp index 81f644633..4c630eefb 100644 --- a/src/commands/CmdStats.cpp +++ b/src/commands/CmdStats.cpp @@ -53,7 +53,7 @@ CmdStats::CmdStats () _accepts_filter = true; _accepts_modifications = false; _accepts_miscellaneous = false; - _category = Command::Category::interrogator; + _category = Command::Category::metadata; } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/commands/CmdTags.cpp b/src/commands/CmdTags.cpp index 85234f847..7539436bf 100644 --- a/src/commands/CmdTags.cpp +++ b/src/commands/CmdTags.cpp @@ -50,7 +50,7 @@ CmdTags::CmdTags () _accepts_filter = true; _accepts_modifications = false; _accepts_miscellaneous = false; - _category = Command::Category::interrogator; + _category = Command::Category::metadata; } //////////////////////////////////////////////////////////////////////////////// diff --git a/src/commands/Command.cpp b/src/commands/Command.cpp index f99708435..d27fc296b 100644 --- a/src/commands/Command.cpp +++ b/src/commands/Command.cpp @@ -199,7 +199,7 @@ const std::map Command::categoryNames = { // These strings are intentionally not l10n'd: they are used as identifiers. {Command::Category::unassigned, "unassigned"} // should never happen - ,{Command::Category::interrogator, "interrogator"} + ,{Command::Category::metadata, "metadata"} ,{Command::Category::report, "report"} ,{Command::Category::operation, "operation"} ,{Command::Category::context, "context"} diff --git a/src/commands/Command.h b/src/commands/Command.h index 95fc7c1f0..7c87f3874 100644 --- a/src/commands/Command.h +++ b/src/commands/Command.h @@ -56,7 +56,7 @@ public: { unassigned, // In presentation ("usefulness") order: frequently-used categories first. - interrogator, + metadata, report, operation, context, diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index fe00e5129..f10a97cf1 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -232,12 +232,12 @@ #define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_RO "R/W" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID?" -#define STRING_COLUMN_LABEL_GC "GC?" -#define STRING_COLUMN_LABEL_CONTEXT "Context?" -#define STRING_COLUMN_LABEL_FILTER "Filter?" -#define STRING_COLUMN_LABEL_MODS "Mods?" -#define STRING_COLUMN_LABEL_MISC "Other?" +#define STRING_COLUMN_LABEL_SHOWS_ID "ID" +#define STRING_COLUMN_LABEL_GC "GC" +#define STRING_COLUMN_LABEL_CONTEXT "Context" +#define STRING_COLUMN_LABEL_FILTER "Filter" +#define STRING_COLUMN_LABEL_MODS "Mods" +#define STRING_COLUMN_LABEL_MISC "Misc" // Column Examples #define STRING_COLUMN_EXAMPLES_TAGS "Haus @Hausarbeit next" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 2fa288608..55f69d10e 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -232,12 +232,12 @@ #define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_RO "R/W" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID?" -#define STRING_COLUMN_LABEL_GC "GC?" -#define STRING_COLUMN_LABEL_CONTEXT "Context?" -#define STRING_COLUMN_LABEL_FILTER "Filter?" -#define STRING_COLUMN_LABEL_MODS "Mods?" -#define STRING_COLUMN_LABEL_MISC "Other?" +#define STRING_COLUMN_LABEL_SHOWS_ID "ID" +#define STRING_COLUMN_LABEL_GC "GC" +#define STRING_COLUMN_LABEL_CONTEXT "Context" +#define STRING_COLUMN_LABEL_FILTER "Filter" +#define STRING_COLUMN_LABEL_MODS "Mods" +#define STRING_COLUMN_LABEL_MISC "Misc" // Column Examples #define STRING_COLUMN_EXAMPLES_TAGS "home @chore next" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index 721489c51..141b3dbcf 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -232,12 +232,12 @@ #define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_RO "R/W" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID?" -#define STRING_COLUMN_LABEL_GC "GC?" -#define STRING_COLUMN_LABEL_CONTEXT "Context?" -#define STRING_COLUMN_LABEL_FILTER "Filter?" -#define STRING_COLUMN_LABEL_MODS "Mods?" -#define STRING_COLUMN_LABEL_MISC "Other?" +#define STRING_COLUMN_LABEL_SHOWS_ID "ID" +#define STRING_COLUMN_LABEL_GC "GC" +#define STRING_COLUMN_LABEL_CONTEXT "Context" +#define STRING_COLUMN_LABEL_FILTER "Filter" +#define STRING_COLUMN_LABEL_MODS "Mods" +#define STRING_COLUMN_LABEL_MISC "Misc" // Column Examples #define STRING_COLUMN_EXAMPLES_TAGS "domo @aĉo next" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index 19d3fb379..47fd233dc 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -233,12 +233,12 @@ #define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_RO "R/W" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID?" -#define STRING_COLUMN_LABEL_GC "GC?" -#define STRING_COLUMN_LABEL_CONTEXT "Context?" -#define STRING_COLUMN_LABEL_FILTER "Filter?" -#define STRING_COLUMN_LABEL_MODS "Mods?" -#define STRING_COLUMN_LABEL_MISC "Other?" +#define STRING_COLUMN_LABEL_SHOWS_ID "ID" +#define STRING_COLUMN_LABEL_GC "GC" +#define STRING_COLUMN_LABEL_CONTEXT "Context" +#define STRING_COLUMN_LABEL_FILTER "Filter" +#define STRING_COLUMN_LABEL_MODS "Mods" +#define STRING_COLUMN_LABEL_MISC "Misc" // Column Examples #define STRING_COLUMN_EXAMPLES_TAGS "casa @tarea" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 1432ccdd4..a7445229d 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -232,12 +232,12 @@ #define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_RO "R/W" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID?" -#define STRING_COLUMN_LABEL_GC "GC?" -#define STRING_COLUMN_LABEL_CONTEXT "Context?" -#define STRING_COLUMN_LABEL_FILTER "Filter?" -#define STRING_COLUMN_LABEL_MODS "Mods?" -#define STRING_COLUMN_LABEL_MISC "Other?" +#define STRING_COLUMN_LABEL_SHOWS_ID "ID" +#define STRING_COLUMN_LABEL_GC "GC" +#define STRING_COLUMN_LABEL_CONTEXT "Context" +#define STRING_COLUMN_LABEL_FILTER "Filter" +#define STRING_COLUMN_LABEL_MODS "Mods" +#define STRING_COLUMN_LABEL_MISC "Misc" // Column Examples #define STRING_COLUMN_EXAMPLES_TAGS "maison @routine next" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index 4b57ac200..84cb63226 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -232,12 +232,12 @@ #define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_RO "R/W" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID?" -#define STRING_COLUMN_LABEL_GC "GC?" -#define STRING_COLUMN_LABEL_CONTEXT "Context?" -#define STRING_COLUMN_LABEL_FILTER "Filter?" -#define STRING_COLUMN_LABEL_MODS "Mods?" -#define STRING_COLUMN_LABEL_MISC "Other?" +#define STRING_COLUMN_LABEL_SHOWS_ID "ID" +#define STRING_COLUMN_LABEL_GC "GC" +#define STRING_COLUMN_LABEL_CONTEXT "Context" +#define STRING_COLUMN_LABEL_FILTER "Filter" +#define STRING_COLUMN_LABEL_MODS "Mods" +#define STRING_COLUMN_LABEL_MISC "Misc" // Column Examples #define STRING_COLUMN_EXAMPLES_TAGS "casa @faccende next" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index aff2610af..766da56d4 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -232,12 +232,12 @@ #define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_RO "R/W" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID?" -#define STRING_COLUMN_LABEL_GC "GC?" -#define STRING_COLUMN_LABEL_CONTEXT "Context?" -#define STRING_COLUMN_LABEL_FILTER "Filter?" -#define STRING_COLUMN_LABEL_MODS "Mods?" -#define STRING_COLUMN_LABEL_MISC "Other?" +#define STRING_COLUMN_LABEL_SHOWS_ID "ID" +#define STRING_COLUMN_LABEL_GC "GC" +#define STRING_COLUMN_LABEL_CONTEXT "Context" +#define STRING_COLUMN_LABEL_FILTER "Filter" +#define STRING_COLUMN_LABEL_MODS "Mods" +#define STRING_COLUMN_LABEL_MISC "Misc" // Column Examples #define STRING_COLUMN_EXAMPLES_TAGS "home @chore next" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 6f652986c..625c8f6ff 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -232,12 +232,12 @@ #define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_RO "R/W" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID?" -#define STRING_COLUMN_LABEL_GC "GC?" -#define STRING_COLUMN_LABEL_CONTEXT "Context?" -#define STRING_COLUMN_LABEL_FILTER "Filter?" -#define STRING_COLUMN_LABEL_MODS "Mods?" -#define STRING_COLUMN_LABEL_MISC "Other?" +#define STRING_COLUMN_LABEL_SHOWS_ID "ID" +#define STRING_COLUMN_LABEL_GC "GC" +#define STRING_COLUMN_LABEL_CONTEXT "Context" +#define STRING_COLUMN_LABEL_FILTER "Filter" +#define STRING_COLUMN_LABEL_MODS "Mods" +#define STRING_COLUMN_LABEL_MISC "Misc" // Column Examples #define STRING_COLUMN_EXAMPLES_TAGS "home @chore next" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 3a1481737..1a752dffd 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -233,12 +233,12 @@ #define STRING_COLUMN_LABEL_COMMAND "Command" #define STRING_COLUMN_LABEL_CATEGORY "Category" #define STRING_COLUMN_LABEL_RO "R/W" -#define STRING_COLUMN_LABEL_SHOWS_ID "ID?" -#define STRING_COLUMN_LABEL_GC "GC?" -#define STRING_COLUMN_LABEL_CONTEXT "Context?" -#define STRING_COLUMN_LABEL_FILTER "Filter?" -#define STRING_COLUMN_LABEL_MODS "Mods?" -#define STRING_COLUMN_LABEL_MISC "Other?" +#define STRING_COLUMN_LABEL_SHOWS_ID "ID" +#define STRING_COLUMN_LABEL_GC "GC" +#define STRING_COLUMN_LABEL_CONTEXT "Context" +#define STRING_COLUMN_LABEL_FILTER "Filter" +#define STRING_COLUMN_LABEL_MODS "Mods" +#define STRING_COLUMN_LABEL_MISC "Misc" // Column Examples #define STRING_COLUMN_EXAMPLES_TAGS "casa @contas próxima"