refactoring
[ptask.git] / src / main.c
index 29204e9..3837be6 100644 (file)
 
 #include <config.h>
 
-#include "log.h"
-#include "note.h"
-#include "tw.h"
+#include <log.h>
+#include <note.h>
+#include <tw.h>
 #include <ui.h>
+#include <ui_projecttree.h>
+#include <ui_taskpanel.h>
+#include <ui_tasktree.h>
 
 static const char *program_name;
 static struct task **tasks;
-static GtkTextView *w_note;
-static GtkEntry *w_description;
-static GtkEntry *w_project;
 static GtkTreeView *w_treeview;
-static GtkWidget *w_tasksave_btn;
-static GtkWidget *w_taskdone_btn;
 static GtkComboBox *w_status;
-static GtkComboBox *w_priority;
 static GSettings *settings;
 
 enum {
@@ -127,28 +124,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;
@@ -156,28 +132,15 @@ static void refresh()
        struct task *task;
        int i;
        GtkTreeIter iter;
-       int status;
        const char *project;
 
-       log_debug("refresh");
-       clear_task_panel();
-
-       status = gtk_combo_box_get_active(w_status);
-       log_debug("status: %d", status);
+       log_fct_enter();
+       ui_taskpanel_update(NULL);
 
        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));
@@ -203,6 +166,7 @@ static void refresh()
                                           COL_PRIORITY, (*tasks_cur)->priority,
                                           -1);
                }
+               ui_projecttree_update(tasks);
        } else {
                dialog = gtk_message_dialog_new(NULL,
                                                GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -214,7 +178,7 @@ static void refresh()
                gtk_dialog_run(GTK_DIALOG(dialog));
                gtk_widget_destroy(dialog);
        }
-       log_debug("refresh done");
+       log_fct(__func__, "EXIT");
 }
 
 int taskdone_clicked_cbk(GtkButton *btn, gpointer data)
@@ -228,63 +192,6 @@ int taskdone_clicked_cbk(GtkButton *btn, gpointer data)
        return FALSE;
 }
 
-static int tasksave_clicked_cbk(GtkButton *btn, gpointer data)
-{
-       struct task *task;
-       GtkTextBuffer *buf;
-       char *txt, *pri;
-       GtkTextIter sIter, eIter;
-       const char *ctxt;
-       int priority;
-
-       task = get_selected_task(GTK_TREE_VIEW(w_treeview));
-
-       log_debug("tasksave_clicked_cbk %d", task->id);
-
-       buf = gtk_text_view_get_buffer(w_note);
-
-       gtk_text_buffer_get_iter_at_offset(buf, &sIter, 0);
-       gtk_text_buffer_get_iter_at_offset(buf, &eIter, -1);
-       txt = gtk_text_buffer_get_text(buf, &sIter, &eIter, TRUE);
-
-       log_debug("note=%s", txt);
-
-       if (!task->note || strcmp(txt, task->note))
-               note_put(task->uuid, txt);
-
-       ctxt = gtk_entry_get_text(w_description);
-       if (!task->description || strcmp(ctxt, task->description))
-               tw_modify_description(task->uuid, ctxt);
-
-       ctxt = gtk_entry_get_text(w_project);
-       if (!task->project || strcmp(ctxt, task->project))
-               tw_modify_project(task->uuid, ctxt);
-
-       priority = gtk_combo_box_get_active(w_priority);
-       log_debug("priority: %d", priority);
-
-       switch (priority) {
-       case 3:
-               pri = "H";
-               break;
-       case 2:
-               pri = "M";
-               break;
-       case 1:
-               pri = "L";
-               break;
-       default:
-               pri = "";
-       }
-
-       if (strcmp(task->priority, pri))
-               tw_modify_priority(task->uuid, pri);
-
-       refresh();
-
-       return FALSE;
-}
-
 int refresh_clicked_cbk(GtkButton *btn, gpointer data)
 {
        log_debug("refresh_clicked_cbk");
@@ -293,47 +200,6 @@ int refresh_clicked_cbk(GtkButton *btn, gpointer data)
        return FALSE;
 }
 
-int newtask_clicked_cbk(GtkButton *btn, gpointer data)
-{
-       gint result;
-       static GtkDialog *diag;
-       GtkBuilder *builder;
-       GtkEntry *entry;
-       const char *ctxt;
-
-       log_debug("newtask_clicked_cbk");
-
-       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) {
-               log_debug("ok");
-               entry = GTK_ENTRY(gtk_builder_get_object
-                                 (builder, "diag_tasknew_description"));
-               ctxt = gtk_entry_get_text(entry);
-
-               log_debug("%s", ctxt);
-
-               tw_add(ctxt);
-               refresh();
-       } else {
-               log_debug("cancel");
-       }
-
-       g_object_unref(G_OBJECT(builder));
-
-       gtk_widget_destroy(GTK_WIDGET(diag));
-
-       return FALSE;
-}
-
 static int status_changed_cbk(GtkComboBox *w, gpointer data)
 {
        log_debug("status_changed_cbk");
@@ -342,90 +208,17 @@ static int status_changed_cbk(GtkComboBox *w, gpointer data)
        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_debug("cursor_changed_cbk");
-
-       task = get_selected_task(treeview);
-
-       if (task) {
-
-               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);
-
-               gtk_entry_set_text(w_description, task->description);
-               gtk_widget_set_sensitive(GTK_WIDGET(w_description), 1);
-
-               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);
+       log_fct_enter();
 
-               gtk_widget_set_sensitive(w_tasksave_btn, 1);
-               gtk_widget_set_sensitive(w_taskdone_btn, 1);
+       ui_taskpanel_update(get_selected_task(treeview));
 
-               gtk_widget_set_sensitive(GTK_WIDGET(w_priority), 1);
-               priority = priority_to_int(task->priority);
-               gtk_combo_box_set_active(w_priority, priority);
-       } else {
-               log_debug("clear task widgets");
-               clear_task_panel();
-               log_debug("clear task widgets done");
-       }
+       log_fct_exit();
 
        return FALSE;
 }
 
-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;
-}
-
 static void log_init()
 {
        char *home, *path, *dir;
@@ -451,9 +244,7 @@ static void log_init()
 int main(int argc, char **argv)
 {
        GtkWindow *window;
-       GtkWidget *btn;
        GtkBuilder *builder;
-       GtkTreeModel *model;
        int optc, cmdok, opti;
 
        program_name = argv[0];
@@ -504,22 +295,13 @@ int main(int argc, char **argv)
                 NULL);
        window = create_window(builder, settings);
 
-       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);
+       ui_taskpanel_init(builder);
+       ui_tasktree_init(builder);
+       ui_projecttree_init(builder);
 
-       w_note = GTK_TEXT_VIEW(gtk_builder_get_object(builder, "tasknote"));
+       w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "tasktree"));
 
-       w_description = GTK_ENTRY(gtk_builder_get_object(builder,
-                                                        "taskdescription"));
-       w_project = GTK_ENTRY(gtk_builder_get_object(builder, "taskproject"));
        w_status = GTK_COMBO_BOX(gtk_builder_get_object(builder, "status"));
-       w_priority = GTK_COMBO_BOX(gtk_builder_get_object(builder,
-                                                         "taskpriority"));
 
        gtk_builder_connect_signals(builder, NULL);
 
@@ -530,16 +312,6 @@ int main(int argc, char **argv)
                         "changed", (GCallback)status_changed_cbk,
                         tasks);
 
-       btn = GTK_WIDGET(gtk_builder_get_object(builder, "tasksave"));
-       g_signal_connect(btn,
-                        "clicked", (GCallback)tasksave_clicked_cbk, tasks);
-       gtk_widget_set_sensitive(btn, 0);
-       w_tasksave_btn = btn;
-
-       w_taskdone_btn = GTK_WIDGET(gtk_builder_get_object(builder,
-                                                          "taskdone"));
-       gtk_widget_set_sensitive(w_taskdone_btn, 0);
-
        g_object_unref(G_OBJECT(builder));
 
        refresh();