X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=df27275b4aa37b79df205d8976352b6afeddfe96;hb=d2ffd5d71745fafa09e193ab9d32777b4ffbce49;hp=62fa99c35054131005d0411d1c8e6377436d543c;hpb=150347d61ee08df85b377c5af0c5c2d7b3cc8716;p=ptask.git

diff --git a/src/main.c b/src/main.c
index 62fa99c..df27275 100644
--- a/src/main.c
+++ b/src/main.c
@@ -24,200 +24,120 @@
 
 #include <gtk/gtk.h>
 
-struct task {
-	int id;
-	char *description;
-	char *status;
-	char *uuid;
-	char *note;
-	char *project;
-};
+#include "tw.h"
 
 static struct task **tasks;
 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 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;
+	gint *i;
+	struct task *task;
 
-	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) {
+		i = gtk_tree_path_get_indices(path);
 
-static struct json_object *task_exec_json(char *opts)
-{
-	struct json_object *o;
-	char *str;
+		if (i) {
+			printf("row selected: %d\n", *i);
 
-	str = task_exec(opts);
+			task = tasks[*i];
+		} else {
+			task = NULL;
+		}
 
-	if (str) {
-		o = json_tokener_parse(str);
-		free(str);
-		return o;
+		gtk_tree_path_free(path);
+	} else {
+		task = NULL;
 	}
 
-	return NULL;
+	return task;
 }
 
-static struct task **get_all_tasks()
+static void clear_task_panel()
 {
-	int i, n;
-	struct json_object *jtasks, *jtask, *json;
-	struct task **tasks;
-
-	jtasks = task_exec_json("export");
-
-	if (!jtasks)
-		return NULL;
-
-	n = json_object_array_length(jtasks);
-
-	tasks = malloc((n + 1) * sizeof(struct task *));
-
-	for (i = 0; i < n; i++) {
-		jtask = json_object_array_get_idx(jtasks, i);
-
-		tasks[i] = malloc(sizeof(struct task));
-
-		json = json_object_object_get(jtask, "id");
-		tasks[i]->id = json_object_get_int(json);
-
-		json = json_object_object_get(jtask, "description");
-		tasks[i]->description = strdup(json_object_get_string(json));
-
-		json = json_object_object_get(jtask, "status");
-		tasks[i]->status = strdup(json_object_get_string(json));
-
-		json = json_object_object_get(jtask, "project");
-		if (json)
-			tasks[i]->project
-				= strdup(json_object_get_string(json));
-		else
-			tasks[i]->project = NULL;
-
-		json = json_object_object_get(jtask, "uuid");
-		tasks[i]->uuid = strdup(json_object_get_string(json));
-
-		tasks[i]->note = NULL;
-	}
-
-	tasks[n] = NULL;
-
-	json_object_put(jtasks);
+	GtkTextBuffer *buf;
 
-	return tasks;
+	gtk_widget_set_sensitive(w_tasksave_btn, 0);
+	
+	buf = gtk_text_view_get_buffer(w_note);
+	gtk_text_buffer_set_text(buf, "", 0);
+	gtk_widget_set_sensitive(GTK_WIDGET(w_note), 0);
+	
+	gtk_entry_set_text(w_description, "");
+	gtk_widget_set_sensitive(GTK_WIDGET(w_description), 0);
+	
+	gtk_entry_set_text(w_project, "");
+	gtk_widget_set_sensitive(GTK_WIDGET(w_project), 0);
 }
 
-static struct task *get_selected_task(GtkTreeView *treeview)
+static void refresh()
 {
-	GtkTreePath *path;
-	GtkTreeViewColumn *cols;
-	gint *i;
+	GtkTreeModel *model;
+	struct task **tasks_cur;
 	struct task *task;
+	int i;
+	GtkTreeIter iter;
+	int status;
 
-	gtk_tree_view_get_cursor(treeview, &path, &cols);
-
-	if (path) {
-		i = gtk_tree_path_get_indices(path);
-		
-		if (i)
-			printf("row selected: %d\n", *i);
-
-		task = tasks[*i];
-
-		gtk_tree_path_free(path);
+	clear_task_panel();
 
-		return task;
+	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");
 	}
 
-	return NULL;
-}
+	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);
 
-static char *escape(const char *txt)
-{
-	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++;
-	}
+		gtk_list_store_append(GTK_LIST_STORE(model), &iter);
 
-	*c = '\0';
+		if (task->project)
+			gtk_list_store_set(GTK_LIST_STORE(model),
+					   &iter,
+					   2, task->project,
+					   -1);
 
-	return result;
+		gtk_list_store_set(GTK_LIST_STORE(model),
+				   &iter,
+				   0, (*tasks_cur)->id,
+				   1, (*tasks_cur)->description,
+				   -1);
+	}
 }
 
 static int tasksave_clicked_cbk(GtkButton *btn, gpointer data)
 {
 	struct task *task;
 	GtkTextBuffer *buf;
-	char *txt, *opts;
+	char *txt;
 	GtkTextIter sIter, eIter;
 	const char *ctxt;
 
 	task = get_selected_task(GTK_TREE_VIEW(w_treeview));
 
-	printf("tasksave_clicked_cbk %d\n", task->id);	
+	printf("tasksave_clicked_cbk %d\n", task->id);
 
 	if (task->note) {
 		buf = gtk_text_view_get_buffer(w_note);
@@ -232,20 +152,31 @@ static int tasksave_clicked_cbk(GtkButton *btn, gpointer data)
 	}
 
 	ctxt = gtk_entry_get_text(w_description);
-	txt = escape(ctxt);
-
-	opts = malloc(1
-		      + strlen(task->uuid)
-		      + strlen(" modify description:\"")
-		      + strlen(txt)
-		      + strlen("\"")
-		      + 1);
-	sprintf(opts, " %s modify \"%s\"", task->uuid, txt);
-	
-	task_exec(opts);
+	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);
+
+	refresh();
+
+	return FALSE;
+}
+
+static int refresh_clicked_cbk(GtkButton *btn, gpointer data)
+{
+	printf("refresh_clicked_cbk\n");
+	refresh();
+
+	return FALSE;
+}
+
+static int status_changed_cbk(GtkComboBox *w, gpointer data)
+{
+	printf("status_changed_cbk\n");
+	refresh();
 
-	free(txt);
-	
 	return FALSE;
 }
 
@@ -260,14 +191,28 @@ static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 
 	if (task) {
 
-		if (task->note) {
-			buf = gtk_text_view_get_buffer(w_note);
+		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);
+	} else {
+		printf("clear task widgets\n");
+		clear_task_panel();
 	}
 
 	return FALSE;
@@ -278,11 +223,6 @@ int main(int argc, char **argv)
 	GtkWidget *window;
 	GtkWidget *btn;
 	GtkBuilder *builder;
-	GtkTreeIter iter;
-	int i;
-	GtkTreeModel *model;
-	struct task **tasks_cur;
-	struct task *task;
 
 	gtk_init(NULL, NULL);
 	builder = gtk_builder_new();
@@ -291,7 +231,6 @@ 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"));
 
@@ -299,35 +238,26 @@ int main(int argc, char **argv)
 
 	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"));
 
-	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
-
-	tasks = get_all_tasks();
-
-	for (tasks_cur = tasks, i = 0; *tasks_cur; tasks_cur++, i++) {
-		task = (*tasks_cur);
-
-		gtk_list_store_append(GTK_LIST_STORE(model), &iter);
-		
-		if (task->project)
-			gtk_list_store_set(GTK_LIST_STORE(model),
-					   &iter,
-					   2, task->project,
-					   -1);
-
-		gtk_list_store_set(GTK_LIST_STORE(model),
-				   &iter,
-				   0, (*tasks_cur)->id,
-				   1, (*tasks_cur)->description,
-				   -1);
-	}
+	refresh();
 
 	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;
+
+	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));