removed useless enum

[ptask.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 3837be6..b6442c9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -38,18 +38,8 @@
 
 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'},
@@ -93,80 +83,33 @@ 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;
-       const char *project;
+       const char *current_prj, *current_uuid;
+       struct task **old_tasks;
 
        log_fct_enter();
        ui_taskpanel_update(NULL);
 
-       if (tasks)
-               tw_task_list_free(tasks);
+       if (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, current_prj);
+               if (current_uuid)
+                       ui_tasktree_set_selected_task(current_uuid);
        } else {
                dialog = gtk_message_dialog_new(NULL,
                                                GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -178,45 +121,11 @@ void refresh()
                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()
@@ -299,19 +208,8 @@ int main(int argc, char **argv)
        ui_tasktree_init(builder);
        ui_projecttree_init(builder);
 
-       w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "tasktree"));
-
-       w_status = GTK_COMBO_BOX(gtk_builder_get_object(builder, "status"));
-
        gtk_builder_connect_signals(builder, NULL);
 
-       g_signal_connect(w_treeview,
-                        "cursor-changed", (GCallback)cursor_changed_cbk,
-                        tasks);
-       g_signal_connect(w_status,
-                        "changed", (GCallback)status_changed_cbk,
-                        tasks);
-
        g_object_unref(G_OBJECT(builder));
 
        refresh();