diff --git a/src/columns/CMakeLists.txt b/src/columns/CMakeLists.txt index f73e1afc5..d8217ea5c 100644 --- a/src/columns/CMakeLists.txt +++ b/src/columns/CMakeLists.txt @@ -14,6 +14,7 @@ set (columns_SRCS Column.cpp Column.h ColEntry.cpp ColEntry.h ColID.cpp ColID.h ColIMask.cpp ColIMask.h + ColLast.cpp ColLast.h ColMask.cpp ColMask.h ColModified.cpp ColModified.h ColParent.cpp ColParent.h diff --git a/src/columns/ColLast.cpp b/src/columns/ColLast.cpp new file mode 100644 index 000000000..13d4da4c5 --- /dev/null +++ b/src/columns/ColLast.cpp @@ -0,0 +1,70 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// +// http://www.opensource.org/licenses/mit-license.php +// +//////////////////////////////////////////////////////////////////////////////// + +#include +#include +#include +#include + +//////////////////////////////////////////////////////////////////////////////// +ColumnLast::ColumnLast () +{ + _name = "imask"; + _style = "number"; + _label = STRING_COLUMN_LABEL_LAST; + _modifiable = false; + _styles = {"number"}; + _examples = {"12"}; +} + +//////////////////////////////////////////////////////////////////////////////// +// Set the minimum and maximum widths for the value. +void ColumnLast::measure (Task& task, unsigned int& minimum, unsigned int& maximum) +{ + minimum = maximum = 0; + + if (task.has (_name)) + { + minimum = maximum = task.get ("imask").length (); + + if (_style != "default" && + _style != "number") + throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); + } +} + +//////////////////////////////////////////////////////////////////////////////// +void ColumnLast::render ( + std::vector & lines, + Task& task, + int width, + Color& color) +{ + if (task.has (_name)) + renderStringRight (lines, width, color, task.get ("imask")); +} + +//////////////////////////////////////////////////////////////////////////////// diff --git a/src/columns/ColLast.h b/src/columns/ColLast.h new file mode 100644 index 000000000..83f1c48ad --- /dev/null +++ b/src/columns/ColLast.h @@ -0,0 +1,43 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// Copyright 2006 - 2016, Paul Beckingham, Federico Hernandez. +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +// SOFTWARE. +// +// http://www.opensource.org/licenses/mit-license.php +// +//////////////////////////////////////////////////////////////////////////////// + +#ifndef INCLUDED_COLLAST +#define INCLUDED_COLLAST + +#include + +class ColumnLast : public ColumnTypeNumeric +{ +public: + ColumnLast (); + void measure (Task&, unsigned int&, unsigned int&); + void render (std::vector &, Task&, int, Color&); + +private: +}; + +#endif +//////////////////////////////////////////////////////////////////////////////// diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp index b3eee6b5f..fa3e88785 100644 --- a/src/columns/Column.cpp +++ b/src/columns/Column.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -88,6 +89,7 @@ Column* Column::factory (const std::string& name, const std::string& report) else if (column_name == "entry") c = new ColumnEntry (); else if (column_name == "id") c = new ColumnID (); else if (column_name == "imask") c = new ColumnIMask (); + else if (column_name == "last") c = new ColumnLast (); else if (column_name == "mask") c = new ColumnMask (); else if (column_name == "modified") c = new ColumnModified (); else if (column_name == "parent") c = new ColumnParent (); @@ -131,6 +133,7 @@ void Column::factory (std::map & all) c = new ColumnEntry (); all[c->_name] = c; c = new ColumnID (); all[c->_name] = c; c = new ColumnIMask (); all[c->_name] = c; + c = new ColumnLast (); all[c->_name] = c; c = new ColumnMask (); all[c->_name] = c; c = new ColumnModified (); all[c->_name] = c; c = new ColumnParent (); all[c->_name] = c; diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index 39b597b6a..e99e02cf1 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -210,6 +210,7 @@ #define STRING_COLUMN_LABEL_VALUE "Wert" #define STRING_COLUMN_LABEL_MASK "Maske" #define STRING_COLUMN_LABEL_MASK_IDX "Masken-Index" +#define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_PARENT "Vorgänger-Aufgabe" #define STRING_COLUMN_LABEL_TEMPLATE "Template task" #define STRING_COLUMN_LABEL_DATE "Datum" diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 83539cafb..324695e4e 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -210,6 +210,7 @@ #define STRING_COLUMN_LABEL_VALUE "Value" #define STRING_COLUMN_LABEL_MASK "Mask" #define STRING_COLUMN_LABEL_MASK_IDX "Mask Index" +#define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_PARENT "Parent task" #define STRING_COLUMN_LABEL_TEMPLATE "Template task" #define STRING_COLUMN_LABEL_DATE "Date" diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index a527f0946..ef85a0011 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -210,6 +210,7 @@ #define STRING_COLUMN_LABEL_VALUE "Valoro" #define STRING_COLUMN_LABEL_MASK "Masko" #define STRING_COLUMN_LABEL_MASK_IDX "Mask-indico" +#define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_PARENT "Patra tasko" #define STRING_COLUMN_LABEL_TEMPLATE "Template task" #define STRING_COLUMN_LABEL_DATE "Dato" diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index ad642d0b7..e39f5b324 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -211,6 +211,7 @@ #define STRING_COLUMN_LABEL_VALUE "Valor" #define STRING_COLUMN_LABEL_MASK "Máscara" #define STRING_COLUMN_LABEL_MASK_IDX "Máscara de Índice" +#define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_PARENT "Tarea madre" #define STRING_COLUMN_LABEL_TEMPLATE "Template task" #define STRING_COLUMN_LABEL_DATE "Fecha" diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 93c845d45..e02ae59b8 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -210,6 +210,7 @@ #define STRING_COLUMN_LABEL_VALUE "Valeur" #define STRING_COLUMN_LABEL_MASK "Masque" #define STRING_COLUMN_LABEL_MASK_IDX "Indice de masque" +#define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_PARENT "Tâche mère" #define STRING_COLUMN_LABEL_TEMPLATE "Template task" #define STRING_COLUMN_LABEL_DATE "Date" diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index f36a4b32b..fba4d772c 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -210,6 +210,7 @@ #define STRING_COLUMN_LABEL_VALUE "Valore" #define STRING_COLUMN_LABEL_MASK "Maschera" #define STRING_COLUMN_LABEL_MASK_IDX "Indice Maschera" +#define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_PARENT "Task genitore" #define STRING_COLUMN_LABEL_TEMPLATE "Template task" #define STRING_COLUMN_LABEL_DATE "Data" diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 593440521..6a302812e 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -210,6 +210,7 @@ #define STRING_COLUMN_LABEL_VALUE "Value" #define STRING_COLUMN_LABEL_MASK "Mask" #define STRING_COLUMN_LABEL_MASK_IDX "Mask Index" +#define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_PARENT "Parent task" #define STRING_COLUMN_LABEL_TEMPLATE "Template task" #define STRING_COLUMN_LABEL_DATE "Date" diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index 0b36f7724..5574a4395 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -210,6 +210,7 @@ #define STRING_COLUMN_LABEL_VALUE "Wartość" #define STRING_COLUMN_LABEL_MASK "Maska" #define STRING_COLUMN_LABEL_MASK_IDX "Indeks Maski" +#define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_PARENT "Zadanie rodzic" #define STRING_COLUMN_LABEL_TEMPLATE "Template task" #define STRING_COLUMN_LABEL_DATE "Data" diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index c8bd6b3a4..2dd7dbe66 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -211,6 +211,7 @@ #define STRING_COLUMN_LABEL_VALUE "Valor" #define STRING_COLUMN_LABEL_MASK "Máscara" #define STRING_COLUMN_LABEL_MASK_IDX "Índice de Máscara" +#define STRING_COLUMN_LABEL_LAST "Last instance" #define STRING_COLUMN_LABEL_PARENT "Tarefa mãe" #define STRING_COLUMN_LABEL_TEMPLATE "Template task" #define STRING_COLUMN_LABEL_DATE "Data"