LinGui: add update checking. shows a dialog similar to the macui when

[handbrake-jp/handbrake-jp-git.git] / gtk / src / main.c

diff --git a/gtk/src/main.c b/gtk/src/main.c
index d20de0e..08d7ff1 100644 (file)
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -35,6 +35,7 @@
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
+#include "hbversion.h"
 #include "renderer_button.h"
 #include "hb-backend.h"
 #include "ghb-dvd.h"
@@ -419,9 +420,10 @@ IoRedirect(signal_user_data_t *ud)
        }
        // Open activity log.
        // TODO: Put this in the same directory as the encode destination
-       config = ghb_get_user_config_dir();
+       config = ghb_get_user_config_dir(NULL);
        path = g_strdup_printf("%s/%s", config, "Activity.log");
        ud->activity_log = g_io_channel_new_file (path, "w", NULL);
+       ud->job_activity_log = NULL;
        ghb_ui_update(ud, "activity_location", ghb_string_value(path));
        g_free(path);
        g_free(config);
@@ -513,27 +515,23 @@ main (int argc, char *argv[])
        ghb_hal_init();
 #endif
 
-       ud = g_malloc(sizeof(signal_user_data_t));
+       ud = g_malloc0(sizeof(signal_user_data_t));
        ud->debug = ghb_debug;
-       ud->cancel_encode = FALSE;
        g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, debug_log_handler, ud);
        ud->settings = ghb_settings_new();
-       ud->queue = NULL;
-       ud->current_job = NULL;
-       ud->current_dvd_device = NULL;
-       ud->dont_clear_presets = FALSE;
        // Enable events that alert us to media change events
        watch_volumes (ud);
        ud->builder = create_builder_or_die (BUILDER_NAME);
        // Redirect stderr to the activity window
        IoRedirect(ud);
+       ghb_log("Handbrake Version: %s (%d)", HB_VERSION, HB_BUILD);
        ghb_init_dep_map();
 
        // Need to connect x264_options textview buffer to the changed signal
        // since it can't be done automatically
        GtkTextView *textview;
        GtkTextBuffer *buffer;
-       textview = GTK_TEXT_VIEW(GHB_WIDGET (ud->builder, "x264_options"));
+       textview = GTK_TEXT_VIEW(GHB_WIDGET (ud->builder, "x264Option"));
        buffer = gtk_text_view_get_buffer (textview);
        g_signal_connect(buffer, "changed", (GCallback)x264_entry_changed_cb, ud);
 
@@ -570,14 +568,14 @@ main (int argc, char *argv[])
        }
        gboolean tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
        GtkWidget *widget;
-       widget = GHB_WIDGET(ud->builder, "deinterlace");
+       widget = GHB_WIDGET(ud->builder, "PictureDeinterlace");
        tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-       widget = GHB_WIDGET(ud->builder, "tweak_deinterlace");
+       widget = GHB_WIDGET(ud->builder, "tweak_PictureDeinterlace");
        !tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
 
-       widget = GHB_WIDGET(ud->builder, "denoise");
+       widget = GHB_WIDGET(ud->builder, "PictureDenoise");
        tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-       widget = GHB_WIDGET(ud->builder, "tweak_denoise");
+       widget = GHB_WIDGET(ud->builder, "tweak_PictureDenoise");
        !tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
 
        gchar *source = ghb_settings_get_string(ud->settings, "default_source");
@@ -614,6 +612,7 @@ main (int argc, char *argv[])
        }
        // Reload and check status of the last saved queue
        g_idle_add((GSourceFunc)ghb_reload_queue, ud);
+       g_idle_add((GSourceFunc)ghb_check_update, ud);
        // Start timer for monitoring libhb status, 500ms
        g_timeout_add (500, ghb_timer_cb, (gpointer)ud);
        // Everything should be go-to-go.  Lets rock!