From 7b2a0d4f295ced27666faaea50b7fee06b36e970 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Wed, 17 Oct 2012 06:55:18 +0000
Subject: [PATCH]

---
 src/glade/gtask.glade | 23 ++++------------
 src/main.c            | 72 ++++++++++++++++++++++++++++++++++++++++-----------
 2 files changed, 62 insertions(+), 33 deletions(-)

diff --git a/src/glade/gtask.glade b/src/glade/gtask.glade
index 1bdc745..671ff83 100644
--- a/src/glade/gtask.glade
+++ b/src/glade/gtask.glade
@@ -111,13 +111,13 @@
         <col id="0" translatable="yes">None</col>
       </row>
       <row>
-        <col id="0" translatable="yes">High</col>
+        <col id="0" translatable="yes">Low</col>
       </row>
       <row>
         <col id="0" translatable="yes">Medium</col>
       </row>
       <row>
-        <col id="0" translatable="yes">Low</col>
+        <col id="0" translatable="yes">High</col>
       </row>
     </data>
   </object>
@@ -263,7 +263,7 @@
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="orientation">vertical</property>
-            <property name="position">144</property>
+            <property name="position">200</property>
             <property name="position_set">True</property>
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow2">
@@ -280,7 +280,7 @@
                     <property name="margin_top">4</property>
                     <property name="margin_bottom">4</property>
                     <property name="model">taskstore</property>
-                    <property name="expander_column">treeviewcolumn1</property>
+                    <property name="headers_clickable">False</property>
                     <property name="search_column">1</property>
                     <property name="enable_grid_lines">both</property>
                     <property name="enable_tree_lines">True</property>
@@ -288,20 +288,7 @@
                       <object class="GtkTreeSelection" id="treeview-selection"/>
                     </child>
                     <child>
-                      <object class="GtkTreeViewColumn" id="treeviewcolumn1">
-                        <property name="sizing">autosize</property>
-                        <property name="min_width">10</property>
-                        <property name="title" translatable="yes">Id</property>
-                        <child>
-                          <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                          <attributes>
-                            <attribute name="text">0</attribute>
-                          </attributes>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkTreeViewColumn" id="Priority">
+                      <object class="GtkTreeViewColumn" id="priority">
                         <property name="title" translatable="yes">priority</property>
                         <property name="sort_column_id">4</property>
                         <child>
diff --git a/src/main.c b/src/main.c
index 864edb9..0dc03d1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -102,7 +102,9 @@ static void refresh()
 	int i;
 	GtkTreeIter iter;
 	int status;
+	const char *project;
 
+	printf("refresh\n");
 	clear_task_panel();
 
 	status = gtk_combo_box_get_active(w_status);
@@ -127,19 +129,20 @@ static void refresh()
 		gtk_list_store_append(GTK_LIST_STORE(model), &iter);
 
 		if (task->project)
-			gtk_list_store_set(GTK_LIST_STORE(model),
-					   &iter,
-					   COL_PROJECT, task->project,
-					   -1);
+			project = task->project;
+		else
+			project = "";
 
 		gtk_list_store_set(GTK_LIST_STORE(model),
 				   &iter,
 				   COL_ID, (*tasks_cur)->id,
 				   COL_DESCRIPTION, (*tasks_cur)->description,
+				   COL_PROJECT, project,
 				   COL_UUID, (*tasks_cur)->uuid,
 				   COL_PRIORITY, (*tasks_cur)->priority,
 				   -1);
 	}
+	printf("refresh done\n");
 }
 
 static int tasksave_clicked_cbk(GtkButton *btn, gpointer data)
@@ -179,13 +182,13 @@ static int tasksave_clicked_cbk(GtkButton *btn, gpointer data)
 	printf("priority: %d\n", priority);
 
 	switch (priority) {
-	case 1:
+	case 3:
 		pri = "H";
 		break;
 	case 2:
 		pri = "M";
 		break;
-	case 3:
+	case 1:
 		pri = "L";
 		break;
 	default:
@@ -257,6 +260,20 @@ static int status_changed_cbk(GtkComboBox *w, gpointer data)
 	return FALSE;
 }
 
+static int priority_to_int(const char *str)
+{
+	switch (*str) {
+	case 'H':
+		return 3;
+	case 'M':
+		return 2;
+	case 'L':
+		return 1;
+	default:
+		return 0;
+	}
+}
+
 static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 {
 	struct task *task;
@@ -290,29 +307,48 @@ static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 		gtk_widget_set_sensitive(w_tasksave_btn, 1);
 
 		gtk_widget_set_sensitive(GTK_WIDGET(w_priority), 1);
-		if (!strcmp(task->priority, "H"))
-			priority = 1;
-		else if (!strcmp(task->priority, "M"))
-			priority = 2;
-		else if (!strcmp(task->priority, "L"))
-			priority = 3;
-		else
-			priority = 0;
-
+		priority = priority_to_int(task->priority);
 		gtk_combo_box_set_active(w_priority, priority);
 	} else {
 		printf("clear task widgets\n");
 		clear_task_panel();
+		printf("clear task widgets done\n");
 	}
 
 	return FALSE;
 }
 
+static gint priority_cmp(GtkTreeModel *model,
+			 GtkTreeIter *a,
+			 GtkTreeIter *b,
+			 gpointer user_data)
+{
+	GValue v1 = {0,}, v2 = {0,};
+	const char *str1, *str2;
+	int i1, i2;
+
+	gtk_tree_model_get_value(model, a, COL_PRIORITY, &v1);
+	str1 = g_value_get_string(&v1);
+	i1 = priority_to_int(str1);
+
+	gtk_tree_model_get_value(model, b, COL_PRIORITY, &v2);
+	str2 = g_value_get_string(&v2);
+	i2 = priority_to_int(str2);
+
+	if (i1 < i2)
+		return -1;
+	else if (i1 > i2)
+		return 1;
+	else
+		return 0;
+}
+
 int main(int argc, char **argv)
 {
 	GtkWidget *window;
 	GtkWidget *btn;
 	GtkBuilder *builder;
+	GtkTreeModel *model;
 
 	gtk_init(NULL, NULL);
 	builder = gtk_builder_new();
@@ -323,6 +359,12 @@ int main(int argc, char **argv)
 	window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
 
 	w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "treeview"));
+	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
+	gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(model),
+					COL_PRIORITY,
+					priority_cmp,
+					NULL,
+					NULL);
 
 	w_note = GTK_TEXT_VIEW(gtk_builder_get_object(builder, "tasknote"));
 
-- 
2.7.4