style

[ptask.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 2171895..e16b9ec 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -28,10 +28,13 @@
 
 #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;
@@ -127,27 +130,6 @@ 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);
-}
-
 void refresh()
 {
        GtkWidget *dialog;
@@ -159,8 +141,8 @@ void refresh()
        int status;
        const char *project;
 
-       log_debug("refresh");
-       clear_task_panel();
+       log_fct_enter();
+       ui_taskpanel_update(NULL);
 
        status = gtk_combo_box_get_active(w_status);
        log_debug("status: %d", status);
@@ -203,6 +185,7 @@ 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 +197,7 @@ 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)
@@ -301,90 +284,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;
@@ -412,7 +322,6 @@ int main(int argc, char **argv)
        GtkWindow *window;
        GtkWidget *btn;
        GtkBuilder *builder;
-       GtkTreeModel *model;
        int optc, cmdok, opti;
 
        program_name = argv[0];
@@ -463,13 +372,11 @@ 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_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "tasktree"));
 
        w_note = GTK_TEXT_VIEW(gtk_builder_get_object(builder, "tasknote"));