#include <getopt.h>
#include <sys/stat.h>
-#include <json/json.h>
+#include <json.h>
#include <glib/gi18n.h>
#include <log.h>
#include <note.h>
+#include <settings.h>
#include <tw.h>
#include <ui.h>
#include <ui_projecttree.h>
static const char *program_name;
static struct task **tasks;
-static GtkTreeView *w_treeview;
-static GSettings *settings;
-
-enum {
- COL_ID,
- COL_DESCRIPTION,
- COL_PROJECT,
- COL_UUID,
- COL_PRIORITY
-};
static struct option long_options[] = {
{"version", no_argument, 0, 'v'},
gtk_init(NULL, NULL);
- settings = g_settings_new("ptask");
+ settings_init();
builder = gtk_builder_new();
gtk_builder_add_from_file
(builder,
PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade",
NULL);
- window = create_window(builder, settings);
-
- ui_taskpanel_init(builder);
- ui_tasktree_init(builder);
- ui_projecttree_init(builder);
-
- w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "tasktree"));
+ window = create_window(builder);
gtk_builder_connect_signals(builder, NULL);