added support of tasks with deleted status

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

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

diff --git a/src/glade/ptask.glade b/src/glade/ptask.glade
index 5752833..880cae7 100644 (file)
--- a/src/glade/ptask.glade
+++ b/src/glade/ptask.glade
@@ -1,6 +1,26 @@
 <?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>
@@ -180,26 +200,6 @@
       <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 -->
@@ -220,6 +220,9 @@
       <row>
         <col id="0" translatable="yes">completed</col>
       </row>
+      <row>
+        <col id="0" translatable="yes">deleted</col>
+      </row>
     </data>
   </object>
   <object class="GtkListStore" id="taskstore">
@@ -320,6 +323,7 @@
                     <property name="can_focus">False</property>
                     <property name="model">statusstore</property>
                     <property name="active">0</property>
+                    <property name="id_column">0</property>
                     <child>
                       <object class="GtkCellRendererText" id="cellrenderertext4"/>
                       <attributes>

diff --git a/src/ui.c b/src/ui.c
index 78262bd..3a3f7bc 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -114,20 +114,14 @@ GtkWindow *create_window(GtkBuilder *builder, GSettings *settings)
 
 const char *ui_get_status_filter()
 {
-       const char *result;
-       int status;
+       const char *status;
 
        log_fct_enter();
 
-       status = gtk_combo_box_get_active(w_status);
+       status = gtk_combo_box_get_active_id(w_status);
        log_fct(__func__, "status: %d", status);
 
-       if (status == 1)
-               result = "completed";
-       else
-               result = "pending";
-
        log_fct_exit();
 
-       return result;
+       return status;
 }