worked on the project table

[ptask.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 2171895..35b1e4b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -32,6 +32,8 @@
 #include "note.h"
 #include "tw.h"
 #include <ui.h>
+#include <ui_projecttree.h>
+#include <ui_tasktree.h>
 
 static const char *program_name;
 static struct task **tasks;
@@ -203,6 +205,7 @@ void refresh()
                                           COL_PRIORITY, (*tasks_cur)->priority,
                                           -1);
                }
+               ui_projecttree_update(tasks);
        } else {
                dialog = gtk_message_dialog_new(NULL,
                                                GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -360,31 +363,6 @@ static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
        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;
-}
-
 static void log_init()
 {
        char *home, *path, *dir;
@@ -412,7 +390,6 @@ int main(int argc, char **argv)
        GtkWindow *window;
        GtkWidget *btn;
        GtkBuilder *builder;
-       GtkTreeModel *model;
        int optc, cmdok, opti;
 
        program_name = argv[0];
@@ -463,13 +440,10 @@ int main(int argc, char **argv)
                 NULL);
        window = create_window(builder, settings);
 
-       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);
+       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"));