gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Deprecation

Browse Source 
- Removed deprecated 'fg:' and 'bg:' attributes, which involves code,
  documentation and tests.
- Cleaned out NEWS file.
- Cleaned out config import synonyms, which should have been deleted a while
  ago.
- Removed unused localized strings, but left the 'deprecated' one behind,
  because it will be needed.
This commit is contained in:
Paul Beckingham
2012-07-25 22:44:25 -04:00
parent 1d99260cb9
commit d89d51e7e1
15 changed files with 14 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/commands/CmdEdit.cpp
View File

@@ -210,9 +210,7 @@ std::string CmdEdit::formatTask (Task task, const std::string& dateformat)
<< " Until: " << formatDate (task, "until", dateformat) << "\n"
<< " Recur: " << task.get ("recur") << "\n"
<< " Wait until: " << formatDate (task, "wait", dateformat) << "\n"
<< " Parent: " << task.get ("parent") << "\n"
<< " Foreground color: " << task.get ("fg") << "\n"
<< " Background color: " << task.get ("bg") << "\n";
<< " Parent: " << task.get ("parent") << "\n";
if (verbose)
before << "# " << STRING_EDIT_HEADER_13 << "\n"
@@ -613,38 +611,6 @@ void CmdEdit::parseTask (Task& task, const std::string& after, const std::string
}
}
// fg
value = findValue (after, "\n Foreground color:");
if (value != task.get ("fg"))
{
if (value != "")
{
context.footnote (STRING_EDIT_FG_MOD);
task.set ("fg", value);
}
else
{
context.footnote (STRING_EDIT_FG_DEL);
task.remove ("fg");
}
}
// bg
value = findValue (after, "\n Background color:");
if (value != task.get ("bg"))
{
if (value != "")
{
context.footnote (STRING_EDIT_BG_MOD);
task.set ("bg", value);
}
else
{
context.footnote (STRING_EDIT_BG_DEL);
task.remove ("bg");
}
}
// Annotations
std::map <std::string, std::string> annotations;
std::string::size_type found = 0;

18
src/commands/CmdInfo.cpp
View File

@@ -300,24 +300,6 @@ int CmdInfo::execute (std::string& output)
view.set (row, 1, entry + " (" + age + ")");
// fg TODO deprecated 2.0
std::string color = task->get ("fg");
if (color != "")
{
row = view.addRow ();
view.set (row, 0, STRING_COLUMN_LABEL_FG);
view.set (row, 1, color);
}
// bg TODO deprecated 2.0
color = task->get ("bg");
if (color != "")
{
row = view.addRow ();
view.set (row, 0, STRING_COLUMN_LABEL_BG);
view.set (row, 1, color);
}
// Task::urgency
row = view.addRow ();
view.set (row, 0, STRING_COLUMN_LABEL_URGENCY);

4
src/commands/CmdTimesheet.cpp
View File

@@ -111,7 +111,7 @@ int CmdTimesheet::execute (std::string& output)
Date compDate (task->get_date ("end"));
if (compDate >= start && compDate < end)
{
Color c (task->get ("fg") + " " + task->get ("bg"));
Color c;
if (context.color ())
autoColorize (*task, c);
@@ -168,7 +168,7 @@ int CmdTimesheet::execute (std::string& output)
Date startDate (task->get_date ("start"));
if (startDate >= start && startDate < end)
{
Color c (task->get ("fg") + " " + task->get ("bg"));
Color c;
if (context.color ())
autoColorize (*task, c);