X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=e6a31f6db1d1e3267ae595b24513646bf5175b22;hb=e9200af84bf5f534edb0f66708a6153f64537148;hp=6abe9a69563225774c3cd44e8583a69c654926e1;hpb=fc7ac55e4b2f234a5a998fb2082772c4a4c1e900;p=ptask.git

diff --git a/src/main.c b/src/main.c
index 6abe9a6..e6a31f6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,9 +28,9 @@
 
 #include <config.h>
 
-#include "log.h"
-#include "note.h"
-#include "tw.h"
+#include <log.h>
+#include <note.h>
+#include <tw.h>
 #include <ui.h>
 #include <ui_projecttree.h>
 #include <ui_taskpanel.h>
@@ -38,14 +38,8 @@
 
 static const char *program_name;
 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 GtkWidget *w_taskdone_btn;
 static GtkComboBox *w_status;
-static GtkComboBox *w_priority;
 static GSettings *settings;
 
 enum {
@@ -138,28 +132,15 @@ void refresh()
 	struct task *task;
 	int i;
 	GtkTreeIter iter;
-	int status;
 	const char *project;
 
 	log_fct_enter();
 	ui_taskpanel_update(NULL);
 
-	status = gtk_combo_box_get_active(w_status);
-	log_debug("status: %d", status);
-
 	if (tasks)
 		tw_task_list_free(tasks);
 
-	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");
-	}
+	tasks = tw_get_all_tasks(ui_get_status_filter());
 
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
 	gtk_list_store_clear(GTK_LIST_STORE(model));
@@ -200,74 +181,6 @@ void refresh()
 	log_fct(__func__, "EXIT");
 }
 
-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, *pri;
-	GtkTextIter sIter, eIter;
-	const char *ctxt;
-	int priority;
-
-	task = get_selected_task(GTK_TREE_VIEW(w_treeview));
-
-	log_debug("tasksave_clicked_cbk %d", task->id);
-
-	buf = gtk_text_view_get_buffer(w_note);
-
-	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);
-
-	log_debug("note=%s", txt);
-
-	if (!task->note || strcmp(txt, task->note))
-		note_put(task->uuid, txt);
-
-	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);
-	log_debug("priority: %d", 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;
-}
-
 int refresh_clicked_cbk(GtkButton *btn, gpointer data)
 {
 	log_debug("refresh_clicked_cbk");
@@ -286,13 +199,11 @@ static int status_changed_cbk(GtkComboBox *w, gpointer data)
 
 static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
 {
-	struct task *task;
-
-	log_debug("cursor_changed_cbk");
+	log_fct_enter();
 
-	task = get_selected_task(treeview);
+	ui_taskpanel_update(get_selected_task(treeview));
 
-	ui_taskpanel_update(task);
+	log_fct_exit();
 
 	return FALSE;
 }
@@ -322,7 +233,6 @@ static void log_init()
 int main(int argc, char **argv)
 {
 	GtkWindow *window;
-	GtkWidget *btn;
 	GtkBuilder *builder;
 	int optc, cmdok, opti;
 
@@ -380,14 +290,7 @@ int main(int argc, char **argv)
 
 	w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "tasktree"));
 
-	w_note = GTK_TEXT_VIEW(gtk_builder_get_object(builder, "tasknote"));
-
-	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"));
 
 	gtk_builder_connect_signals(builder, NULL);
 
@@ -398,16 +301,6 @@ int main(int argc, char **argv)
 			 "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;
-
-	w_taskdone_btn = GTK_WIDGET(gtk_builder_get_object(builder,
-							   "taskdone"));
-	gtk_widget_set_sensitive(w_taskdone_btn, 0);
-
 	g_object_unref(G_OBJECT(builder));
 
 	refresh();