X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=bafb3b40146e02dd0a3ffc0a4f1c54d24115ca37;hb=781a99f9dbdf4aa086c7d33392f7201d5f731ed2;hp=6abe9a69563225774c3cd44e8583a69c654926e1;hpb=fc7ac55e4b2f234a5a998fb2082772c4a4c1e900;p=ptask.git diff --git a/src/main.c b/src/main.c index 6abe9a6..bafb3b4 100644 --- a/src/main.c +++ b/src/main.c @@ -28,9 +28,9 @@ #include -#include "log.h" -#include "note.h" -#include "tw.h" +#include +#include +#include #include #include #include @@ -38,14 +38,6 @@ 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 { @@ -99,93 +91,33 @@ static void print_help() printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL); } -static struct task *get_selected_task(GtkTreeView *treeview) -{ - GtkTreePath *path; - GtkTreeViewColumn *cols; - struct task **tasks_cur; - GtkTreeIter iter; - GtkTreeModel *model; - GValue value = {0,}; - const char *uuid; - - log_debug("get_selected_task"); - - gtk_tree_view_get_cursor(treeview, &path, &cols); - - 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); - - uuid = g_value_get_string(&value); - - for (tasks_cur = tasks; *tasks_cur; tasks_cur++) - if (!strcmp((*tasks_cur)->uuid, uuid)) - return *tasks_cur; - - gtk_tree_path_free(path); - } - - return NULL; -} - void refresh() { GtkWidget *dialog; - GtkTreeModel *model; - struct task **tasks_cur; - struct task *task; - int i; - GtkTreeIter iter; - int status; - const char *project; + const char *current_prj, *current_uuid; + struct task **old_tasks; 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"); + if (tasks) { + old_tasks = tasks; + current_prj = ui_projecttree_get_project(); + current_uuid = ui_tasktree_get_task_uuid(); + ui_tasktree_update(NULL, NULL); + } else { + old_tasks = NULL; + current_prj = NULL; + current_uuid = NULL; } - model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview)); - gtk_list_store_clear(GTK_LIST_STORE(model)); + tasks = tw_get_all_tasks(ui_get_status_filter()); if (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) - project = task->project; - else - project = ""; - - 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); - } ui_projecttree_update(tasks); + ui_tasktree_update(tasks, current_prj); + if (current_uuid) + ui_tasktree_set_selected_task(current_uuid); } else { dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT, @@ -197,104 +129,11 @@ void refresh() gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); } - 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(); + if (old_tasks) + tw_task_list_free(old_tasks); - 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"); - refresh(); - - return FALSE; -} - -static int status_changed_cbk(GtkComboBox *w, gpointer data) -{ - log_debug("status_changed_cbk"); - refresh(); - - return FALSE; -} - -static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data) -{ - struct task *task; - - log_debug("cursor_changed_cbk"); - - task = get_selected_task(treeview); - - ui_taskpanel_update(task); - - return FALSE; + log_fct_exit(); } static void log_init() @@ -322,7 +161,6 @@ static void log_init() int main(int argc, char **argv) { GtkWindow *window; - GtkWidget *btn; GtkBuilder *builder; int optc, cmdok, opti; @@ -378,36 +216,8 @@ int main(int argc, char **argv) ui_tasktree_init(builder); ui_projecttree_init(builder); - 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); - g_signal_connect(w_treeview, - "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; - - 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();