X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=88910017ef10f28741fcd2a44e1222c5421fd775;hb=3a0a6203fbfe11a27b1268ff41ebc19433b9793d;hp=757ac469ee9d7b22614df8490a2e859771a17027;hpb=fdcb3dcc374b3cb61d7d2f207c03ea5ee9116cdd;p=ptask.git

diff --git a/src/main.c b/src/main.c
index 757ac46..8891001 100644
--- a/src/main.c
+++ b/src/main.c
@@ -16,13 +16,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+#include <locale.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
 #include <sys/stat.h>
 
-#include <json/json.h>
+#include <json.h>
 
 #include <glib/gi18n.h>
 
@@ -30,6 +32,7 @@
 
 #include <log.h>
 #include <note.h>
+#include <settings.h>
 #include <tw.h>
 #include <ui.h>
 #include <ui_projecttree.h>
@@ -38,16 +41,6 @@
 
 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'},
@@ -95,49 +88,30 @@ static void print_help()
 void refresh()
 {
 	GtkWidget *dialog;
-	GtkTreeModel *model;
-	struct task **tasks_cur;
-	struct task *task;
-	int i;
-	GtkTreeIter iter;
-	const char *project;
+	const char *current_prj, *current_uuid;
+	struct task **old_tasks;
 
 	log_fct_enter();
 	ui_taskpanel_update(NULL);
 
 	if (tasks) {
-		ui_tasktree_update(NULL);
-		tw_task_list_free(tasks);
+		old_tasks = tasks;
+		current_prj = ui_projecttree_get_project();
+		current_uuid = ui_tasktree_get_task_uuid();
+		ui_tasktree_update(NULL, NULL);
+	} else {
+		old_tasks = NULL;
+		current_prj = NULL;
+		current_uuid = NULL;
 	}
 
 	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));
-
 	if (tasks) {
-		for (tasks_cur = tasks, i = 0; *tasks_cur; tasks_cur++, i++) {
-			task = (*tasks_cur);
-
-			gtk_list_store_append(GTK_LIST_STORE(model), &iter);
-
-			if (task->project)
-				project = task->project;
-			else
-				project = "";
-
-			gtk_list_store_set(GTK_LIST_STORE(model),
-					   &iter,
-					   COL_ID, (*tasks_cur)->id,
-					   COL_DESCRIPTION,
-					   (*tasks_cur)->description,
-					   COL_PROJECT, project,
-					   COL_UUID, (*tasks_cur)->uuid,
-					   COL_PRIORITY, (*tasks_cur)->priority,
-					   -1);
-		}
 		ui_projecttree_update(tasks);
-		ui_tasktree_update(tasks);
+		ui_tasktree_update(tasks, current_prj);
+		if (current_uuid)
+			ui_tasktree_set_selected_task(current_uuid);
 	} else {
 		dialog = gtk_message_dialog_new(NULL,
 						GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -149,18 +123,11 @@ void refresh()
 		gtk_dialog_run(GTK_DIALOG(dialog));
 		gtk_widget_destroy(dialog);
 	}
-	log_fct(__func__, "EXIT");
-}
-
-static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
-{
-	log_fct_enter();
 
-	ui_taskpanel_update(ui_tasktree_get_selected_task());
+	if (old_tasks)
+		tw_task_list_free(old_tasks);
 
 	log_fct_exit();
-
-	return FALSE;
 }
 
 static void log_init()
@@ -189,7 +156,10 @@ int main(int argc, char **argv)
 {
 	GtkWindow *window;
 	GtkBuilder *builder;
-	int optc, cmdok, opti;
+	int optc, cmdok, opti, ret;
+	GError *err;
+	gchar *msg;
+	GtkMessageDialog *diag;
 
 	program_name = argv[0];
 
@@ -230,26 +200,37 @@ int main(int argc, char **argv)
 
 	gtk_init(NULL, NULL);
 
-	settings = g_settings_new("ptask");
+	settings_init();
 
 	builder = gtk_builder_new();
-	gtk_builder_add_from_file
+	ret = gtk_builder_add_from_file
 		(builder,
 		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade",
-		 NULL);
-	window = create_window(builder, settings);
+		 &err);
 
-	ui_taskpanel_init(builder);
-	ui_tasktree_init(builder);
-	ui_projecttree_init(builder);
+	if (!ret) {
+		msg = g_strdup_printf(_("Failed to load UI: %s"),
+				      err->message);
+		log_err(msg);
 
-	w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "tasktree"));
+		diag = GTK_MESSAGE_DIALOG(gtk_message_dialog_new
+					  (NULL,
+					   GTK_DIALOG_DESTROY_WITH_PARENT,
+					   GTK_MESSAGE_ERROR,
+					   GTK_BUTTONS_CLOSE,
+					   msg,
+					   NULL));
 
-	gtk_builder_connect_signals(builder, NULL);
+		gtk_dialog_run(GTK_DIALOG(diag));
+
+		g_free(msg);
+
+		exit(EXIT_FAILURE);
+	}
 
-	g_signal_connect(w_treeview,
-			 "cursor-changed", (GCallback)cursor_changed_cbk,
-			 tasks);
+	window = create_window(builder);
+
+	gtk_builder_connect_signals(builder, NULL);
 
 	g_object_unref(G_OBJECT(builder));