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

diff --git a/src/main.c b/src/main.c
index 3f95c31..6efc6c7 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,240 +24,342 @@
 
 #include <gtk/gtk.h>
 
-struct task {
-	int id;
-	char *description;
-	char *status;
-	char *uuid;
-};
+#include "tw.h"
 
 static struct task **tasks;
-static GtkTextView *w_description;
+static GtkTextView *w_note;
+static GtkEntry *w_description;
+static GtkEntry *w_project;
 static GtkTreeView *w_treeview;
+static GtkWidget *w_tasksave_btn;
+static GtkComboBox *w_status;
+static GtkComboBox *w_priority;
+
+enum {
+	COL_ID,
+	COL_DESCRIPTION,
+	COL_PROJECT,
+	COL_UUID,
+	COL_PRIORITY
+};
 
-static char *task_exec(char *opts)
+static struct task *get_selected_task(GtkTreeView *treeview)
 {
-	FILE *f;
-	int ret, s;
-	char *str, *tmp, *cmd, buf[1024];
-
-	str = NULL;
-
-	cmd = malloc(strlen("task rc.json.array=on ") + strlen(opts) + 1);
-	strcpy(cmd, "task rc.json.array=on ");
-	strcat(cmd, opts);
-
-	printf("execute: %s\n", cmd);
-
-	f = popen(cmd, "r");
-
-	if (!f) {
-		perror("popen");
-		goto exit_free;
-	}
-
-	str = malloc(1);
-	str[0] = '\0';
-	while ((s = fread(buf, 1, 1024, f))) {
-		tmp = malloc(strlen(str) + s + 1);
-		memcpy(tmp, str, strlen(str));
-		memcpy(tmp + strlen(str), buf, s);
-		tmp[strlen(str) + s] = '\0';
-		free(str);
-		str = tmp;
-	}
-
-	ret = pclose(f);
+	GtkTreePath *path;
+	GtkTreeViewColumn *cols;
+	struct task **tasks_cur;
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+	GValue value = {0,};
+	const char *uuid;
 
-	if (ret == -1) {
-		printf("pclose fails\n");
-		perror("pclose");
-	}
+	printf("get_selected_task\n");
 
- exit_free:
-	free(cmd);
+	gtk_tree_view_get_cursor(treeview, &path, &cols);
 
-	return str;
-}
+	if (path) {
+		model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
+		gtk_tree_model_get_iter(model, &iter, path);
+		gtk_tree_model_get_value(model, &iter, COL_UUID, &value);
 
-static struct json_object *task_exec_json(char *opts)
-{
-	struct json_object *o;
-	char *str;
+		uuid = g_value_get_string(&value);
 
-	str = task_exec(opts);
+		for (tasks_cur = tasks; *tasks_cur; tasks_cur++)
+			if (!strcmp((*tasks_cur)->uuid, uuid))
+				return *tasks_cur;
 
-	if (str) {
-		o = json_tokener_parse(str);
-		free(str);
-		return o;
+		gtk_tree_path_free(path);
 	}
 
 	return NULL;
 }
 
-static struct task **get_all_tasks()
+static void clear_task_panel()
 {
-	int i, n;
-	struct json_object *jtasks, *jtask, *json;
-	struct task **tasks;
+	GtkTextBuffer *buf;
 
-	jtasks = task_exec_json("export");
+	gtk_widget_set_sensitive(w_tasksave_btn, 0);
 
-	if (!jtasks)
-		return NULL;
+	buf = gtk_text_view_get_buffer(w_note);
+	gtk_text_buffer_set_text(buf, "", 0);
+	gtk_widget_set_sensitive(GTK_WIDGET(w_note), 0);
 
-	n = json_object_array_length(jtasks);
+	gtk_entry_set_text(w_description, "");
+	gtk_widget_set_sensitive(GTK_WIDGET(w_description), 0);
 
-	tasks = malloc((n + 1) * sizeof(struct task *));
+	gtk_entry_set_text(w_project, "");
+	gtk_widget_set_sensitive(GTK_WIDGET(w_project), 0);
 
-	for (i = 0; i < n; i++) {
-		jtask = json_object_array_get_idx(jtasks, i);
+	gtk_combo_box_set_active(w_priority, 0);
+	gtk_widget_set_sensitive(GTK_WIDGET(w_priority), 0);
+}
 
-		tasks[i] = malloc(sizeof(struct task));
+static void refresh()
+{
+	GtkTreeModel *model;
+	struct task **tasks_cur;
+	struct task *task;
+	int i;
+	GtkTreeIter iter;
+	int status;
+	const char *project;
+
+	printf("refresh\n");
+	clear_task_panel();
+
+	status = gtk_combo_box_get_active(w_status);
+	printf("status: %d\n", status);
+
+	switch (status) {
+	case 0:
+		tasks = tw_get_all_tasks("pending");
+		break;
+	case 1:
+		tasks = tw_get_all_tasks("completed");
+		break;
+	default:
+		tasks = tw_get_all_tasks("pending");
+	}
 
-		json = json_object_object_get(jtask, "id");
-		tasks[i]->id = json_object_get_int(json);
+	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
+	gtk_list_store_clear(GTK_LIST_STORE(model));
+	for (tasks_cur = tasks, i = 0; *tasks_cur; tasks_cur++, i++) {
+		task = (*tasks_cur);
 
-		json = json_object_object_get(jtask, "description");
-		tasks[i]->description = strdup(json_object_get_string(json));
+		gtk_list_store_append(GTK_LIST_STORE(model), &iter);
 
-		json = json_object_object_get(jtask, "status");
-		tasks[i]->status = strdup(json_object_get_string(json));
+		if (task->project)
+			project = task->project;
+		else
+			project = "";
 
-		json = json_object_object_get(jtask, "uuid");
-		tasks[i]->uuid = strdup(json_object_get_string(json));
+		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");
+}
 
-	tasks[n] = NULL;
+int taskdone_clicked_cbk(GtkButton *btn, gpointer data)
+{
+	struct task *task;
 
-	json_object_put(jtasks);
+	task = get_selected_task(GTK_TREE_VIEW(w_treeview));
+	tw_done(task->uuid);
+	refresh();
 
-	return tasks;
+	return FALSE;
 }
 
-static struct task *get_selected_task(GtkTreeView *treeview)
+static int tasksave_clicked_cbk(GtkButton *btn, gpointer data)
 {
-	GtkTreePath *path;
-	GtkTreeViewColumn *cols;
-	gint *i;
 	struct task *task;
+	GtkTextBuffer *buf;
+	char *txt, *pri;
+	GtkTextIter sIter, eIter;
+	const char *ctxt;
+	int priority;
 
-	gtk_tree_view_get_cursor(treeview, &path, &cols);
+	task = get_selected_task(GTK_TREE_VIEW(w_treeview));
 
-	if (path) {
-		i = gtk_tree_path_get_indices(path);
-		
-		if (i)
-			printf("row selected: %d\n", *i);
+	printf("tasksave_clicked_cbk %d\n", task->id);
 
-		task = tasks[*i];
+	if (task->note) {
+		buf = gtk_text_view_get_buffer(w_note);
 
-		gtk_tree_path_free(path);
+		gtk_text_buffer_get_iter_at_offset(buf, &sIter, 0);
+		gtk_text_buffer_get_iter_at_offset(buf, &eIter, -1);
+		txt = gtk_text_buffer_get_text(buf, &sIter, &eIter, TRUE);
 
-		return task;
+		txt = escape(txt);
+
+		printf("%s\n", txt);
 	}
 
-	return NULL;
+	ctxt = gtk_entry_get_text(w_description);
+	if (!task->description || strcmp(ctxt, task->description))
+		tw_modify_description(task->uuid, ctxt);
+
+	ctxt = gtk_entry_get_text(w_project);
+	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;
 }
 
-static char *escape(char *txt)
+int refresh_clicked_cbk(GtkButton *btn, gpointer data)
 {
-	char *result;
-	char *c;
-
-	result = malloc(2*strlen(txt)+1);
-	c = result;
-
-	while(*txt) {
-		switch(*txt) {
-		case '"':
-			*c = '\\'; c++;
-			*c = '"';
-			break;
-		case '$':
-			*c = '\\'; c++;
-			*c = '$';
-			break;
-		case '&':
-			*c = '\\'; c++;
-			*c = '&';
-			break;
-		default:
-			*c = *txt;
-		}
-		c++;
-		txt++;
-	}
+	printf("refresh_clicked_cbk\n");
+	refresh();
 
-	*c = '\0';
-
-	return result;
+	return FALSE;
 }
 
-static int tasksave_clicked_cbk(GtkButton *btn, gpointer data)
+int newtask_clicked_cbk(GtkButton *btn, gpointer data)
 {
-	struct task *task;
-	GtkTextBuffer *buf;
-	char *txt, *opts;
-	GtkTextIter sIter, eIter;
+	gint result;
+	static GtkDialog *diag;
+	GtkBuilder *builder;
+	GtkEntry *entry;
+	const char *ctxt;
 
-	task = get_selected_task(GTK_TREE_VIEW(w_treeview));
+	printf("newtask_clicked_cbk\n");
+
+	builder = gtk_builder_new();
+	gtk_builder_add_from_file
+		(builder,
+		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "gtask.glade",
+		 NULL);
+	diag = GTK_DIALOG(gtk_builder_get_object(builder, "diag_tasknew"));
+	gtk_builder_connect_signals(builder, NULL);
+
+	result = gtk_dialog_run(diag);
 
-	printf("tasksave_clicked_cbk %d\n", task->id);	
+	if (result == GTK_RESPONSE_ACCEPT) {
+		printf("ok\n");
+		entry = GTK_ENTRY(gtk_builder_get_object
+				  (builder, "diag_tasknew_description"));
+		ctxt = gtk_entry_get_text(entry);
 
-	buf = gtk_text_view_get_buffer(w_description);
+		printf("%s\n", ctxt);
 
-	gtk_text_buffer_get_iter_at_offset(buf, &sIter, 0);
-	gtk_text_buffer_get_iter_at_offset(buf, &eIter, -1);
-	txt = gtk_text_buffer_get_text(buf, &sIter, &eIter, TRUE);
+		tw_add(ctxt);
+		refresh();
+	} else {
+		printf("cancel\n");
+	}
 
-	txt = escape(txt);
+	g_object_unref(G_OBJECT(builder));
 
-	printf("%s\n", txt);
+	gtk_widget_destroy(GTK_WIDGET(diag));
 
-	opts = malloc(1
-		      + strlen(task->uuid)
-		      + strlen(" modify description:\"")
-		      + strlen(txt)
-		      + strlen("\"")
-		      + 1);
-	sprintf(opts, " %s modify \"%s\"", task->uuid, txt);
+	return FALSE;
+}
+
+static int status_changed_cbk(GtkComboBox *w, gpointer data)
+{
+	printf("status_changed_cbk\n");
+	refresh();
 
-	task_exec(opts);
-	
 	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");
 
 	task = get_selected_task(treeview);
 
 	if (task) {
-		buf = gtk_text_view_get_buffer(w_description);
-		gtk_text_buffer_set_text(buf,
-					 task->description,
-					 strlen(task->description));
 
+		buf = gtk_text_view_get_buffer(w_note);
+		if (task->note)
+			gtk_text_buffer_set_text(buf,
+						 task->note,
+						 strlen(task->note));
+		else
+			gtk_text_buffer_set_text(buf, "", 0);
+		gtk_widget_set_sensitive(GTK_WIDGET(w_note), 1);
+
+		gtk_entry_set_text(w_description, task->description);
+		gtk_widget_set_sensitive(GTK_WIDGET(w_description), 1);
+
+		if (task->project)
+			gtk_entry_set_text(w_project, task->project);
+		else
+			gtk_entry_set_text(w_project, "");
+		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;
-	GtkTreeIter iter;
-	int i;
 	GtkTreeModel *model;
-	struct task **tasks_cur;
 
 	gtk_init(NULL, NULL);
 	builder = gtk_builder_new();
@@ -266,32 +368,39 @@ int main(int argc, char **argv)
 		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "gtask.glade",
 		 NULL);
 	window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
-	printf("%p\n", 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_description = GTK_TEXT_VIEW(gtk_builder_get_object(builder,
-							     "taskdescription"));
+	w_note = GTK_TEXT_VIEW(gtk_builder_get_object(builder, "tasknote"));
 
-	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
+	w_description = GTK_ENTRY(gtk_builder_get_object(builder,
+							 "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"));
 
-	tasks = get_all_tasks();
+	refresh();
 
-	for (tasks_cur = tasks, i = 0; *tasks_cur; tasks_cur++, i++) {
-		gtk_list_store_append(GTK_LIST_STORE(model), &iter);
-		gtk_list_store_set(GTK_LIST_STORE(model),
-				   &iter,
-				   0, (*tasks_cur)->id,
-				   1, (*tasks_cur)->description,
-				   -1);
-	}
+	gtk_builder_connect_signals(builder, NULL);
 
 	g_signal_connect(w_treeview,
-			 "cursor-changed", (GCallback)cursor_changed_cbk, tasks);
-
+			 "cursor-changed", (GCallback)cursor_changed_cbk,
+			 tasks);
+	g_signal_connect(w_status,
+			 "changed", (GCallback)status_changed_cbk,
+			 tasks);
 	btn = GTK_WIDGET(gtk_builder_get_object(builder, "tasksave"));
 	g_signal_connect(btn,
 			 "clicked", (GCallback)tasksave_clicked_cbk, tasks);
+	gtk_widget_set_sensitive(btn, 0);
+	w_tasksave_btn = btn;
 
 	g_object_unref(G_OBJECT(builder));