removed useless var

[ptask.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 880bde4..fe98488 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -16,13 +16,15 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+#include <locale.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
 #include <sys/stat.h>
 
-#include <json/json.h>
+#include <json.h>
 
 #include <glib/gi18n.h>
 
@@ -30,6 +32,7 @@
 
 #include <log.h>
 #include <note.h>
+#include <settings.h>
 #include <tw.h>
 #include <ui.h>
 #include <ui_projecttree.h>
@@ -38,20 +41,11 @@
 
 static const char *program_name;
 static struct task **tasks;
-static GtkTreeView *w_treeview;
-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'},
+       {"force-unsupported-taskwarrior", no_argument, 0, 'f'},
        {"debug", required_argument, 0, 'd'},
        {0, 0, 0, 0}
 };
@@ -81,7 +75,8 @@ static void print_help()
               "  -v, --version       display version information and exit"));
 
        puts("");
-
+       puts(_("  -f, --force-unsupported-taskwarrior force usage of an"
+              " unsupported version of taskwarrior"));
        puts(_("  -d, --debug=LEVEL   "
               "set the debug level, integer between 0 and 3"));
 
@@ -95,24 +90,28 @@ static void print_help()
 void refresh()
 {
        GtkWidget *dialog;
-       const char *current_prj;
+       const char *current_uuid;
+       struct task **old_tasks;
 
        log_fct_enter();
        ui_taskpanel_update(NULL);
 
        if (tasks) {
-               current_prj = ui_projecttree_get_project();
-               ui_tasktree_update(NULL, NULL);
-               tw_task_list_free(tasks);
+               old_tasks = tasks;
+               current_uuid = ui_tasktree_get_task_uuid();
+               ui_tasktree_update(NULL);
        } else {
-               current_prj = NULL;
+               old_tasks = NULL;
+               current_uuid = NULL;
        }
 
        tasks = tw_get_all_tasks(ui_get_status_filter());
 
        if (tasks) {
                ui_projecttree_update(tasks);
-               ui_tasktree_update(tasks, current_prj);
+               ui_tasktree_update(tasks);
+               if (current_uuid)
+                       ui_tasktree_set_selected_task(current_uuid);
        } else {
                dialog = gtk_message_dialog_new(NULL,
                                                GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -120,22 +119,15 @@ void refresh()
                                                GTK_BUTTONS_CLOSE,
                                                _("Error loading tasks, verify "
                                                  "that a supported version of "
-                                                 "taskwarrior is installed "));
+                                                 "taskwarrior is installed."));
                gtk_dialog_run(GTK_DIALOG(dialog));
                gtk_widget_destroy(dialog);
        }
-       log_fct(__func__, "EXIT");
-}
 
-static int cursor_changed_cbk(GtkTreeView *treeview, gpointer data)
-{
-       log_fct_enter();
-
-       ui_taskpanel_update(ui_tasktree_get_selected_task());
+       if (old_tasks)
+               tw_task_list_free(old_tasks);
 
        log_fct_exit();
-
-       return FALSE;
 }
 
 static void log_init()
@@ -164,7 +156,10 @@ int main(int argc, char **argv)
 {
        GtkWindow *window;
        GtkBuilder *builder;
-       int optc, cmdok, opti;
+       int optc, cmdok, opti, ret;
+       GError *err;
+       gchar *msg;
+       GtkMessageDialog *diag;
 
        program_name = argv[0];
 
@@ -176,7 +171,7 @@ int main(int argc, char **argv)
 #endif
 
        cmdok = 1;
-       while ((optc = getopt_long(argc, argv, "vhd:", long_options,
+       while ((optc = getopt_long(argc, argv, "vhfd:", long_options,
                                   &opti)) != -1) {
                switch (optc) {
                case 'h':
@@ -189,6 +184,11 @@ int main(int argc, char **argv)
                        log_level = atoi(optarg);
                        log_info(_("Enables debug mode."));
                        break;
+               case 'f':
+                       log_info(_("Force usage of an unsupported version of "
+                                  "taskwarrior."));
+                       tw_enable_check_version(0);
+                       break;
                default:
                        cmdok = 0;
                        break;
@@ -205,26 +205,38 @@ int main(int argc, char **argv)
 
        gtk_init(NULL, NULL);
 
-       settings = g_settings_new("ptask");
+       settings_init();
 
        builder = gtk_builder_new();
-       gtk_builder_add_from_file
+       err = NULL;
+       ret = gtk_builder_add_from_file
                (builder,
                 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "ptask.glade",
-                NULL);
-       window = create_window(builder, settings);
+                &err);
 
-       ui_taskpanel_init(builder);
-       ui_tasktree_init(builder);
-       ui_projecttree_init(builder);
+       if (!ret) {
+               msg = g_strdup_printf(_("Failed to load UI: %s"),
+                                     err->message);
+               log_err(msg);
 
-       w_treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "tasktree"));
+               diag = GTK_MESSAGE_DIALOG(gtk_message_dialog_new
+                                         (NULL,
+                                          GTK_DIALOG_DESTROY_WITH_PARENT,
+                                          GTK_MESSAGE_ERROR,
+                                          GTK_BUTTONS_CLOSE,
+                                          msg,
+                                          NULL));
 
-       gtk_builder_connect_signals(builder, NULL);
+               gtk_dialog_run(GTK_DIALOG(diag));
+
+               g_free(msg);
+
+               exit(EXIT_FAILURE);
+       }
 
-       g_signal_connect(w_treeview,
-                        "cursor-changed", (GCallback)cursor_changed_cbk,
-                        tasks);
+       window = create_window(builder);
+
+       gtk_builder_connect_signals(builder, NULL);
 
        g_object_unref(G_OBJECT(builder));