X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=df27275b4aa37b79df205d8976352b6afeddfe96;hb=d2ffd5d71745fafa09e193ab9d32777b4ffbce49;hp=7bf75ba423b5af55e7d39b5a9de67ba7aa02f9c7;hpb=513c9dcb2d16d0cb5fae3fcad443a119d23e24ac;p=ptask.git

diff --git a/src/main.c b/src/main.c
index 7bf75ba..df27275 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,8 +29,10 @@
 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 struct task *get_selected_task(GtkTreeView *treeview)
 {
@@ -45,20 +47,38 @@ static struct task *get_selected_task(GtkTreeView *treeview)
 
 	if (path) {
 		i = gtk_tree_path_get_indices(path);
-		
-		if (i)
+
+		if (i) {
 			printf("row selected: %d\n", *i);
 
-		task = tasks[*i];
+			task = tasks[*i];
+		} else {
+			task = NULL;
+		}
 
 		gtk_tree_path_free(path);
-
-		return task;
+	} else {
+		task = NULL;
 	}
 
-	printf("get_selected_task returns NULL\n");
+	return task;
+}
+
+static void clear_task_panel()
+{
+	GtkTextBuffer *buf;
 
-	return NULL;
+	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 void refresh()
@@ -68,9 +88,23 @@ static void refresh()
 	struct task *task;
 	int i;
 	GtkTreeIter iter;
-	/*GtkTreeSelection *sel;*/
+	int status;
+
+	clear_task_panel();
 
-	tasks = get_all_tasks();
+	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");
+	}
 
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
 	gtk_list_store_clear(GTK_LIST_STORE(model));
@@ -78,7 +112,7 @@ static void refresh()
 		task = (*tasks_cur);
 
 		gtk_list_store_append(GTK_LIST_STORE(model), &iter);
-		
+
 		if (task->project)
 			gtk_list_store_set(GTK_LIST_STORE(model),
 					   &iter,
@@ -91,24 +125,19 @@ static void refresh()
 				   1, (*tasks_cur)->description,
 				   -1);
 	}
-
-	/*
-	sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(w_treeview));
-	gtk_tree_model_get_iter_first(model, &iter);
-	gtk_tree_selection_select_iter(sel, &iter);*/
 }
 
 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);
@@ -123,20 +152,13 @@ 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);
 
-	free(txt);
-	
 	refresh();
 
 	return FALSE;
@@ -150,6 +172,14 @@ static int refresh_clicked_cbk(GtkButton *btn, gpointer data)
 	return FALSE;
 }
 
+static int status_changed_cbk(GtkComboBox *w, gpointer data)
+{
+	printf("status_changed_cbk\n");
+	refresh();
+
+	return FALSE;
+}
+
 static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 {
 	struct task *task;
@@ -161,17 +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 {
-		gtk_widget_set_sensitive(w_tasksave_btn, 0);
+		printf("clear task widgets\n");
+		clear_task_panel();
 	}
 
 	return FALSE;
@@ -190,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"));
 
@@ -198,12 +238,17 @@ 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"));
 
 	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);