X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.c;h=78262bdaac1e724f354f80b3d1325b14f3849093;hb=59e486b34640f81c905e832c7cc4a1b8a9a8e6f4;hp=eda9eccade7d41b6dbfbe4cf7985ea0700e8e9bb;hpb=c69aadceb8d1afc9ea16c2e8be2ae6aebc1f10ae;p=ptask.git

diff --git a/src/ui.c b/src/ui.c
index eda9ecc..78262bd 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -20,8 +20,10 @@
 #include <log.h>
 #include <ui.h>
 #include <ui_newtask_diag.h>
+#include <ui_projecttree.h>
+#include <ui_tasktree.h>
 
-static GtkTreeView *w_treeview;
+static GtkComboBox *w_status;
 
 int newtask_clicked_cbk(GtkButton *btn, gpointer data)
 {
@@ -30,22 +32,9 @@ int newtask_clicked_cbk(GtkButton *btn, gpointer data)
 	return FALSE;
 }
 
-
 static void save_settings(GtkWindow *window, GSettings *settings)
 {
-	int w, h, x, y, sort_col_id;
-	GtkTreeSortable *model;
-	GtkSortType sort_order;
-
-	model = GTK_TREE_SORTABLE(gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview)));
-	gtk_tree_sortable_get_sort_column_id(model, 
-					     &sort_col_id,
-                                             &sort_order);
-	log_debug("save_settings(): sort_col_id=%d", sort_col_id);
-	log_debug("save_settings(): sort_col_order=%d", sort_order);
-
-	g_settings_set_int(settings, "tasks-sort-col", sort_col_id);
-	g_settings_set_int(settings, "tasks-sort-order", sort_order);
+	int w, h, x, y;
 
 	gtk_window_get_size(window, &w, &h);
 	gtk_window_get_position(window, &x, &y);
@@ -57,29 +46,53 @@ 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();
 }
 
+int refresh_clicked_cbk(GtkButton *btn, gpointer data)
+{
+	log_fct_enter();
+	refresh();
+	log_fct_exit();
+	return FALSE;
+}
+
+
 static gboolean delete_event_cbk(GtkWidget *w, GdkEvent *evt, gpointer data)
 {
-	log_debug("delete_event_cbk");
+	log_fct_enter();
 
 	save_settings(GTK_WINDOW(w), (GSettings *)data);
 	gtk_widget_destroy(w);
 	gtk_main_quit();
 
+	log_fct_exit();
+
 	return TRUE;
 }
 
+static int status_changed_cbk(GtkComboBox *w, gpointer data)
+{
+	log_debug("status_changed_cbk");
+	refresh();
+
+	return FALSE;
+}
+
 GtkWindow *create_window(GtkBuilder *builder, GSettings *settings)
 {
 	GtkWindow *window;
-	int x, y, h, w, sort_col_id;
-	GtkSortType sort_order;
-	GtkTreeSortable *model;
+	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"));
+	g_signal_connect(w_status,
+			 "changed", (GCallback)status_changed_cbk,
+			 NULL);
+
 	w = g_settings_get_int(settings, "window-width");
 	h = g_settings_get_int(settings, "window-height");
 	gtk_window_set_default_size(window, w, h);
@@ -91,13 +104,30 @@ GtkWindow *create_window(GtkBuilder *builder, GSettings *settings)
 	g_signal_connect(window, "delete_event",
 			 G_CALLBACK(delete_event_cbk), settings);
 
-	w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "treeview"));
+	ui_tasktree_init(builder);
+	ui_projecttree_init(builder);
 
-	sort_col_id = g_settings_get_int(settings, "tasks-sort-col");
-	sort_order = g_settings_get_int(settings, "tasks-sort-order");
-	model = GTK_TREE_SORTABLE(gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview)));
-	gtk_tree_sortable_set_sort_column_id(model, sort_col_id, sort_order);
+	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;
+}