X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=6efc6c7934d18189984e77995ea243aa204477ac;hb=4e7cd76bf11ac81c04727a6297486474d703bde8;hp=fd583040215fe7a1f045ef447efb4bfe554a0313;hpb=d1d78bf94968b488c5f175d6859f76de0c8eb41d;p=ptask.git

diff --git a/src/main.c b/src/main.c
index fd58304..6efc6c7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -33,6 +33,7 @@ static GtkEntry *w_project;
 static GtkTreeView *w_treeview;
 static GtkWidget *w_tasksave_btn;
 static GtkComboBox *w_status;
+static GtkComboBox *w_priority;
 
 enum {
 	COL_ID,
@@ -88,6 +89,9 @@ static void clear_task_panel()
 
 	gtk_entry_set_text(w_project, "");
 	gtk_widget_set_sensitive(GTK_WIDGET(w_project), 0);
+
+	gtk_combo_box_set_active(w_priority, 0);
+	gtk_widget_set_sensitive(GTK_WIDGET(w_priority), 0);
 }
 
 static void refresh()
@@ -98,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);
@@ -123,28 +129,41 @@ 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");
+}
+
+int taskdone_clicked_cbk(GtkButton *btn, gpointer data)
+{
+	struct task *task;
+
+	task = get_selected_task(GTK_TREE_VIEW(w_treeview));
+	tw_done(task->uuid);
+	refresh();
+
+	return FALSE;
 }
 
 static int tasksave_clicked_cbk(GtkButton *btn, gpointer data)
 {
 	struct task *task;
 	GtkTextBuffer *buf;
-	char *txt;
+	char *txt, *pri;
 	GtkTextIter sIter, eIter;
 	const char *ctxt;
+	int priority;
 
 	task = get_selected_task(GTK_TREE_VIEW(w_treeview));
 
@@ -170,6 +189,26 @@ static int tasksave_clicked_cbk(GtkButton *btn, gpointer data)
 	if (!task->project || strcmp(ctxt, task->project))
 		tw_modify_project(task->uuid, ctxt);
 
+	priority = gtk_combo_box_get_active(w_priority);
+	printf("priority: %d\n", priority);
+
+	switch (priority) {
+	case 3:
+		pri = "H";
+		break;
+	case 2:
+		pri = "M";
+		break;
+	case 1:
+		pri = "L";
+		break;
+	default:
+		pri = "";
+	}
+
+	if (strcmp(task->priority, pri))
+		tw_modify_priority(task->uuid, pri);
+
 	refresh();
 
 	return FALSE;
@@ -232,10 +271,25 @@ 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;
 	GtkTextBuffer *buf;
+	int priority;
 
 	printf("cursor_changed_cbk\n");
 
@@ -262,19 +316,50 @@ static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 		gtk_widget_set_sensitive(GTK_WIDGET(w_project), 1);
 
 		gtk_widget_set_sensitive(w_tasksave_btn, 1);
+
+		gtk_widget_set_sensitive(GTK_WIDGET(w_priority), 1);
+		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();
@@ -285,6 +370,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"));
 
@@ -292,6 +383,8 @@ int main(int argc, char **argv)
 							 "taskdescription"));
 	w_project = GTK_ENTRY(gtk_builder_get_object(builder, "taskproject"));
 	w_status = GTK_COMBO_BOX(gtk_builder_get_object(builder, "status"));
+	w_priority = GTK_COMBO_BOX(gtk_builder_get_object(builder,
+							  "taskpriority"));
 
 	refresh();
 
@@ -309,10 +402,6 @@ int main(int argc, char **argv)
 	gtk_widget_set_sensitive(btn, 0);
 	w_tasksave_btn = btn;
 
-	/*btn = GTK_WIDGET(gtk_builder_get_object(builder, "refresh"));
-	g_signal_connect(btn,
-	"clicked", (GCallback)refresh_clicked_cbk, tasks);*/
-
 	g_object_unref(G_OBJECT(builder));
 
 	gtk_widget_show_all(window);