X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=4f8267b2bf8e2a96e515737ddb8264ab268898eb;hb=6eebc096a7dcd3944bbf273d827a23cd355a0f8d;hp=ad3f2afc324bc7e310a6e634471a63e5eff30a11;hpb=d49062302884b2930cf90cc7a5382ad9e6903da9;p=ptask.git diff --git a/src/main.c b/src/main.c index ad3f2af..4f8267b 100644 --- a/src/main.c +++ b/src/main.c @@ -20,14 +20,21 @@ #include #include #include +#include #include #include -#include +#include + +#include "log.h" #include "note.h" #include "tw.h" +#include +#include +#include +#include static const char *program_name; static struct task **tasks; @@ -39,6 +46,7 @@ static GtkWidget *w_tasksave_btn; static GtkWidget *w_taskdone_btn; static GtkComboBox *w_status; static GtkComboBox *w_priority; +static GSettings *settings; enum { COL_ID, @@ -51,6 +59,7 @@ enum { static struct option long_options[] = { {"version", no_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, + {"debug", required_argument, 0, 'd'}, {0, 0, 0, 0} }; @@ -70,7 +79,8 @@ static void print_help() { printf(_("Usage: %s [OPTION]...\n"), program_name); - puts(_("Ptask is a task management UI based on taskwarrior.")); + puts(_("ptask is a task management user interface based" + " on taskwarrior.")); puts(""); puts(_("Options:")); @@ -79,6 +89,11 @@ static void print_help() puts(""); + puts(_(" -d, --debug=LEVEL " + "set the debug level, integer between 0 and 3")); + + puts(""); + printf(_("Report bugs to: %s\n"), PACKAGE_BUGREPORT); puts(""); printf(_("%s home page: <%s>\n"), PACKAGE_NAME, PACKAGE_URL); @@ -94,7 +109,7 @@ static struct task *get_selected_task(GtkTreeView *treeview) GValue value = {0,}; const char *uuid; - printf("get_selected_task\n"); + log_debug("get_selected_task"); gtk_tree_view_get_cursor(treeview, &path, &cols); @@ -115,28 +130,7 @@ static struct task *get_selected_task(GtkTreeView *treeview) return NULL; } -static void clear_task_panel() -{ - GtkTextBuffer *buf; - - gtk_widget_set_sensitive(w_tasksave_btn, 0); - gtk_widget_set_sensitive(w_taskdone_btn, 0); - - buf = gtk_text_view_get_buffer(w_note); - gtk_text_buffer_set_text(buf, "", 0); - gtk_widget_set_sensitive(GTK_WIDGET(w_note), 0); - - gtk_entry_set_text(w_description, ""); - gtk_widget_set_sensitive(GTK_WIDGET(w_description), 0); - - gtk_entry_set_text(w_project, ""); - gtk_widget_set_sensitive(GTK_WIDGET(w_project), 0); - - gtk_combo_box_set_active(w_priority, 0); - gtk_widget_set_sensitive(GTK_WIDGET(w_priority), 0); -} - -static void refresh() +void refresh() { GtkWidget *dialog; GtkTreeModel *model; @@ -147,11 +141,11 @@ static void refresh() int status; const char *project; - printf("refresh\n"); - clear_task_panel(); + log_fct_enter(); + ui_taskpanel_update(NULL); status = gtk_combo_box_get_active(w_status); - printf("status: %d\n", status); + log_debug("status: %d", status); if (tasks) tw_task_list_free(tasks); @@ -184,28 +178,26 @@ static void refresh() gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_ID, (*tasks_cur)->id, - COL_DESCRIPTION, + COL_DESCRIPTION, (*tasks_cur)->description, COL_PROJECT, project, COL_UUID, (*tasks_cur)->uuid, COL_PRIORITY, (*tasks_cur)->priority, -1); } - } - else { + ui_projecttree_update(tasks); + } else { dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, _("Error loading tasks, verify " - "that taskwarrior is " - "correctly installed, and its" - " configuration file exist." - )); - gtk_dialog_run(GTK_DIALOG (dialog)); + "that a supported version of " + "taskwarrior is installed ")); + gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); } - printf("refresh done\n"); + log_fct(__func__, "EXIT"); } int taskdone_clicked_cbk(GtkButton *btn, gpointer data) @@ -230,7 +222,7 @@ static int tasksave_clicked_cbk(GtkButton *btn, gpointer data) task = get_selected_task(GTK_TREE_VIEW(w_treeview)); - printf("tasksave_clicked_cbk %d\n", task->id); + log_debug("tasksave_clicked_cbk %d", task->id); buf = gtk_text_view_get_buffer(w_note); @@ -238,7 +230,7 @@ static int tasksave_clicked_cbk(GtkButton *btn, gpointer data) gtk_text_buffer_get_iter_at_offset(buf, &eIter, -1); txt = gtk_text_buffer_get_text(buf, &sIter, &eIter, TRUE); - printf("note=%s\n", txt); + log_debug("note=%s", txt); if (!task->note || strcmp(txt, task->note)) note_put(task->uuid, txt); @@ -252,7 +244,7 @@ static int tasksave_clicked_cbk(GtkButton *btn, gpointer data) tw_modify_project(task->uuid, ctxt); priority = gtk_combo_box_get_active(w_priority); - printf("priority: %d\n", priority); + log_debug("priority: %d", priority); switch (priority) { case 3: @@ -278,159 +270,58 @@ static int tasksave_clicked_cbk(GtkButton *btn, gpointer data) int refresh_clicked_cbk(GtkButton *btn, gpointer data) { - printf("refresh_clicked_cbk\n"); + log_debug("refresh_clicked_cbk"); refresh(); 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; - - printf("newtask_clicked_cbk\n"); - - 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) { - printf("ok\n"); - entry = GTK_ENTRY(gtk_builder_get_object - (builder, "diag_tasknew_description")); - ctxt = gtk_entry_get_text(entry); - - printf("%s\n", ctxt); - - tw_add(ctxt); - refresh(); - } else { - printf("cancel\n"); - } - - g_object_unref(G_OBJECT(builder)); - - gtk_widget_destroy(GTK_WIDGET(diag)); - - return FALSE; -} - static int status_changed_cbk(GtkComboBox *w, gpointer data) { - printf("status_changed_cbk\n"); + log_debug("status_changed_cbk"); refresh(); return FALSE; } -static int priority_to_int(const char *str) -{ - switch (*str) { - case 'H': - return 3; - case 'M': - return 2; - case 'L': - return 1; - default: - return 0; - } -} - static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data) { - struct task *task; - GtkTextBuffer *buf; - int priority; + log_fct_enter(); - printf("cursor_changed_cbk\n"); + ui_taskpanel_update(get_selected_task(treeview)); - task = get_selected_task(treeview); + log_fct_exit(); - if (task) { + return FALSE; +} - buf = gtk_text_view_get_buffer(w_note); - if (task->note) - gtk_text_buffer_set_text(buf, - task->note, - strlen(task->note)); - else - gtk_text_buffer_set_text(buf, "", 0); - gtk_widget_set_sensitive(GTK_WIDGET(w_note), 1); +static void log_init() +{ + char *home, *path, *dir; - gtk_entry_set_text(w_description, task->description); - gtk_widget_set_sensitive(GTK_WIDGET(w_description), 1); + home = getenv("HOME"); - if (task->project) - gtk_entry_set_text(w_project, task->project); - else - gtk_entry_set_text(w_project, ""); - gtk_widget_set_sensitive(GTK_WIDGET(w_project), 1); + if (!home) + return ; - gtk_widget_set_sensitive(w_tasksave_btn, 1); - gtk_widget_set_sensitive(w_taskdone_btn, 1); + dir = malloc(strlen(home)+1+strlen(".ptask")+1); + sprintf(dir, "%s/%s", home, ".ptask"); + mkdir(dir, 0777); - gtk_widget_set_sensitive(GTK_WIDGET(w_priority), 1); - priority = priority_to_int(task->priority); - gtk_combo_box_set_active(w_priority, priority); - } else { - printf("clear task widgets\n"); - clear_task_panel(); - printf("clear task widgets done\n"); - } + path = malloc(strlen(dir)+1+strlen("log")+1); + sprintf(path, "%s/%s", dir, "log"); - return FALSE; -} + log_open(path); -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; + free(dir); + free(path); } int main(int argc, char **argv) { - GtkWidget *window, *btn; + GtkWindow *window; + GtkWidget *btn; GtkBuilder *builder; - GtkTreeModel *model; int optc, cmdok, opti; program_name = argv[0]; @@ -443,7 +334,7 @@ int main(int argc, char **argv) #endif cmdok = 1; - while ((optc = getopt_long(argc, argv, "vh", long_options, + while ((optc = getopt_long(argc, argv, "vhd:", long_options, &opti)) != -1) { switch (optc) { case 'h': @@ -452,6 +343,10 @@ int main(int argc, char **argv) case 'v': print_version(); exit(EXIT_SUCCESS); + case 'd': + log_level = atoi(optarg); + log_info(_("Enables debug mode.")); + break; default: cmdok = 0; break; @@ -464,24 +359,24 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + log_init(); + gtk_init(NULL, NULL); + + settings = g_settings_new("ptask"); + builder = gtk_builder_new(); gtk_builder_add_from_file (builder, PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade", NULL); - window = GTK_WIDGET(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")); @@ -492,8 +387,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, @@ -515,7 +408,9 @@ int main(int argc, char **argv) g_object_unref(G_OBJECT(builder)); - gtk_widget_show_all(window); + refresh(); + + gtk_widget_show_all(GTK_WIDGET(window)); gtk_main();