added urgency column

diff --git a/NEWS b/NEWS
index 35b2b6d..adfe62f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ v0.0.5
  * keep focus on project after refresh.
  * keep focus on task after refresh.
  * added support of tasks with deleted status.
+ * added urgency column.
 
 v0.0.4
 ------

diff --git a/NEWS.html b/NEWS.html
index c84a8f5..2f40db4 100644 (file)
--- a/NEWS.html
+++ b/NEWS.html
@@ -341,6 +341,11 @@ keep focus on task after refresh.
 added support of tasks with deleted status.\r
 </p>\r
 </li>\r
+<li>\r
+<p>\r
+added urgency column.\r
+</p>\r
+</li>\r
 </ul></div>\r
 </div>\r
 </div>\r
@@ -486,7 +491,7 @@ Initial release.
 <div id="footnotes"><hr /></div>\r
 <div id="footer">\r
 <div id="footer-text">\r
-Last updated 2013-12-03 08:57:52 CET\r
+Last updated 2013-12-04 09:14:08 CET\r
 </div>\r
 </div>\r
 </body>\r

diff --git a/src/glade/ptask.glade b/src/glade/ptask.glade
index 880cae7..315e014 100644 (file)
--- a/src/glade/ptask.glade
+++ b/src/glade/ptask.glade
@@ -1,26 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkListStore" id="prioritystore">
-    <columns>
-      <!-- column-name priority -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">None</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Low</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Medium</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">High</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkDialog" id="diag_tasknew">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
@@ -200,6 +180,26 @@
       <action-widget response="0">button2</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkListStore" id="prioritystore">
+    <columns>
+      <!-- column-name priority -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">None</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Low</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Medium</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">High</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkListStore" id="projectstore">
     <columns>
       <!-- column-name gchararray1 -->
@@ -237,6 +237,8 @@
       <column type="gchararray"/>
       <!-- column-name priority -->
       <column type="gchararray"/>
+      <!-- column-name urgency -->
+      <column type="gchararray"/>
     </columns>
   </object>
   <object class="GtkWindow" id="window">
@@ -473,6 +475,18 @@
                             </child>
                           </object>
                         </child>
+                        <child>
+                          <object class="GtkTreeViewColumn" id="urgency">
+                            <property name="title" translatable="yes">Urgency</property>
+                            <property name="sort_column_id">5</property>
+                            <child>
+                              <object class="GtkCellRendererText" id="cellrenderertext9"/>
+                              <attributes>
+                                <attribute name="text">5</attribute>
+                              </attributes>
+                            </child>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>

diff --git a/src/tw.c b/src/tw.c
index 43760d4..8235784 100644 (file)
--- a/src/tw.c
+++ b/src/tw.c
@@ -197,6 +197,9 @@ struct task **tw_get_all_tasks(const char *status)
                json = json_object_object_get(jtask, "uuid");
                tasks[i]->uuid = strdup(json_object_get_string(json));
 
+               json = json_object_object_get(jtask, "urgency");
+               tasks[i]->urgency = strdup(json_object_get_string(json));
+
                tasks[i]->note = note_get(tasks[i]->uuid);
        }
 
@@ -385,6 +388,7 @@ static void task_free(struct task *task)
        free(task->note);
        free(task->project);
        free(task->priority);
+       free(task->urgency);
 
        free(task);
 }

diff --git a/src/tw.h b/src/tw.h
index 70a197c..a9af11d 100644 (file)
--- a/src/tw.h
+++ b/src/tw.h
@@ -28,6 +28,7 @@ struct task {
        char *note;
        char *project;
        char *priority;
+       char *urgency;
 };
 
 struct project {

diff --git a/src/ui_tasktree.c b/src/ui_tasktree.c
index 7dd4954..3a96622 100644 (file)
--- a/src/ui_tasktree.c
+++ b/src/ui_tasktree.c
@@ -32,7 +32,8 @@ enum {
        COL_DESCRIPTION,
        COL_PROJECT,
        COL_UUID,
-       COL_PRIORITY
+       COL_PRIORITY,
+       COL_URGENCY
 };
 
 static int priority_to_int(const char *str)
@@ -246,6 +247,7 @@ void ui_tasktree_update(struct task **tasks, const char *prj_filter)
                                           COL_PROJECT, prj,
                                           COL_UUID, (*tasks_cur)->uuid,
                                           COL_PRIORITY, (*tasks_cur)->priority,
+                                          COL_URGENCY, (*tasks_cur)->urgency,
                                           -1);
                }
        }