From 76c2de685bfdddbcb32b618a70b358c7f6389ecb Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 31 Dec 2016 09:09:29 -0500 Subject: [PATCH] ColRType: New recurrence attribute --- src/columns/CMakeLists.txt | 1 + src/columns/ColRType.cpp | 68 ++++++++++++++++++++++++++++++++++++++ src/columns/ColRType.h | 43 ++++++++++++++++++++++++ src/columns/Column.cpp | 3 ++ src/l10n/deu-DEU.h | 1 + src/l10n/eng-USA.h | 1 + src/l10n/epo-RUS.h | 1 + src/l10n/esp-ESP.h | 1 + src/l10n/fra-FRA.h | 1 + src/l10n/ita-ITA.h | 1 + src/l10n/jpn-JPN.h | 1 + src/l10n/pol-POL.h | 1 + src/l10n/por-PRT.h | 1 + 13 files changed, 124 insertions(+) create mode 100644 src/columns/ColRType.cpp create mode 100644 src/columns/ColRType.h diff --git a/src/columns/CMakeLists.txt b/src/columns/CMakeLists.txt index d8217ea5c..6df76bcc7 100644 --- a/src/columns/CMakeLists.txt +++ b/src/columns/CMakeLists.txt @@ -20,6 +20,7 @@ set (columns_SRCS Column.cpp Column.h ColParent.cpp ColParent.h ColProject.cpp ColProject.h ColRecur.cpp ColRecur.h + ColRType.cpp ColRType.h ColScheduled.cpp ColScheduled.h ColStart.cpp ColStart.h ColStatus.cpp ColStatus.h diff --git a/src/columns/ColRType.cpp b/src/columns/ColRType.cpp new file mode 100644 index 000000000..e9fe03537 --- /dev/null +++ b/src/columns/ColRType.cpp @@ -0,0 +1,68 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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 + +//////////////////////////////////////////////////////////////////////////////// +ColumnRType::ColumnRType () +{ + _name = "rtype"; + _style = "default"; + _label = STRING_COLUMN_LABEL_RTYPE; + _modifiable = false; + _styles = {"default"}; + _examples = {"periodic", "chained"}; +} + +//////////////////////////////////////////////////////////////////////////////// +// Set the minimum and maximum widths for the value. +void ColumnRType::measure (Task& task, unsigned int& minimum, unsigned int& maximum) +{ + minimum = maximum = 0; + if (task.has (_name)) + { + minimum = maximum = task.get (_name).length (); + + if (_style != "default") + throw format (STRING_COLUMN_BAD_FORMAT, _name, _style); + } +} + +//////////////////////////////////////////////////////////////////////////////// +void ColumnRType::render ( + std::vector & lines, + Task& task, + int width, + Color& color) +{ + if (task.has (_name)) + renderStringLeft (lines, width, color, task.get (_name)); +} + +//////////////////////////////////////////////////////////////////////////////// diff --git a/src/columns/ColRType.h b/src/columns/ColRType.h new file mode 100644 index 000000000..bce9747fb --- /dev/null +++ b/src/columns/ColRType.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_COLRTYPE +#define INCLUDED_COLRTYPE + +#include + +class ColumnRType : public ColumnTypeString +{ +public: + ColumnRType (); + 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 fa3e88785..432f6def8 100644 --- a/src/columns/Column.cpp +++ b/src/columns/Column.cpp @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -95,6 +96,7 @@ Column* Column::factory (const std::string& name, const std::string& report) else if (column_name == "parent") c = new ColumnParent (); else if (column_name == "project") c = new ColumnProject (); else if (column_name == "recur") c = new ColumnRecur (); + else if (column_name == "rtype") c = new ColumnRType (); else if (column_name == "scheduled") c = new ColumnScheduled (); else if (column_name == "start") c = new ColumnStart (); else if (column_name == "status") c = new ColumnStatus (); @@ -139,6 +141,7 @@ void Column::factory (std::map & all) c = new ColumnParent (); all[c->_name] = c; c = new ColumnProject (); all[c->_name] = c; c = new ColumnRecur (); all[c->_name] = c; + c = new ColumnRType (); all[c->_name] = c; c = new ColumnScheduled (); all[c->_name] = c; c = new ColumnStart (); all[c->_name] = c; c = new ColumnStatus (); all[c->_name] = c; diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index e99e02cf1..570b5cbf5 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -211,6 +211,7 @@ #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_RTYPE "Recurrence type" #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 324695e4e..b54e94246 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -211,6 +211,7 @@ #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_RTYPE "Recurrence type" #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 ef85a0011..bf3defcd6 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -211,6 +211,7 @@ #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_RTYPE "Recurrence type" #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 e39f5b324..be365ad76 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -212,6 +212,7 @@ #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_RTYPE "Recurrence type" #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 e02ae59b8..418b6936c 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -211,6 +211,7 @@ #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_RTYPE "Recurrence type" #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 fba4d772c..630e6f786 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -211,6 +211,7 @@ #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_RTYPE "Recurrence type" #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 6a302812e..548993324 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -211,6 +211,7 @@ #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_RTYPE "Recurrence type" #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 5574a4395..2c272fecd 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -211,6 +211,7 @@ #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_RTYPE "Recurrence type" #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 2dd7dbe66..a4aeaa9ae 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -212,6 +212,7 @@ #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_RTYPE "Recurrence type" #define STRING_COLUMN_LABEL_PARENT "Tarefa mãe" #define STRING_COLUMN_LABEL_TEMPLATE "Template task" #define STRING_COLUMN_LABEL_DATE "Data"