From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Sat, 30 Nov 2013 17:59:43 +0000 (+0000)
Subject: refactoring
X-Git-Tag: v0.0.6~55
X-Git-Url: http://git.wpitchoune.net/gitweb/?p=ptask.git;a=commitdiff_plain;h=bdbd5a6f005a82da659d119d5589d6f5b73b5d54

refactoring
---

diff --git a/src/main.c b/src/main.c
index 9b1817c..3837be6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -132,28 +132,15 @@ void refresh()
 	struct task *task;
 	int i;
 	GtkTreeIter iter;
-	int status;
 	const char *project;
 
 	log_fct_enter();
 	ui_taskpanel_update(NULL);
 
-	status = gtk_combo_box_get_active(w_status);
-	log_debug("status: %d", status);
-
 	if (tasks)
 		tw_task_list_free(tasks);
 
-	switch (status) {
-	case 0:
-		tasks = tw_get_all_tasks("pending");
-		break;
-	case 1:
-		tasks = tw_get_all_tasks("completed");
-		break;
-	default:
-		tasks = tw_get_all_tasks("pending");
-	}
+	tasks = tw_get_all_tasks(ui_get_status_filter());
 
 	model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview));
 	gtk_list_store_clear(GTK_LIST_STORE(model));
diff --git a/src/ui.c b/src/ui.c
index 74b13ec..8c883ea 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -23,6 +23,8 @@
 #include <ui_projecttree.h>
 #include <ui_tasktree.h>
 
+static GtkComboBox *w_status;
+
 int newtask_clicked_cbk(GtkButton *btn, gpointer data)
 {
 	ui_newtask();
@@ -66,6 +68,7 @@ GtkWindow *create_window(GtkBuilder *builder, GSettings *settings)
 	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"));
 
 	w = g_settings_get_int(settings, "window-width");
 	h = g_settings_get_int(settings, "window-height");
@@ -85,3 +88,23 @@ GtkWindow *create_window(GtkBuilder *builder, GSettings *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;
+}
diff --git a/src/ui.h b/src/ui.h
index 54914e3..0c70bbd 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -24,5 +24,6 @@
 
 GtkWindow *create_window(GtkBuilder *, GSettings *);
 void refresh();
+const char *ui_get_status_filter();
 
 #endif