(no commit message)

[ptask.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index df27275..fd58304 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -34,34 +34,43 @@ static GtkTreeView *w_treeview;
 static GtkWidget *w_tasksave_btn;
 static GtkComboBox *w_status;
 
+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,14 +78,14 @@ static void clear_task_panel()
        GtkTextBuffer *buf;
 
        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);
 }
@@ -94,7 +103,7 @@ static void refresh()
 
        status = gtk_combo_box_get_active(w_status);
        printf("status: %d\n", status);
-       
+
        switch (status) {
        case 0:
                tasks = tw_get_all_tasks("pending");
@@ -116,13 +125,15 @@ static void refresh()
                if (task->project)
                        gtk_list_store_set(GTK_LIST_STORE(model),
                                           &iter,
-                                          2, task->project,
+                                          COL_PROJECT, task->project,
                                           -1);
 
                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_UUID, (*tasks_cur)->uuid,
+                                  COL_PRIORITY, (*tasks_cur)->priority,
                                   -1);
        }
 }
@@ -153,18 +164,18 @@ static int tasksave_clicked_cbk(GtkButton *btn, gpointer data)
 
        ctxt = gtk_entry_get_text(w_description);
        if (!task->description || strcmp(ctxt, task->description))
-           tw_modify_description(task->uuid, ctxt);
+               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);
+               tw_modify_project(task->uuid, ctxt);
 
        refresh();
 
        return FALSE;
 }
 
-static int refresh_clicked_cbk(GtkButton *btn, gpointer data)
+int refresh_clicked_cbk(GtkButton *btn, gpointer data)
 {
        printf("refresh_clicked_cbk\n");
        refresh();
@@ -172,6 +183,47 @@ static 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 "gtask.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");
@@ -243,6 +295,8 @@ int main(int argc, char **argv)
 
        refresh();
 
+       gtk_builder_connect_signals(builder, NULL);
+
        g_signal_connect(w_treeview,
                         "cursor-changed", (GCallback)cursor_changed_cbk,
                         tasks);
@@ -255,9 +309,9 @@ int main(int argc, char **argv)
        gtk_widget_set_sensitive(btn, 0);
        w_tasksave_btn = btn;
 
-       btn = GTK_WIDGET(gtk_builder_get_object(builder, "refresh"));
+       /*btn = GTK_WIDGET(gtk_builder_get_object(builder, "refresh"));
        g_signal_connect(btn,
-                        "clicked", (GCallback)refresh_clicked_cbk, tasks);
+       "clicked", (GCallback)refresh_clicked_cbk, tasks);*/
 
        g_object_unref(G_OBJECT(builder));