display project table

[ptask.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 6a98b1c..1a2509e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -25,13 +25,14 @@
 #include <json/json.h>
 
 #include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include <config.h>
 
 #include "log.h"
 #include "note.h"
 #include "tw.h"
+#include <ui.h>
+#include <ui_projecttree.h>
 
 static const char *program_name;
 static struct task **tasks;
@@ -43,6 +44,7 @@ static GtkWidget *w_tasksave_btn;
 static GtkWidget *w_taskdone_btn;
 static GtkComboBox *w_status;
 static GtkComboBox *w_priority;
+static GSettings *settings;
 
 enum {
        COL_ID,
@@ -147,7 +149,7 @@ static void clear_task_panel()
        gtk_widget_set_sensitive(GTK_WIDGET(w_priority), 0);
 }
 
-static void refresh()
+void refresh()
 {
        GtkWidget *dialog;
        GtkTreeModel *model;
@@ -202,6 +204,7 @@ static void refresh()
                                           COL_PRIORITY, (*tasks_cur)->priority,
                                           -1);
                }
+               ui_projecttree_update(tasks);
        } else {
                dialog = gtk_message_dialog_new(NULL,
                                                GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -209,10 +212,7 @@ static void refresh()
                                                GTK_BUTTONS_CLOSE,
                                                _("Error loading tasks, verify "
                                                  "that a supported version of "
-                                                 "taskwarrior is installed "
-                                                 "and its configuration file "
-                                                 "exist."
-                                                 ));
+                                                 "taskwarrior is installed "));
                gtk_dialog_run(GTK_DIALOG(dialog));
                gtk_widget_destroy(dialog);
        }
@@ -295,56 +295,6 @@ int refresh_clicked_cbk(GtkButton *btn, gpointer data)
        return FALSE;
 }
 
-static gboolean delete_event_cbk(GtkWidget *w, GdkEvent *evt, gpointer data)
-{
-       gtk_widget_destroy(w);
-       gtk_main_quit();
-
-       return FALSE;
-}
-
-
-int newtask_clicked_cbk(GtkButton *btn, gpointer data)
-{
-       gint result;
-       static GtkDialog *diag;
-       GtkBuilder *builder;
-       GtkEntry *entry;
-       const char *ctxt;
-
-       log_debug("newtask_clicked_cbk");
-
-       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) {
-               log_debug("ok");
-               entry = GTK_ENTRY(gtk_builder_get_object
-                                 (builder, "diag_tasknew_description"));
-               ctxt = gtk_entry_get_text(entry);
-
-               log_debug("%s", ctxt);
-
-               tw_add(ctxt);
-               refresh();
-       } else {
-               log_debug("cancel");
-       }
-
-       g_object_unref(G_OBJECT(builder));
-
-       gtk_widget_destroy(GTK_WIDGET(diag));
-
-       return FALSE;
-}
-
 static int status_changed_cbk(GtkComboBox *w, gpointer data)
 {
        log_debug("status_changed_cbk");
@@ -461,7 +411,8 @@ static void log_init()
 
 int main(int argc, char **argv)
 {
-       GtkWidget *window, *btn;
+       GtkWindow *window;
+       GtkWidget *btn;
        GtkBuilder *builder;
        GtkTreeModel *model;
        int optc, cmdok, opti;
@@ -504,15 +455,17 @@ int main(int argc, char **argv)
        log_init();
 
        gtk_init(NULL, NULL);
+
+       settings = g_settings_new("ptask");
+
        builder = gtk_builder_new();
        gtk_builder_add_from_file
                (builder,
                 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade",
                 NULL);
-       window = GTK_WIDGET(gtk_builder_get_object(builder, "window"));
+       window = create_window(builder, settings);
 
-       g_signal_connect(window, "delete_event",
-                        G_CALLBACK(delete_event_cbk), NULL);
+       ui_projecttree_init(builder);
 
        w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "treeview"));
        model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
@@ -531,8 +484,6 @@ int main(int argc, char **argv)
        w_priority = GTK_COMBO_BOX(gtk_builder_get_object(builder,
                                                          "taskpriority"));
 
-       refresh();
-
        gtk_builder_connect_signals(builder, NULL);
 
        g_signal_connect(w_treeview,
@@ -554,7 +505,9 @@ int main(int argc, char **argv)
 
        g_object_unref(G_OBJECT(builder));
 
-       gtk_widget_show_all(window);
+       refresh();
+
+       gtk_widget_show_all(GTK_WIDGET(window));
 
        gtk_main();