refactoring

[ptask.git] / src / ui.c

diff --git a/src/ui.c b/src/ui.c
index a63288b..8c883ea 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -19,6 +19,18 @@
 
 #include <log.h>
 #include <ui.h>
+#include <ui_newtask_diag.h>
+#include <ui_projecttree.h>
+#include <ui_tasktree.h>
+
+static GtkComboBox *w_status;
+
+int newtask_clicked_cbk(GtkButton *btn, gpointer data)
+{
+       ui_newtask();
+
+       return FALSE;
+}
 
 static void save_settings(GtkWindow *window, GSettings *settings)
 {
@@ -34,6 +46,8 @@ static void save_settings(GtkWindow *window, GSettings *settings)
        g_settings_set_int(settings, "window-x", x);
        g_settings_set_int(settings, "window-y", y);
 
+       ui_tasktree_save_settings(settings);
+
        g_settings_sync();
 }
 
@@ -51,21 +65,46 @@ static gboolean delete_event_cbk(GtkWidget *w, GdkEvent *evt, gpointer data)
 GtkWindow *create_window(GtkBuilder *builder, GSettings *settings)
 {
        GtkWindow *window;
-       int x, y, h, w;
+       int x, y, w, h;
 
        window = GTK_WINDOW(gtk_builder_get_object(builder, "window"));
+       w_status = GTK_COMBO_BOX(gtk_builder_get_object(builder, "status"));
 
-       x = g_settings_get_int(settings, "window-x");
-       y = g_settings_get_int(settings, "window-y");
        w = g_settings_get_int(settings, "window-width");
        h = g_settings_get_int(settings, "window-height");
-
        gtk_window_set_default_size(window, w, h);
+
+       x = g_settings_get_int(settings, "window-x");
+       y = g_settings_get_int(settings, "window-y");
        gtk_window_move(window, x, y);
 
        g_signal_connect(window, "delete_event",
                         G_CALLBACK(delete_event_cbk), settings);
 
+       ui_tasktree_init(builder);
+       ui_projecttree_init(builder);
+
+       ui_tasktree_load_settings(settings);
+
        return window;
 }
 
+const char *ui_get_status_filter()
+{
+       const char *result;
+       int status;
+
+       log_fct_enter();
+
+       status = gtk_combo_box_get_active(w_status);
+       log_fct(__func__, "status: %d", status);
+
+       if (status == 1)
+               result = "completed";
+       else
+               result = "pending";
+
+       log_fct_exit();
+
+       return result;
+}