mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-07-07 20:06:36 +02:00
ColString: Removed obsolete column for ViewText
This commit is contained in:
parent
d4c9317239
commit
40c6623274
4 changed files with 0 additions and 170 deletions
|
@ -24,7 +24,6 @@ set (columns_SRCS Column.cpp Column.h
|
||||||
ColScheduled.cpp ColScheduled.h
|
ColScheduled.cpp ColScheduled.h
|
||||||
ColStart.cpp ColStart.h
|
ColStart.cpp ColStart.h
|
||||||
ColStatus.cpp ColStatus.h
|
ColStatus.cpp ColStatus.h
|
||||||
ColString.cpp ColString.h
|
|
||||||
ColTags.cpp ColTags.h
|
ColTags.cpp ColTags.h
|
||||||
ColTemplate.cpp ColTemplate.h
|
ColTemplate.cpp ColTemplate.h
|
||||||
ColTypeDate.cpp ColTypeDate.h
|
ColTypeDate.cpp ColTypeDate.h
|
||||||
|
|
|
@ -1,116 +0,0 @@
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// 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 <cmake.h>
|
|
||||||
#include <ColString.h>
|
|
||||||
#include <Context.h>
|
|
||||||
#include <format.h>
|
|
||||||
#include <shared.h>
|
|
||||||
#include <util.h>
|
|
||||||
#include <i18n.h>
|
|
||||||
|
|
||||||
extern Context context;
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
ColumnString::ColumnString ()
|
|
||||||
{
|
|
||||||
_name = "string";
|
|
||||||
_type = "string";
|
|
||||||
_style = "left";
|
|
||||||
_label = "";
|
|
||||||
_styles = {"left",
|
|
||||||
"right",
|
|
||||||
"left_fixed",
|
|
||||||
"right_fixed"};
|
|
||||||
_examples = {"Hello (wrapped) ",
|
|
||||||
" Hello (wrapped)",
|
|
||||||
"Hello (no-wrap) ",
|
|
||||||
" Hello (no-wrap)"};
|
|
||||||
_hyphenate = context.config.getBoolean ("hyphenate");
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// ColumnString is unique - it copies the report name into the label. This is
|
|
||||||
// a kludgy reuse of an otherwise unused member.
|
|
||||||
void ColumnString::setReport (const std::string& value)
|
|
||||||
{
|
|
||||||
_report = _label = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
// Set the minimum and maximum widths for the value.
|
|
||||||
//
|
|
||||||
void ColumnString::measure (const std::string& value, unsigned int& minimum, unsigned int& maximum)
|
|
||||||
{
|
|
||||||
minimum = maximum = 0;
|
|
||||||
|
|
||||||
if (_style == "left" ||
|
|
||||||
_style == "right" ||
|
|
||||||
_style == "default")
|
|
||||||
{
|
|
||||||
std::string stripped = Color::strip (value);
|
|
||||||
maximum = longestLine (stripped);
|
|
||||||
minimum = longestWord (stripped);
|
|
||||||
}
|
|
||||||
else if (_style == "left_fixed" ||
|
|
||||||
_style == "right_fixed")
|
|
||||||
minimum = maximum = strippedLength (value);
|
|
||||||
else
|
|
||||||
throw format (STRING_COLUMN_BAD_FORMAT, _name, _style);
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
void ColumnString::render (
|
|
||||||
std::vector <std::string>& lines,
|
|
||||||
const std::string& value,
|
|
||||||
int width,
|
|
||||||
Color& color)
|
|
||||||
{
|
|
||||||
if (_style == "default" || _style == "left")
|
|
||||||
{
|
|
||||||
std::vector <std::string> raw;
|
|
||||||
wrapText (raw, value, width, _hyphenate);
|
|
||||||
|
|
||||||
for (auto& i : raw)
|
|
||||||
renderStringLeft (lines, width, color, i);
|
|
||||||
}
|
|
||||||
else if (_style == "right")
|
|
||||||
{
|
|
||||||
std::vector <std::string> raw;
|
|
||||||
wrapText (raw, value, width, _hyphenate);
|
|
||||||
|
|
||||||
for (auto& i : raw)
|
|
||||||
renderStringRight (lines, width, color, i);
|
|
||||||
}
|
|
||||||
|
|
||||||
else if (_style == "left_fixed")
|
|
||||||
renderStringLeft (lines, width, color, value);
|
|
||||||
|
|
||||||
else if (_style == "right_fixed")
|
|
||||||
renderStringRight (lines, width, color, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
|
@ -1,49 +0,0 @@
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
//
|
|
||||||
// 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_COLSTRING
|
|
||||||
#define INCLUDED_COLSTRING
|
|
||||||
|
|
||||||
#include <vector>
|
|
||||||
#include <string>
|
|
||||||
#include <Column.h>
|
|
||||||
#include <Color.h>
|
|
||||||
#include <Task.h>
|
|
||||||
|
|
||||||
class ColumnString : public Column
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
ColumnString ();
|
|
||||||
void setReport (const std::string&);
|
|
||||||
void measure (const std::string&, unsigned int&, unsigned int&);
|
|
||||||
void render (std::vector <std::string>&, const std::string&, int, Color&);
|
|
||||||
|
|
||||||
private:
|
|
||||||
bool _hyphenate;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
|
@ -46,7 +46,6 @@
|
||||||
#include <ColScheduled.h>
|
#include <ColScheduled.h>
|
||||||
#include <ColStart.h>
|
#include <ColStart.h>
|
||||||
#include <ColStatus.h>
|
#include <ColStatus.h>
|
||||||
#include <ColString.h>
|
|
||||||
#include <ColTags.h>
|
#include <ColTags.h>
|
||||||
#include <ColTemplate.h>
|
#include <ColTemplate.h>
|
||||||
#include <ColUntil.h>
|
#include <ColUntil.h>
|
||||||
|
@ -107,9 +106,6 @@ Column* Column::factory (const std::string& name, const std::string& report)
|
||||||
else if (column_name == "uuid") c = new ColumnUUID ();
|
else if (column_name == "uuid") c = new ColumnUUID ();
|
||||||
else if (column_name == "wait") c = new ColumnWait ();
|
else if (column_name == "wait") c = new ColumnWait ();
|
||||||
|
|
||||||
// Special non-task column.
|
|
||||||
else if (column_name == "string") c = new ColumnString ();
|
|
||||||
|
|
||||||
// UDA.
|
// UDA.
|
||||||
else if (context.config.has ("uda." + column_name + ".type"))
|
else if (context.config.has ("uda." + column_name + ".type"))
|
||||||
c = Column::uda (column_name);
|
c = Column::uda (column_name);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue