View

- Implemented urgency.default.

src/columns/CMakeLists.txt

@@ -19,6 +19,7 @@ set (columns_SRCS Column.cpp Column.h
                   ColStatus.cpp ColStatus.h
                   ColTags.cpp ColTags.h
                   ColUntil.cpp ColUntil.h
+                  ColUrgency.cpp ColUrgency.h
                   ColUUID.cpp ColUUID.h
                   ColWait.cpp ColWait.h)
 

src/columns/ColUrgency.cpp

@@ -0,0 +1,70 @@
+////////////////////////////////////////////////////////////////////////////////
+// taskwarrior - a command line task list manager.
+//
+// Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
+//
+////////////////////////////////////////////////////////////////////////////////
+
+#include <Context.h>
+#include <ColUrgency.h>
+#include <text.h>
+
+extern Context context;
+
+////////////////////////////////////////////////////////////////////////////////
+ColumnUrgency::ColumnUrgency ()
+{
+  _type  = "number";
+  _style = "default";
+  _label = "Urgency";
+}
+
+////////////////////////////////////////////////////////////////////////////////
+ColumnUrgency::~ColumnUrgency ()
+{
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// Set the minimum and maximum widths for the value.
+void ColumnUrgency::measure (Task& task, int& minimum, int& maximum)
+{
+  minimum = maximum = format (task.urgency (), 4, 3).length ();
+
+  if (_style != "default")
+    throw std::string ("Unrecognized column format '") + _type + "." + _style + "'";
+}
+
+////////////////////////////////////////////////////////////////////////////////
+void ColumnUrgency::render (
+  std::vector <std::string>& lines,
+  Task& task,
+  int width,
+  Color& color)
+{
+  lines.push_back (
+    color.colorize (
+      rightJustify (
+        format (task.urgency (), 4, 3), width)));
+}
+
+////////////////////////////////////////////////////////////////////////////////

src/columns/ColUrgency.h

@@ -0,0 +1,49 @@
+////////////////////////////////////////////////////////////////////////////////
+// taskwarrior - a command line task list manager.
+//
+// Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
+// All rights reserved.
+//
+// This program is free software; you can redistribute it and/or modify it under
+// the terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along with
+// this program; if not, write to the
+//
+//     Free Software Foundation, Inc.,
+//     51 Franklin Street, Fifth Floor,
+//     Boston, MA
+//     02110-1301
+//     USA
+//
+////////////////////////////////////////////////////////////////////////////////
+#ifndef INCLUDED_COLURGENCY
+#define INCLUDED_COLURGENCY
+
+#include <vector>
+#include <string>
+#include <Column.h>
+#include <Color.h>
+#include <Task.h>
+
+class ColumnUrgency : public Column
+{
+public:
+  ColumnUrgency ();
+  ~ColumnUrgency ();
+
+  void measure (Task&, int&, int&);
+  void render (std::vector <std::string>&, Task&, int, Color&);
+
+private:
+};
+
+#endif
+////////////////////////////////////////////////////////////////////////////////

src/columns/Column.cpp

@@ -40,6 +40,7 @@
 #include <ColStatus.h>
 #include <ColTags.h>
 #include <ColUntil.h>
+#include <ColUrgency.h>
 #include <ColUUID.h>
 #include <ColWait.h>
 #include <text.h>
@@ -82,6 +83,7 @@ Column* Column::factory (const std::string& name)
   else if (column_name == "status")      column = new ColumnStatus ();
   else if (column_name == "tags")        column = new ColumnTags ();
   else if (column_name == "until")       column = new ColumnUntil ();
+  else if (column_name == "urgency")     column = new ColumnUrgency ();
   else if (column_name == "uuid")        column = new ColumnUUID ();
   else if (column_name == "wait")        column = new ColumnWait ();
   else

test/view.t.cpp

@@ -41,6 +41,7 @@ int main (int argc, char** argv)
   try
   {
     // Set up configuration.
+    context.config.setDefaults ();
     context.config.set ("fontunderline", true);
     context.config.set ("tag.indicator", "+");
     context.config.set ("dependency.indicator", "D");
@@ -103,6 +104,7 @@ int main (int argc, char** argv)
     view.add (Column::factory ("due.julian"));
 //    view.add (Column::factory ("due.epoch"));
 //    view.add (Column::factory ("due.iso"));
+    view.add (Column::factory ("urgency"));
     view.width (120);
     view.leftMargin (4);
 /*