refactoring

[ptask.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 4b0153e..3837be6 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -38,13 +38,8 @@
 
 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_taskdone_btn;
 static GtkComboBox *w_status;
-static GtkComboBox *w_priority;
 static GSettings *settings;
 
 enum {
@@ -137,28 +132,15 @@ void refresh()
        struct task *task;
        int i;
        GtkTreeIter iter;
-       int status;
        const char *project;
 
        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");
-       }
+       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));
@@ -319,14 +301,7 @@ int main(int argc, char **argv)
 
        w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "tasktree"));
 
-       w_note = GTK_TEXT_VIEW(gtk_builder_get_object(builder, "tasknote"));
-
-       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);
 
@@ -337,10 +312,6 @@ int main(int argc, char **argv)
                         "changed", (GCallback)status_changed_cbk,
                         tasks);
 
-       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();