(no commit message)

[ptask.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 864edb9..c439fcf 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -24,6 +24,7 @@
 
 #include <gtk/gtk.h>
 
+#include "note.h"
 #include "tw.h"
 
 static struct task **tasks;
@@ -32,6 +33,7 @@ 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;
 
@@ -79,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);
@@ -102,7 +105,9 @@ 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);
@@ -127,19 +132,31 @@ static void refresh()
                gtk_list_store_append(GTK_LIST_STORE(model), &iter);
 
                if (task->project)
-                       gtk_list_store_set(GTK_LIST_STORE(model),
-                                          &iter,
-                                          COL_PROJECT, task->project,
-                                          -1);
+                       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);
        }
+       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)
@@ -155,17 +172,16 @@ static int tasksave_clicked_cbk(GtkButton *btn, gpointer data)
 
        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))
@@ -179,13 +195,13 @@ static int tasksave_clicked_cbk(GtkButton *btn, gpointer data)
        printf("priority: %d\n", priority);
 
        switch (priority) {
-       case 1:
+       case 3:
                pri = "H";
                break;
        case 2:
                pri = "M";
                break;
-       case 3:
+       case 1:
                pri = "L";
                break;
        default:
@@ -257,6 +273,20 @@ 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;
@@ -288,31 +318,51 @@ 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);
-               if (!strcmp(task->priority, "H"))
-                       priority = 1;
-               else if (!strcmp(task->priority, "M"))
-                       priority = 2;
-               else if (!strcmp(task->priority, "L"))
-                       priority = 3;
-               else
-                       priority = 0;
-
+               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();
@@ -323,6 +373,12 @@ int main(int argc, char **argv)
        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"));
 
@@ -343,15 +399,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));