X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=95a80545676a9a8d12d10e095af47cee486107df;hb=64d52e239f715717646357783d01ff8650dbdb2d;hp=9b1817c035b503ed95fe75136e4e2ba1be9e3be5;hpb=f6bf5fdf1ad7d86e996d9cd04643b5ddbcd2645b;p=ptask.git diff --git a/src/main.c b/src/main.c index 9b1817c..95a8054 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2013 jeanfi@gmail.com + * Copyright (C) 2012-2016 jeanfi@gmail.com * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -16,13 +16,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301 USA */ +#include + #include #include #include #include #include -#include +#include #include @@ -30,6 +32,7 @@ #include #include +#include #include #include #include @@ -38,21 +41,11 @@ static const char *program_name; static struct task **tasks; -static GtkTreeView *w_treeview; -static GtkComboBox *w_status; -static GSettings *settings; - -enum { - COL_ID, - COL_DESCRIPTION, - COL_PROJECT, - COL_UUID, - COL_PRIORITY -}; static struct option long_options[] = { {"version", no_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, + {"force-unsupported-taskwarrior", no_argument, 0, 'f'}, {"debug", required_argument, 0, 'd'}, {0, 0, 0, 0} }; @@ -66,7 +59,7 @@ static void print_version() "This is free software: you are free to change and " " redistribute it.\n" "There is NO WARRANTY, to the extent permitted by law.\n"), - "2012-2013"); + "2012-2016"); } static void print_help() @@ -82,7 +75,8 @@ static void print_help() " -v, --version display version information and exit")); puts(""); - + puts(_(" -f, --force-unsupported-taskwarrior force usage of an" + " unsupported version of taskwarrior")); puts(_(" -d, --debug=LEVEL " "set the debug level, integer between 0 and 3")); @@ -93,93 +87,31 @@ static void print_help() printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL); } -static struct task *get_selected_task(GtkTreeView *treeview) -{ - GtkTreePath *path; - GtkTreeViewColumn *cols; - struct task **tasks_cur; - GtkTreeIter iter; - GtkTreeModel *model; - GValue value = {0,}; - const char *uuid; - - log_debug("get_selected_task"); - - gtk_tree_view_get_cursor(treeview, &path, &cols); - - if (path) { - model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); - gtk_tree_model_get_iter(model, &iter, path); - gtk_tree_model_get_value(model, &iter, COL_UUID, &value); - - uuid = g_value_get_string(&value); - - for (tasks_cur = tasks; *tasks_cur; tasks_cur++) - if (!strcmp((*tasks_cur)->uuid, uuid)) - return *tasks_cur; - - gtk_tree_path_free(path); - } - - return NULL; -} - void refresh() { GtkWidget *dialog; - GtkTreeModel *model; - struct task **tasks_cur; - struct task *task; - int i; - GtkTreeIter iter; - int status; - const char *project; + const char *current_uuid; + struct task **old_tasks; 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"); + if (tasks) { + old_tasks = tasks; + current_uuid = ui_tasktree_get_task_uuid(); + ui_tasktree_update(NULL); + } else { + old_tasks = NULL; + current_uuid = NULL; } - model = gtk_tree_view_get_model(GTK_TREE_VIEW(w_treeview)); - gtk_list_store_clear(GTK_LIST_STORE(model)); + tasks = tw_get_all_tasks(ui_get_status_filter()); 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); + if (current_uuid) + ui_tasktree_set_selected_task(current_uuid); } else { dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT, @@ -187,49 +119,15 @@ void refresh() GTK_BUTTONS_CLOSE, _("Error loading tasks, verify " "that a supported version of " - "taskwarrior is installed ")); + "taskwarrior is installed.")); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); } - log_fct(__func__, "EXIT"); -} -int taskdone_clicked_cbk(GtkButton *btn, gpointer data) -{ - struct task *task; - - task = get_selected_task(GTK_TREE_VIEW(w_treeview)); - tw_done(task->uuid); - refresh(); - - return FALSE; -} - -int refresh_clicked_cbk(GtkButton *btn, gpointer data) -{ - log_debug("refresh_clicked_cbk"); - refresh(); - - return FALSE; -} - -static int status_changed_cbk(GtkComboBox *w, gpointer data) -{ - log_debug("status_changed_cbk"); - refresh(); - - return FALSE; -} - -static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data) -{ - log_fct_enter(); - - ui_taskpanel_update(get_selected_task(treeview)); + if (old_tasks) + tw_task_list_free(old_tasks); log_fct_exit(); - - return FALSE; } static void log_init() @@ -258,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]; @@ -270,7 +171,7 @@ int main(int argc, char **argv) #endif cmdok = 1; - while ((optc = getopt_long(argc, argv, "vhd:", long_options, + while ((optc = getopt_long(argc, argv, "vhfd:", long_options, &opti)) != -1) { switch (optc) { case 'h': @@ -283,6 +184,11 @@ int main(int argc, char **argv) log_level = atoi(optarg); log_info(_("Enables debug mode.")); break; + case 'f': + log_info(_("Force usage of an unsupported version of " + "taskwarrior.")); + tw_enable_check_version(0); + break; default: cmdok = 0; break; @@ -299,31 +205,38 @@ 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 + err = NULL; + 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)); - w_status = GTK_COMBO_BOX(gtk_builder_get_object(builder, "status")); + gtk_dialog_run(GTK_DIALOG(diag)); - gtk_builder_connect_signals(builder, NULL); + g_free(msg); - g_signal_connect(w_treeview, - "cursor-changed", (GCallback)cursor_changed_cbk, - tasks); - g_signal_connect(w_status, - "changed", (GCallback)status_changed_cbk, - tasks); + exit(EXIT_FAILURE); + } + + window = create_window(builder); + + gtk_builder_connect_signals(builder, NULL); g_object_unref(G_OBJECT(builder));