X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=4a126d8e9a67d63feea68115747f48196bc37f94;hb=8a8ea8604707b51f52e9791a7d601ac3f563f07b;hp=e34503b581a11ff0053bd8d7e3d5556d51a5e725;hpb=98da9e03d15320c6a0d685c0088ca69748433628;p=ptask.git

diff --git a/src/main.c b/src/main.c
index e34503b..4a126d8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -32,6 +32,9 @@
 #include "note.h"
 #include "tw.h"
 #include <ui.h>
+#include <ui_projecttree.h>
+#include <ui_taskpanel.h>
+#include <ui_tasktree.h>
 
 static const char *program_name;
 static struct task **tasks;
@@ -148,7 +151,7 @@ static void clear_task_panel()
 	gtk_widget_set_sensitive(GTK_WIDGET(w_priority), 0);
 }
 
-static void refresh()
+void refresh()
 {
 	GtkWidget *dialog;
 	GtkTreeModel *model;
@@ -159,7 +162,7 @@ static void refresh()
 	int status;
 	const char *project;
 
-	log_debug("refresh");
+	log_fct_enter();
 	clear_task_panel();
 
 	status = gtk_combo_box_get_active(w_status);
@@ -203,6 +206,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,
@@ -214,7 +218,7 @@ static void refresh()
 		gtk_dialog_run(GTK_DIALOG(dialog));
 		gtk_widget_destroy(dialog);
 	}
-	log_debug("refresh done");
+	log_fct(__func__, "EXIT");
 }
 
 int taskdone_clicked_cbk(GtkButton *btn, gpointer data)
@@ -293,56 +297,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");
@@ -410,31 +364,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;
@@ -462,7 +391,6 @@ int main(int argc, char **argv)
 	GtkWindow *window;
 	GtkWidget *btn;
 	GtkBuilder *builder;
-	GtkTreeModel *model;
 	int optc, cmdok, opti;
 
 	program_name = argv[0];
@@ -506,27 +434,18 @@ int main(int argc, char **argv)
 
 	settings = g_settings_new("ptask");
 
-	printf("%d\n", g_settings_get_int(settings, "windows_x"));
-
-
 	builder = gtk_builder_new();
 	gtk_builder_add_from_file
 		(builder,
 		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade",
 		 NULL);
-	window = create_window();
-	window = GTK_WINDOW(gtk_builder_get_object(builder, "window"));
+	window = create_window(builder, settings);
 
-	g_signal_connect(window, "delete_event",
-			 G_CALLBACK(delete_event_cbk), NULL);
+	ui_taskpanel_init(builder);
+	ui_tasktree_init(builder);
+	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));
-	gtk_tree_sortable_set_sort_func(GTK_TREE_SORTABLE(model),
-					COL_PRIORITY,
-					priority_cmp,
-					NULL,
-					NULL);
+	w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "tasktree"));
 
 	w_note = GTK_TEXT_VIEW(gtk_builder_get_object(builder, "tasknote"));
 
@@ -537,8 +456,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,
@@ -560,6 +477,8 @@ int main(int argc, char **argv)
 
 	g_object_unref(G_OBJECT(builder));
 
+	refresh();
+
 	gtk_widget_show_all(GTK_WIDGET(window));
 
 	gtk_main();