X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=53c2e1e1cff92c112259ae7eff2cf0bfb3adaf5e;hb=refs%2Fheads%2Fv0.0.2;hp=b39f554f6cd15f3f545c2c3c1273dd48ccad38b1;hpb=b1c1b82a0b0360a7bed8612084e0d6228ab4b4b0;p=ptask.git diff --git a/src/main.c b/src/main.c index b39f554..53c2e1e 100644 --- a/src/main.c +++ b/src/main.c @@ -24,6 +24,7 @@ #include +#include "note.h" #include "tw.h" static struct task **tasks; @@ -32,36 +33,47 @@ 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; + +enum { + COL_ID, + COL_DESCRIPTION, + COL_PROJECT, + COL_UUID, + COL_PRIORITY +}; static struct task *get_selected_task(GtkTreeView *treeview) { GtkTreePath *path; GtkTreeViewColumn *cols; - gint *i; - struct task *task; + struct task **tasks_cur; + GtkTreeIter iter; + GtkTreeModel *model; + GValue value = {0,}; + const char *uuid; printf("get_selected_task\n"); gtk_tree_view_get_cursor(treeview, &path, &cols); if (path) { - i = gtk_tree_path_get_indices(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); - if (i) { - printf("row selected: %d\n", *i); + uuid = g_value_get_string(&value); - task = tasks[*i]; - } else { - task = NULL; - } + for (tasks_cur = tasks; *tasks_cur; tasks_cur++) + if (!strcmp((*tasks_cur)->uuid, uuid)) + return *tasks_cur; gtk_tree_path_free(path); - } else { - task = NULL; } - return task; + return NULL; } static void clear_task_panel() @@ -69,6 +81,7 @@ static void clear_task_panel() GtkTextBuffer *buf; gtk_widget_set_sensitive(w_tasksave_btn, 0); + gtk_widget_set_sensitive(w_taskdone_btn, 0); buf = gtk_text_view_get_buffer(w_note); gtk_text_buffer_set_text(buf, "", 0); @@ -79,6 +92,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() @@ -89,12 +105,17 @@ 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); printf("status: %d\n", status); + if (tasks) + tw_task_list_free(tasks); + switch (status) { case 0: tasks = tw_get_all_tasks("pending"); @@ -114,42 +135,56 @@ static void refresh() 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); + project = task->project; + else + project = ""; gtk_list_store_set(GTK_LIST_STORE(model), &iter, - 0, (*tasks_cur)->id, - 1, (*tasks_cur)->description, + 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)); printf("tasksave_clicked_cbk %d\n", task->id); - if (task->note) { - buf = gtk_text_view_get_buffer(w_note); + 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); + 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); - txt = escape(txt); + printf("note=%s\n", txt); - printf("%s\n", 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)) @@ -159,6 +194,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; @@ -172,6 +227,47 @@ int refresh_clicked_cbk(GtkButton *btn, gpointer data) return FALSE; } +int newtask_clicked_cbk(GtkButton *btn, gpointer data) +{ + gint result; + static GtkDialog *diag; + GtkBuilder *builder; + GtkEntry *entry; + const char *ctxt; + + printf("newtask_clicked_cbk\n"); + + builder = gtk_builder_new(); + gtk_builder_add_from_file + (builder, + PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade", + NULL); + diag = GTK_DIALOG(gtk_builder_get_object(builder, "diag_tasknew")); + gtk_builder_connect_signals(builder, NULL); + + result = gtk_dialog_run(diag); + + 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); + + printf("%s\n", ctxt); + + tw_add(ctxt); + refresh(); + } else { + printf("cancel\n"); + } + + g_object_unref(G_OBJECT(builder)); + + gtk_widget_destroy(GTK_WIDGET(diag)); + + return FALSE; +} + static int status_changed_cbk(GtkComboBox *w, gpointer data) { printf("status_changed_cbk\n"); @@ -180,10 +276,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"); @@ -210,29 +321,67 @@ 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(w_taskdone_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(); gtk_builder_add_from_file (builder, - PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "gtask.glade", + PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade", NULL); 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")); @@ -240,6 +389,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(); @@ -251,15 +402,16 @@ int main(int argc, char **argv) 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);*/ + 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));