OSDN Git Service

LinGui: fix crash on empty buffer from stderr
[handbrake-jp/handbrake-jp-git.git] / gtk / src / callbacks.c
index 2fc7e39..bccc030 100644 (file)
 #endif
 
 #include <string.h>
-#include <poll.h>
 #include <fcntl.h>
 #include <sys/stat.h>
+#include <time.h>
+
+#if !defined(_WIN32)
+#include <poll.h>
 #include <libhal-storage.h>
+#include <dbus/dbus-glib.h>
+#include <dbus/dbus-glib-lowlevel.h>
+
+#include <netinet/in.h>
+#include <netdb.h>
+#include <webkit/webkit.h>
+#include <libnotify/notify.h>
+#else
+#define WINVER 0x0500
+#include <winsock2.h>
+#include <dbt.h>
+#endif
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 #include <glib/gstdio.h>
 #include "callbacks.h"
 #include "queuehandler.h"
 #include "audiohandler.h"
+#include "subtitlehandler.h"
 #include "resources.h"
 #include "settings.h"
 #include "presets.h"
+#include "preview.h"
 #include "values.h"
 #include "plist.h"
+#include "appcast.h"
 #include "hb-backend.h"
 #include "ghb-dvd.h"
 #include "ghbcellrenderertext.h"
 
 static void update_chapter_list(signal_user_data_t *ud);
 static GList* dvd_device_list();
+static void prune_logs(signal_user_data_t *ud);
+void ghb_notify_done(signal_user_data_t *ud);
+gpointer ghb_check_update(signal_user_data_t *ud);
+static gboolean ghb_can_shutdown_gpm();
+static void ghb_shutdown_gpm();
+static gboolean ghb_can_suspend_gpm();
+static void ghb_suspend_gpm();
+static gboolean appcast_busy = FALSE;
 
 // This is a dependency map used for greying widgets
 // that are dependent on the state of another widget.
@@ -59,7 +86,7 @@ ghb_init_dep_map()
 }
 
 static gboolean
-dep_check(signal_user_data_t *ud, const gchar *name)
+dep_check(signal_user_data_t *ud, const gchar *name, gboolean *out_hide)
 {
        GtkWidget *widget;
        GObject *dep_object;
@@ -71,8 +98,10 @@ dep_check(signal_user_data_t *ud, const gchar *name)
        
        g_debug("dep_check () %s", name);
 
+       if (rev_map == NULL) return TRUE;
        array = ghb_dict_lookup(rev_map, name);
        count = ghb_array_len(array);
+       *out_hide = FALSE;
        for (ii = 0; ii < count; ii++)
        {
                data = ghb_array_get_nth(array, ii);
@@ -80,6 +109,8 @@ dep_check(signal_user_data_t *ud, const gchar *name)
                widget = GHB_WIDGET(ud->builder, widget_name);
                dep_object = gtk_builder_get_object(ud->builder, name);
                g_free(widget_name);
+               if (!GTK_WIDGET_SENSITIVE(widget))
+                       continue;
                if (dep_object == NULL)
                {
                        g_message("Failed to find widget");
@@ -90,9 +121,10 @@ dep_check(signal_user_data_t *ud, const gchar *name)
                        gint jj = 0;
                        gchar **values;
                        gboolean sensitive = FALSE;
-                       gboolean die;
+                       gboolean die, hide;
 
                        die = ghb_value_boolean(ghb_array_get_nth(data, 2));
+                       hide = ghb_value_boolean(ghb_array_get_nth(data, 3));
                        value = ghb_value_string(ghb_array_get_nth(data, 1));
                        values = g_strsplit(value, "|", 10);
                        g_free(value);
@@ -131,7 +163,11 @@ dep_check(signal_user_data_t *ud, const gchar *name)
                                jj++;
                        }
                        sensitive = die ^ sensitive;
-                       if (!sensitive) result = FALSE;
+                       if (!sensitive)
+                       {
+                               result = FALSE;
+                               *out_hide |= hide;
+                       }
                        g_strfreev (values);
                        g_free(value);
                }
@@ -156,11 +192,13 @@ ghb_check_dependency(signal_user_data_t *ud, GtkWidget *widget)
        name = gtk_widget_get_name(widget);
        g_debug("ghb_check_dependency () %s", name);
 
+       if (dep_map == NULL) return;
        array = ghb_dict_lookup(dep_map, name);
        count = ghb_array_len(array);
        for (ii = 0; ii < count; ii++)
        {
                gboolean sensitive;
+               gboolean hide;
 
                data = ghb_array_get_nth(array, ii);
                dep_name = ghb_value_string(data);
@@ -171,12 +209,25 @@ ghb_check_dependency(signal_user_data_t *ud, GtkWidget *widget)
                        g_free(dep_name);
                        continue;
                }
-               sensitive = dep_check(ud, dep_name);
+               sensitive = dep_check(ud, dep_name, &hide);
                g_free(dep_name);
                if (GTK_IS_ACTION(dep_object))
+               {
                        gtk_action_set_sensitive(GTK_ACTION(dep_object), sensitive);
+                       gtk_action_set_visible(GTK_ACTION(dep_object), sensitive || !hide);
+               }
                else
+               {
                        gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
+                       if (!sensitive && hide)
+                       {
+                               gtk_widget_hide(GTK_WIDGET(dep_object));
+                       }
+                       else
+                       {
+                               gtk_widget_show_now(GTK_WIDGET(dep_object));
+                       }
+               }
        }
 }
 
@@ -189,6 +240,7 @@ ghb_check_all_depencencies(signal_user_data_t *ud)
        GObject *dep_object;
 
        g_debug("ghb_check_all_depencencies ()");
+       if (rev_map == NULL) return;
        ghb_dict_iter_init(&iter, rev_map);
        // middle (void*) cast prevents gcc warning "defreferencing type-punned
        // pointer will break strict-aliasing rules"
@@ -196,134 +248,61 @@ ghb_check_all_depencencies(signal_user_data_t *ud)
                        &iter, (gpointer*)(void*)&dep_name, (gpointer*)(void*)&value))
        {
                gboolean sensitive;
+               gboolean hide;
+
                dep_object = gtk_builder_get_object (ud->builder, dep_name);
                if (dep_object == NULL)
                {
                        g_message("Failed to find dependent widget %s", dep_name);
                        continue;
                }
-               sensitive = dep_check(ud, dep_name);
+               sensitive = dep_check(ud, dep_name, &hide);
                if (GTK_IS_ACTION(dep_object))
-                       gtk_action_set_sensitive(GTK_ACTION(dep_object), sensitive);
-               else
-                       gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
-       }
-}
-
-void
-ghb_clear_presets_selection(signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreeSelection *selection;
-       
-       if (ud->dont_clear_presets) return;
-       g_debug("ghb_clear_presets_selection()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       gtk_tree_selection_unselect_all (selection);
-       ghb_settings_set_boolean(ud->settings, "preset_modified", TRUE);
-}
-
-static gchar*
-expand_tilde(const gchar *path)
-{
-       const gchar *user_home;
-       gchar *home;
-       const gchar *suffix;
-       gchar *expanded_path = NULL;
-       
-       g_debug("expand_tilde ()");
-       if (path[0] == '~')
-       {
-               user_home = g_get_home_dir();
-               home = NULL; // squash warning about home uninitialized
-               if (path[1] == 0)
-               {
-                       home = g_strdup(user_home);
-                       suffix = "";
-               }
-               else if (path[1] == '/')
                {
-                       home = g_strdup(user_home);
-                       suffix = &path[2];
+                       gtk_action_set_sensitive(GTK_ACTION(dep_object), sensitive);
+                       gtk_action_set_visible(GTK_ACTION(dep_object), sensitive || !hide);
                }
                else
                {
-                       home = g_path_get_dirname(user_home);
-                       suffix = &path[1];
+                       gtk_widget_set_sensitive(GTK_WIDGET(dep_object), sensitive);
+                       if (!sensitive && hide)
+                       {
+                               gtk_widget_hide(GTK_WIDGET(dep_object));
+                       }
+                       else
+                       {
+                               gtk_widget_show_now(GTK_WIDGET(dep_object));
+                       }
                }
-               expanded_path = g_strdup_printf("%s/%s", home, suffix);
-               g_free(home);
        }
-       return expanded_path;
 }
 
-void
+G_MODULE_EXPORT void
 on_quit1_activate(GtkMenuItem *quit, signal_user_data_t *ud)
 {
        gint state = ghb_get_queue_state();
        g_debug("on_quit1_activate ()");
        if (state & GHB_STATE_WORKING)
-       {
+       {
                if (ghb_cancel_encode("Closing HandBrake will terminate encoding.\n"))
                {
                        ghb_hb_cleanup(FALSE);
+                       prune_logs(ud);
                        gtk_main_quit();
                        return;
                }
                return;
        }
        ghb_hb_cleanup(FALSE);
+       prune_logs(ud);
        gtk_main_quit();
 }
 
-static void
-set_destination(signal_user_data_t *ud)
-{
-       g_debug("set_destination");
-       if (ghb_settings_get_boolean(ud->settings, "use_source_name"))
-       {
-               gchar *vol_name, *filename, *extension;
-               gchar *dir, *new_name;
-               
-               filename = ghb_settings_get_string(ud->settings, "destination");
-               extension = ghb_settings_get_string(ud->settings, "container");
-               dir = g_path_get_dirname (filename);
-               vol_name = ghb_settings_get_string(ud->settings, "volume_label");
-               if (ghb_settings_get_boolean(ud->settings, "chapters_in_destination"))
-               {
-                       gint start, end;
-
-                       start = ghb_settings_get_int(ud->settings, "start_chapter");
-                       end = ghb_settings_get_int(ud->settings, "end_chapter");
-                       if (start == end)
-                       {
-                               new_name = g_strdup_printf("%s/%s-%d.%s", 
-                                       dir, vol_name, start, extension);
-                       }
-                       else
-                       {
-                               new_name = g_strdup_printf("%s/%s-%d-%d.%s", 
-                                       dir, vol_name, start, end, extension);
-                       }
-               }
-               else
-               {
-                       new_name = g_strdup_printf("%s/%s.%s", dir, vol_name, extension);
-               }
-               ghb_ui_update(ud, "destination", ghb_string_value(new_name));
-               g_free(filename);
-               g_free(extension);
-               g_free(vol_name);
-               g_free(dir);
-               g_free(new_name);
-       }
-}
-
 gboolean
-uppers_and_unders(const gchar *str)
+uppers_and_unders(gchar *str)
 {
        if (str == NULL) return FALSE;
+       str = g_strchomp(g_strchug(str));
        while (*str)
        {
                if (*str == ' ')
@@ -376,29 +355,353 @@ camel_convert(gchar *str)
        }
 }
 
+#if defined(_WIN32)
+static gchar*
+get_dvd_device_name(gchar *device)
+{
+       return g_strdup(device);
+}
+#else
+static gchar*
+get_dvd_device_name(GDrive *gd)
+{
+       return g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+}
+#endif
+
+static GHashTable *volname_hash = NULL;
+static GMutex     *volname_mutex = NULL;
+
+static void
+free_volname_key(gpointer data)
+{
+       if (data != NULL)
+               g_free(data);
+}
+
+static void
+free_volname_value(gpointer data)
+{
+       if (data != NULL)
+               g_free(data);
+}
+
+#if defined(_WIN32)
+static gchar*
+get_direct_dvd_volume_name(const gchar *drive)
+{
+       gchar *result = NULL;
+       gchar vname[51], fsname[51];
+
+       if (GetVolumeInformation(drive, vname, 50, NULL, NULL, NULL, fsname, 51))
+       {
+               result = g_strdup_printf("%s", vname);
+       }
+       return result;
+}
+#else
+static gchar*
+get_direct_dvd_volume_name(const gchar *drive)
+{
+       gchar *result;
+
+       result = ghb_dvd_volname (drive);
+       return result;
+}
+#endif
+
+static gchar*
+get_dvd_volume_name(gpointer gd)
+{
+       gchar *label = NULL;
+       gchar *result;
+       gchar *drive;
+
+       drive = get_dvd_device_name(gd);
+       g_mutex_lock(volname_mutex);
+       label = g_strdup(g_hash_table_lookup(volname_hash, drive));
+       g_mutex_unlock(volname_mutex);
+       if (label != NULL)
+       {
+               if (uppers_and_unders(label))
+               {
+                       camel_convert(label);
+               }
+#if defined(_WIN32)
+               result = g_strdup_printf("%s (%s)", label, drive);
+#else
+               result = g_strdup_printf("%s - %s", drive, label);
+#endif
+               g_free(label);
+       }
+       else
+       {
+               result = g_strdup_printf("%s", drive);
+       }
+       g_free(drive);
+       return result;
+}
+
+void
+ghb_volname_cache_init(void)
+{
+       volname_mutex = g_mutex_new();
+       volname_hash = g_hash_table_new_full(g_str_hash, g_str_equal,
+                                                                               free_volname_key, free_volname_value);
+}
+
+static void
+free_drive(gpointer drive)
+{
+#if defined(_WIN32)
+               g_free(drive);
+#else
+               g_object_unref(drive);
+#endif
+}
+
+gpointer
+ghb_cache_volnames(signal_user_data_t *ud)
+{
+       GList *link, *drives;
+
+       g_debug("ghb_cache_volnames()");
+       link = drives = dvd_device_list();
+       if (drives == NULL)
+               return NULL;
+
+       g_mutex_lock(volname_mutex);
+       g_hash_table_remove_all(volname_hash);
+       while (link != NULL)
+       {
+               gchar *name, *drive;
+
+#if !defined(_WIN32)
+               if (!g_drive_has_media (link->data))
+               {
+                       g_object_unref(link->data);
+                       link = link->next;
+                       continue;
+               }
+#endif
+               drive = get_dvd_device_name(link->data);
+               name = get_direct_dvd_volume_name(drive);
+
+               if (drive != NULL && name != NULL)
+               {
+                       g_hash_table_insert(volname_hash, drive, name);
+               }
+               else
+               {
+                       if (drive != NULL)
+                               g_free(drive);
+                       if (name != NULL)
+                               g_free(name);
+               }
+       
+               free_drive(link->data);
+               link = link->next;
+       }
+       g_mutex_unlock(volname_mutex);
+
+       g_list_free(drives);
+
+       g_idle_add((GSourceFunc)ghb_file_menu_add_dvd, ud);
+
+       return NULL;
+}
+
+static const gchar*
+get_extension(signal_user_data_t *ud)
+{
+       int container;
+       const gchar *extension = "error";
+       GValue *audio_list;
+
+       container = ghb_settings_combo_int(ud->settings, "FileFormat");
+       if (container == HB_MUX_MP4)
+       {
+               extension = "mp4";
+               audio_list = ghb_settings_get_value(ud->settings, "audio_list");
+               if (ghb_ac3_in_audio_list (audio_list))
+               {
+                       extension = "m4v";
+               }
+               else if (ghb_settings_get_boolean(ud->settings, "ChapterMarkers"))
+               {
+                       extension = "m4v";
+               }
+               else if (ghb_settings_get_boolean(ud->settings, "UseM4v"))
+               {
+                       extension = "m4v";
+               }
+       }
+       else if (container == HB_MUX_MKV)
+       {
+               extension = "mkv";
+       }
+       return extension;
+}
+
+static void
+set_destination(signal_user_data_t *ud)
+{
+       g_debug("set_destination");
+       if (ghb_settings_get_boolean(ud->settings, "use_source_name"))
+       {
+               GString *str = g_string_new("");
+               gchar *vol_name, *filename;
+               const gchar *extension;
+               gchar *new_name;
+               gint title;
+               
+               filename = ghb_settings_get_string(ud->settings, "dest_file");
+               extension = get_extension(ud);
+               vol_name = ghb_settings_get_string(ud->settings, "volume_label");
+               g_string_append_printf(str, "%s", vol_name);
+               title = ghb_settings_combo_int(ud->settings, "title");
+               if (title >= 0)
+               {
+                       if (ghb_settings_get_boolean(
+                                       ud->settings, "title_no_in_destination"))
+                       {
+
+                               title = ghb_settings_combo_int(ud->settings, "title");
+                               g_string_append_printf(str, " - %d", title+1);
+                       }
+                       if (ghb_settings_get_boolean(
+                                       ud->settings, "chapters_in_destination"))
+                       {
+                               gint start, end;
+
+                               if (!ghb_settings_get_boolean(
+                                               ud->settings, "title_no_in_destination"))
+                               {
+                                       g_string_append_printf(str, " -");
+                               }
+                               start = ghb_settings_get_int(ud->settings, "start_chapter");
+                               end = ghb_settings_get_int(ud->settings, "end_chapter");
+                               if (start == end)
+                                       g_string_append_printf(str, " Ch %d", start);
+                               else
+                                       g_string_append_printf(str, " Ch %d-%d", start, end);
+                       }
+               }
+               g_string_append_printf(str, ".%s", extension);
+               new_name = g_string_free(str, FALSE);
+               ghb_ui_update(ud, "dest_file", ghb_string_value(new_name));
+               g_free(filename);
+               g_free(vol_name);
+               g_free(new_name);
+       }
+}
+
+static gchar*
+get_file_label(const gchar *filename)
+{
+       static gchar *containers[] = 
+               {".vob", ".mpg", ".m2ts", ".mkv", ".mp4", ".m4v", ".avi", ".ogm", NULL};
+       gchar *base;
+       gint ii;
+
+       base = g_path_get_basename(filename);
+       for (ii = 0; containers[ii] != NULL; ii++)
+       {
+               if (g_str_has_suffix(base, containers[ii]))
+               {
+                       gchar *pos;
+                       pos = strrchr(base, '.');
+                       *pos = 0;
+                       break;
+               }
+       }
+       return base;
+}
+
+static gchar*
+resolve_drive_name(gchar *filename)
+{
+#if defined(_WIN32)
+       if (filename[1] == ':')
+       {
+               gchar drive[4];
+               gchar *name;
+               gint dtype;
+
+               g_strlcpy(drive, filename, 4);
+               dtype = GetDriveType(drive);
+               if (dtype == DRIVE_CDROM)
+               {
+                       gchar vname[51], fsname[51];
+                       GetVolumeInformation(drive, vname, 50, NULL, 
+                                                               NULL, NULL, fsname, 50);
+                       name = g_strdup(vname);
+                       return name;
+               }
+       }
+       return NULL;
+#else
+       return NULL;
+#endif
+}
+
 static gboolean
 update_source_label(signal_user_data_t *ud, const gchar *source)
 {
        gchar *label = NULL;
        gint len;
        gchar **path;
+       gchar *start;
        gchar *filename = g_strdup(source);
        
        len = strlen(filename);
-       if (filename[len-1] == '/') filename[len-1] = 0;
+       if (filename[len-1] == G_DIR_SEPARATOR) filename[len-1] = 0;
        if (g_file_test(filename, G_FILE_TEST_IS_DIR))
        {
-               path = g_strsplit(filename, "/", -1);
-               len = g_strv_length (path);
-               if ((len > 1) && (strcmp("VIDEO_TS", path[len-1]) == 0))
+               // Skip dos drive letters
+               start = strchr(filename, ':');
+               label = resolve_drive_name(filename);
+               if (label != NULL)
                {
-                       label = g_strdup(path[len-2]);
+                       if (uppers_and_unders(label))
+                       {
+                               camel_convert(label);
+                       }
                }
                else
                {
-                       label = g_strdup(path[len-1]);
+                       if (start != NULL)
+                               start++;
+                       else
+                               start = filename;
+                       
+                       path = g_strsplit(start, G_DIR_SEPARATOR_S, -1);
+                       len = g_strv_length (path);
+                       if ((len > 1) && (strcmp("VIDEO_TS", path[len-1]) == 0))
+                       {
+                               label = g_strdup(path[len-2]);
+                               if (uppers_and_unders(label))
+                               {
+                                       camel_convert(label);
+                               }
+                       }
+                       else if (len > 0)
+                       {
+                               if (path[len-1][0] != 0)
+                               {
+                                       label = g_strdup(path[len-1]);
+                                       if (uppers_and_unders(label))
+                                       {
+                                               camel_convert(label);
+                                       }
+                               }
+                               else
+                                       label = g_strdup("new_video");
+                       }
+                       else
+                               label = g_strdup("new_video");
+                       g_strfreev (path);
                }
-               g_strfreev (path);
        }
        else
        {
@@ -407,11 +710,7 @@ update_source_label(signal_user_data_t *ud, const gchar *source)
                label = ghb_dvd_volname (filename);
                if (label == NULL)
                {
-                       path = g_strsplit(filename, "/", -1);
-                       len = g_strv_length (path);
-                       // Just use the last combonent of the path
-                       label = g_strdup(path[len-1]);
-                       g_strfreev (path);
+                       label = get_file_label(filename);
                }
                else
                {
@@ -440,18 +739,18 @@ update_source_label(signal_user_data_t *ud, const gchar *source)
        return TRUE;
 }
 
-static GtkWidget *dvd_device_combo = NULL;
-
-void
-chooser_file_selected_cb(GtkFileChooser *dialog, GtkComboBox *combo)
+G_MODULE_EXPORT void
+chooser_file_selected_cb(GtkFileChooser *dialog, signal_user_data_t *ud)
 {
-       const gchar *name = gtk_file_chooser_get_filename (dialog);
+       gchar *name = gtk_file_chooser_get_filename (dialog);
        GtkTreeModel *store;
        GtkTreeIter iter;
        const gchar *device;
        gboolean foundit = FALSE;
+       GtkComboBox *combo;
        
        if (name == NULL) return;
+       combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, "source_device"));
        store = gtk_combo_box_get_model(combo);
        if (gtk_tree_model_get_iter_first(store, &iter))
        {
@@ -469,31 +768,47 @@ chooser_file_selected_cb(GtkFileChooser *dialog, GtkComboBox *combo)
                gtk_combo_box_set_active_iter (combo, &iter);
        else
                gtk_combo_box_set_active (combo, 0);
+
+       g_free(name);
 }
 
-void
-dvd_device_changed_cb(GtkComboBox *combo, GtkWidget *dialog)
+G_MODULE_EXPORT void
+dvd_device_changed_cb(GtkComboBox *combo, signal_user_data_t *ud)
 {
-       gint ii = gtk_combo_box_get_active (combo);
-       if (ii != 0)
+       GtkWidget *dialog;
+       gint ii;
+
+       ii = gtk_combo_box_get_active (combo);
+       if (ii > 0)
        {
-               const gchar *device = gtk_combo_box_get_active_text (combo);
-               const gchar *name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(dialog));
+               const gchar *device;
+               gchar *name;
+
+               dialog = GHB_WIDGET(ud->builder, "source_dialog");
+               device = gtk_combo_box_get_active_text (combo);
+               name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(dialog));
                if (name == NULL || strcmp(name, device) != 0)
                        gtk_file_chooser_select_filename (GTK_FILE_CHOOSER(dialog), device);
+               if (name != NULL)
+                       g_free(name);
        }
 }
 
-void
-source_type_changed_cb(GtkToggleButton *toggle, GtkFileChooser *chooser)
+G_MODULE_EXPORT void
+source_type_changed_cb(GtkToggleButton *toggle, signal_user_data_t *ud)
 {
        gchar *folder;
+       GtkFileChooser *chooser;
+       GtkWidget *dvd_device_combo;
        
        g_debug("source_type_changed_cb ()");
+       chooser = GTK_FILE_CHOOSER(GHB_WIDGET(ud->builder, "source_dialog"));
+       dvd_device_combo = GHB_WIDGET(ud->builder, "source_device");
        folder = gtk_file_chooser_get_current_folder (chooser);
        if (gtk_toggle_button_get_active (toggle))
        {
-               gtk_file_chooser_set_action (chooser, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+               gtk_file_chooser_set_action (chooser, 
+                                                                       GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
                gtk_widget_set_sensitive (dvd_device_combo, FALSE);
                gtk_combo_box_set_active (GTK_COMBO_BOX(dvd_device_combo), 0);
        }
@@ -509,72 +824,97 @@ source_type_changed_cb(GtkToggleButton *toggle, GtkFileChooser *chooser)
        }
 }
 
-static GtkWidget*
-source_dialog_extra_widgets(GtkWidget *dialog, gboolean checkbutton_active)
+static void
+source_dialog_extra_widgets(
+       signal_user_data_t *ud,
+       GtkWidget *dialog, 
+       gboolean checkbutton_active)
 {
-       GtkBox *vbox;
-       GtkWidget *checkbutton;
-       
-       vbox = GTK_BOX(gtk_vbox_new (FALSE, 2));
-       checkbutton = gtk_check_button_new_with_label ("Open VIDEO_TS folder");
-       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(checkbutton), checkbutton_active);
-       gtk_box_pack_start (vbox, checkbutton, FALSE, FALSE, 1);
-       gtk_widget_show(checkbutton);
-
-       GtkWidget *combo;
-       GtkBox *hbox;
+       GtkToggleButton *checkbutton;
+       GtkComboBox *combo;
        GList *drives, *link;
-       GtkWidget *label, *blank;
+       
+       checkbutton = GTK_TOGGLE_BUTTON(
+               GHB_WIDGET(ud->builder, "source_folder_flag"));
+       gtk_toggle_button_set_active(checkbutton, checkbutton_active);
+       combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, "source_device"));
+       gtk_list_store_clear(GTK_LIST_STORE(
+                                               gtk_combo_box_get_model(combo)));
 
-       hbox = GTK_BOX(gtk_hbox_new (FALSE, 2));
-       combo = gtk_combo_box_new_text();
-       label = gtk_label_new("Detected DVD devices:");
-       blank = gtk_label_new("");
        link = drives = dvd_device_list();
-       gtk_combo_box_append_text (GTK_COMBO_BOX(combo), "Not Selected");
+       gtk_combo_box_append_text (combo, "Not Selected");
        while (link != NULL)
        {
-               gchar *name = (gchar*)link->data;
-               gtk_combo_box_append_text (GTK_COMBO_BOX(combo), name);
+               gchar *name = get_dvd_device_name(link->data);
+               gtk_combo_box_append_text(combo, name);
                g_free(name);
+               free_drive(link->data);
                link = link->next;
        }
        g_list_free(drives);
-       gtk_combo_box_set_active (GTK_COMBO_BOX(combo), 0);
-       gtk_box_pack_start (vbox, GTK_WIDGET(hbox), FALSE, FALSE, 1);
-       gtk_widget_show(GTK_WIDGET(hbox));
-       gtk_box_pack_start (hbox, label, FALSE, FALSE, 1);
-       gtk_widget_show(label);
-       gtk_box_pack_start (hbox, combo, FALSE, FALSE, 2);
-       gtk_widget_show(combo);
-       gtk_box_pack_start (hbox, blank, TRUE, TRUE, 1);
-       gtk_widget_show(blank);
-       // Ugly hackish global alert
-       dvd_device_combo = combo;
-       g_signal_connect(combo, "changed", (GCallback)dvd_device_changed_cb, dialog);
-       g_signal_connect(dialog, "selection-changed", (GCallback)chooser_file_selected_cb, combo);
-
-       g_signal_connect(checkbutton, "toggled", (GCallback)source_type_changed_cb, dialog);
-       return GTK_WIDGET(vbox);
 }
 
-static void
-do_scan(signal_user_data_t *ud, const gchar *filename)
+extern GValue *ghb_queue_edit_settings;
+static gchar *last_scan_file = NULL;
+
+static void 
+show_scan_progress(signal_user_data_t *ud)
+{
+       GtkProgressBar *progress;
+       GtkLabel *label;
+
+       progress = GTK_PROGRESS_BAR(GHB_WIDGET(ud->builder, "scan_prog"));
+       gtk_progress_bar_set_fraction (progress, 0);
+       gtk_widget_show(GTK_WIDGET(progress));
+
+       label = GTK_LABEL(GHB_WIDGET(ud->builder, "source_title"));
+       gtk_label_set_text( label, "Scanning ..." );
+}
+
+void
+ghb_do_scan(
+       signal_user_data_t *ud, 
+       const gchar *filename, 
+       gint titlenum, 
+       gboolean force)
 {
+       if (!force && last_scan_file != NULL &&
+               strcmp(last_scan_file, filename) == 0)
+       {
+               if (ghb_queue_edit_settings)
+               {
+                       gint jstatus;
+
+                       jstatus = ghb_settings_get_int(ghb_queue_edit_settings, "job_status");
+                       ghb_settings_to_ui(ud, ghb_queue_edit_settings);
+                       ghb_set_audio(ud, ghb_queue_edit_settings);
+                       ghb_reset_subtitles(ud, ghb_queue_edit_settings);
+                       if (jstatus == GHB_QUEUE_PENDING)
+                       {
+                               ghb_value_free(ghb_queue_edit_settings);
+                       }
+                       ghb_queue_edit_settings = NULL;
+               }
+               return;
+       }
+       if (last_scan_file != NULL)
+               g_free(last_scan_file);
+       last_scan_file = NULL;
        if (filename != NULL)
        {
+               last_scan_file = g_strdup(filename);
                ghb_settings_set_string(ud->settings, "source", filename);
                if (update_source_label(ud, filename))
                {
-                       GtkProgressBar *progress;
-                       progress = GTK_PROGRESS_BAR(GHB_WIDGET(ud->builder, "progressbar"));
                        gchar *path;
+                       gint preview_count;
+
+                       show_scan_progress(ud);
                        path = ghb_settings_get_string( ud->settings, "source");
-                       gtk_progress_bar_set_fraction (progress, 0);
-                       gtk_progress_bar_set_text (progress, "Scanning ...");
-                       ghb_hb_cleanup(TRUE);
-                       ghb_backend_scan (path, 0);
+                       prune_logs(ud);
+
+                       preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+                       ghb_backend_scan(path, titlenum, preview_count);
                        g_free(path);
                }
                else
@@ -584,11 +924,24 @@ do_scan(signal_user_data_t *ud, const gchar *filename)
        }
 }
 
-void
-source_button_clicked_cb(GtkButton *button, signal_user_data_t *ud)
+static gboolean 
+update_source_name(gpointer data)
+{
+       signal_user_data_t *ud = (signal_user_data_t*)data;
+       GtkWidget *dialog;
+       gchar *sourcename;
+
+       sourcename = ghb_settings_get_string(ud->settings, "source");
+       dialog = GHB_WIDGET(ud->builder, "source_dialog");
+       gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), sourcename);
+       g_free(sourcename);
+       return FALSE;
+}
+
+static void
+do_source_dialog(GtkButton *button, gboolean single, signal_user_data_t *ud)
 {
        GtkWidget *dialog;
-       GtkWidget *widget;
        gchar *sourcename;
        gint    response;
        GtkFileChooserAction action;
@@ -606,28 +959,40 @@ source_button_clicked_cb(GtkButton *button, signal_user_data_t *ud)
        {
                action = GTK_FILE_CHOOSER_ACTION_OPEN;
        }
-       dialog = gtk_file_chooser_dialog_new ("Select Source",
-                                                               NULL,
-                                                               action,
-                                                               GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                                               GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-                                                               NULL);
-       widget = source_dialog_extra_widgets(dialog, checkbutton_active);
-       gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(dialog), widget);
-       gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), sourcename);
+       GtkWidget *widget;
+       widget = GHB_WIDGET(ud->builder, "single_title_box");
+       if (single)
+               gtk_widget_show(widget);
+       else
+               gtk_widget_hide(widget);
+       dialog = GHB_WIDGET(ud->builder, "source_dialog");
+       source_dialog_extra_widgets(ud, dialog, checkbutton_active);
+       gtk_file_chooser_set_action(GTK_FILE_CHOOSER(dialog), action);
+       // Updating the filename in the file chooser dialog doesn't seem
+       // to work unless the dialog is running for some reason.
+       // So handle it in an "idle" event.
+       //gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog), sourcename);
+       g_idle_add((GSourceFunc)update_source_name, ud);
        response = gtk_dialog_run(GTK_DIALOG (dialog));
        gtk_widget_hide(dialog);
        if (response == GTK_RESPONSE_ACCEPT)
        {
-               char *filename;
+               gchar *filename;
 
                filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
                if (filename != NULL)
                {
-                       do_scan(ud, filename);
+                       gint titlenum;
+
+                       if (single)
+                               titlenum = ghb_settings_get_int(ud->settings, "single_title");
+                       else
+                               titlenum = 0;
+                       ghb_do_scan(ud, filename, titlenum, TRUE);
                        if (strcmp(sourcename, filename) != 0)
                        {
-                               ghb_settings_set_string (ud->settings, "default_source", filename);
+                               ghb_settings_set_string (ud->settings, 
+                                                                               "default_source", filename);
                                ghb_pref_save (ud->settings, "default_source");
                                ghb_dvd_set_current (filename, ud);
                        }
@@ -635,10 +1000,21 @@ source_button_clicked_cb(GtkButton *button, signal_user_data_t *ud)
                }
        }
        g_free(sourcename);
-       gtk_widget_destroy(dialog);
 }
 
-void
+G_MODULE_EXPORT void
+source_button_clicked_cb(GtkButton *button, signal_user_data_t *ud)
+{
+       do_source_dialog(button, FALSE, ud);
+}
+
+G_MODULE_EXPORT void
+single_title_source_cb(GtkButton *button, signal_user_data_t *ud)
+{
+       do_source_dialog(button, TRUE, ud);
+}
+
+G_MODULE_EXPORT void
 dvd_source_activate_cb(GtkAction *action, signal_user_data_t *ud)
 {
        const gchar *filename;
@@ -646,7 +1022,7 @@ dvd_source_activate_cb(GtkAction *action, signal_user_data_t *ud)
 
        sourcename = ghb_settings_get_string(ud->settings, "source");
        filename = gtk_action_get_name(action);
-       do_scan(ud, filename);
+       ghb_do_scan(ud, filename, 0, TRUE);
        if (strcmp(sourcename, filename) != 0)
        {
                ghb_settings_set_string (ud->settings, "default_source", filename);
@@ -656,18 +1032,25 @@ dvd_source_activate_cb(GtkAction *action, signal_user_data_t *ud)
        g_free(sourcename);
 }
 
-static void
-update_destination_extension(signal_user_data_t *ud)
+void
+ghb_update_destination_extension(signal_user_data_t *ud)
 {
-       static gchar *containers[] = {".mkv", ".mp4", ".m4v", ".avi", ".ogm", NULL};
+       static gchar *containers[] = {".mkv", ".mp4", ".m4v", NULL};
        gchar *filename;
-       gchar *extension;
+       const gchar *extension;
        gint ii;
        GtkEntry *entry;
+       static gboolean busy = FALSE;
 
-       g_debug("update_destination_extension ()");
-       extension = ghb_settings_get_string(ud->settings, "container");
-       entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "destination"));
+       g_debug("ghb_update_destination_extension ()");
+       // Since this function modifies the thing that triggers it's
+       // invocation, check to see if busy to prevent accidental infinite
+       // recursion.
+       if (busy)
+               return;
+       busy = TRUE;
+       extension = get_extension(ud);
+       entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "dest_file"));
        filename = g_strdup(gtk_entry_get_text(entry));
        for (ii = 0; containers[ii] != NULL; ii++)
        {
@@ -689,13 +1072,13 @@ update_destination_extension(signal_user_data_t *ud)
                                break;
                        }
                        new_name = g_strjoin(".", filename, extension, NULL); 
-                       ghb_ui_update(ud, "destination", ghb_string_value(new_name));
+                       ghb_ui_update(ud, "dest_file", ghb_string_value(new_name));
                        g_free(new_name);
                        break;
                }
        }
-       g_free(extension);
        g_free(filename);
+       busy = FALSE;
 }
 
 static void
@@ -714,19 +1097,20 @@ destination_select_title(GtkEntry *entry)
        }
        for (start = end; start >= 0; start--)
        {
-               if (dest[start] == '/')
+               if (dest[start] == G_DIR_SEPARATOR)
                {
                        start++;
                        break;
                }
        }
+       if (start < 0) start = 0;
        if (start < end)
        {
                gtk_editable_select_region(GTK_EDITABLE(entry), start, end);
        }
 }
 
-gboolean
+G_MODULE_EXPORT gboolean
 destination_grab_cb(
        GtkEntry *entry, 
        signal_user_data_t *ud)
@@ -737,25 +1121,44 @@ destination_grab_cb(
 
 static gboolean update_default_destination = FALSE;
 
-void
-destination_entry_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
+G_MODULE_EXPORT void
+dest_dir_set_cb(GtkFileChooserButton *dest_chooser, signal_user_data_t *ud)
 {
-       gchar *dest;
+       gchar *dest_file, *dest_dir, *dest;
        
-       g_debug("destination_entry_changed_cb ()");
-       if ((dest = expand_tilde(gtk_entry_get_text(entry))) != NULL)
-       {
-               gtk_entry_set_text(entry, dest);
-               g_free(dest);
-       }
-       update_destination_extension(ud);
+       g_debug("dest_dir_set_cb ()");
+       ghb_widget_to_setting(ud->settings, (GtkWidget*)dest_chooser);
+       dest_file = ghb_settings_get_string(ud->settings, "dest_file");
+       dest_dir = ghb_settings_get_string(ud->settings, "dest_dir");
+       dest = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", dest_dir, dest_file);
+       ghb_settings_set_string(ud->settings, "destination", dest);
+       g_free(dest_file);
+       g_free(dest_dir);
+       g_free(dest);
+       update_default_destination = TRUE;
+}
+
+G_MODULE_EXPORT void
+dest_file_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
+{
+       gchar *dest_file, *dest_dir, *dest;
+       
+       g_debug("dest_file_changed_cb ()");
+       ghb_update_destination_extension(ud);
        ghb_widget_to_setting(ud->settings, (GtkWidget*)entry);
        // This signal goes off with ever keystroke, so I'm putting this
        // update on the timer.
+       dest_file = ghb_settings_get_string(ud->settings, "dest_file");
+       dest_dir = ghb_settings_get_string(ud->settings, "dest_dir");
+       dest = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", dest_dir, dest_file);
+       ghb_settings_set_string(ud->settings, "destination", dest);
+       g_free(dest_file);
+       g_free(dest_dir);
+       g_free(dest);
        update_default_destination = TRUE;
 }
 
-void
+G_MODULE_EXPORT void
 destination_browse_clicked_cb(GtkButton *button, signal_user_data_t *ud)
 {
        GtkWidget *dialog;
@@ -778,33 +1181,34 @@ destination_browse_clicked_cb(GtkButton *button, signal_user_data_t *ud)
        g_free(basename);
        if (gtk_dialog_run(GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
        {
-               char *filename;
+               char *filename, *dirname;
+               GtkFileChooser *dest_chooser;
                
                filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-               entry = (GtkEntry*)GHB_WIDGET(ud->builder, "destination");
-               if (entry == NULL)
-               {
-                       g_debug("Failed to find widget: %s", "destination");
-               }
-               else
-               {
-                       gtk_entry_set_text(entry, filename);
-               }
+               basename = g_path_get_basename(filename);
+               dirname = g_path_get_dirname(filename);
+               entry = (GtkEntry*)GHB_WIDGET(ud->builder, "dest_file");
+               gtk_entry_set_text(entry, basename);
+               dest_chooser = GTK_FILE_CHOOSER(GHB_WIDGET(ud->builder, "dest_dir"));
+               gtk_file_chooser_set_filename(dest_chooser, dirname);
+               g_free (dirname);
+               g_free (basename);
                g_free (filename);
        }
        gtk_widget_destroy(dialog);
 }
 
-gboolean
+G_MODULE_EXPORT gboolean
 window_destroy_event_cb(GtkWidget *widget, GdkEvent *event, signal_user_data_t *ud)
 {
        g_debug("window_destroy_event_cb ()");
        ghb_hb_cleanup(FALSE);
+       prune_logs(ud);
        gtk_main_quit();
        return FALSE;
 }
 
-gboolean
+G_MODULE_EXPORT gboolean
 window_delete_event_cb(GtkWidget *widget, GdkEvent *event, signal_user_data_t *ud)
 {
        gint state = ghb_get_queue_state();
@@ -814,12 +1218,14 @@ window_delete_event_cb(GtkWidget *widget, GdkEvent *event, signal_user_data_t *u
                if (ghb_cancel_encode("Closing HandBrake will terminate encoding.\n"))
                {
                        ghb_hb_cleanup(FALSE);
+                       prune_logs(ud);
                        gtk_main_quit();
                        return FALSE;
                }
                return TRUE;
        }
        ghb_hb_cleanup(FALSE);
+       prune_logs(ud);
        gtk_main_quit();
        return FALSE;
 }
@@ -830,29 +1236,17 @@ update_acodec_combo(signal_user_data_t *ud)
        ghb_grey_combo_options (ud->builder);
 }
 
-void
+G_MODULE_EXPORT void
 container_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       const GValue *audio_list;
        g_debug("container_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
-       update_destination_extension(ud);
        ghb_check_dependency(ud, widget);
        update_acodec_combo(ud);
+       ghb_update_destination_extension(ud);
        ghb_clear_presets_selection(ud);
-
-       audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-       if (ghb_ac3_in_audio_list (audio_list))
-       {
-               gchar *container;
-
-               container = ghb_settings_get_string(ud->settings, "container");
-               if (strcmp(container, "mp4") == 0)
-               {
-                       ghb_ui_update(ud, "container", ghb_string_value("m4v"));
-               }
-               g_free(container);
-       }
+       ghb_live_reset(ud);
+       ghb_subtitle_prune(ud);
 }
 
 static gchar*
@@ -887,6 +1281,7 @@ show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
        GtkWidget *widget;
        gchar *text;
 
+       ud->dont_clear_presets = TRUE;
        widget = GHB_WIDGET (ud->builder, "title_duration");
        if (tinfo->duration != 0)
        {
@@ -918,10 +1313,11 @@ show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
        ghb_ui_update(ud, "scale_width", 
                ghb_int64_value(tinfo->width - tinfo->crop[2] - tinfo->crop[3]));
        // If anamorphic or keep_aspect, the hight will be automatically calculated
-       gboolean keep_aspect, anamorphic;
-       keep_aspect = ghb_settings_get_boolean(ud->settings, "keep_aspect");
-       anamorphic = ghb_settings_get_boolean(ud->settings, "anamorphic");
-       if (!(keep_aspect || anamorphic))
+       gboolean keep_aspect;
+       gint pic_par;
+       keep_aspect = ghb_settings_get_boolean(ud->settings, "PictureKeepRatio");
+       pic_par = ghb_settings_combo_int(ud->settings, "PicturePAR");
+       if (!(keep_aspect || pic_par) || pic_par == 3)
        {
                ghb_ui_update(ud, "scale_height", 
                        ghb_int64_value(tinfo->height - tinfo->crop[0] - tinfo->crop[1]));
@@ -931,97 +1327,65 @@ show_title_info(signal_user_data_t *ud, ghb_title_info_t *tinfo)
        // you pass it a cropped width or height == 0.
        gint bound;
        bound = tinfo->height / 2 - 2;
-       widget = GHB_WIDGET (ud->builder, "crop_top");
+       widget = GHB_WIDGET (ud->builder, "PictureTopCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       widget = GHB_WIDGET (ud->builder, "crop_bottom");
+       widget = GHB_WIDGET (ud->builder, "PictureBottomCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
        bound = tinfo->width / 2 - 2;
-       widget = GHB_WIDGET (ud->builder, "crop_left");
+       widget = GHB_WIDGET (ud->builder, "PictureLeftCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       widget = GHB_WIDGET (ud->builder, "crop_right");
+       widget = GHB_WIDGET (ud->builder, "PictureRightCrop");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       if (ghb_settings_get_boolean(ud->settings, "autocrop"))
+       if (ghb_settings_get_boolean(ud->settings, "PictureAutoCrop"))
        {
-               ghb_ui_update(ud, "crop_top", ghb_int64_value(tinfo->crop[0]));
-               ghb_ui_update(ud, "crop_bottom", ghb_int64_value(tinfo->crop[1]));
-               ghb_ui_update(ud, "crop_left", ghb_int64_value(tinfo->crop[2]));
-               ghb_ui_update(ud, "crop_right", ghb_int64_value(tinfo->crop[3]));
+               ghb_ui_update(ud, "PictureTopCrop", ghb_int64_value(tinfo->crop[0]));
+               ghb_ui_update(ud, "PictureBottomCrop", ghb_int64_value(tinfo->crop[1]));
+               ghb_ui_update(ud, "PictureLeftCrop", ghb_int64_value(tinfo->crop[2]));
+               ghb_ui_update(ud, "PictureRightCrop", ghb_int64_value(tinfo->crop[3]));
        }
+       ghb_set_scale (ud, GHB_PIC_KEEP_PAR);
+       gint width, height, crop[4];
+       crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+       crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+       crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+       crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
+       width = tinfo->width - crop[2] - crop[3];
+       height = tinfo->height - crop[0] - crop[1];
+       widget = GHB_WIDGET (ud->builder, "crop_dimensions");
+       text = g_strdup_printf ("%d x %d", width, height);
+       gtk_label_set_text (GTK_LABEL(widget), text);
+       g_free(text);
+
        g_debug("setting max end chapter %d", tinfo->num_chapters);
        widget = GHB_WIDGET (ud->builder, "end_chapter");
        gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->num_chapters);
        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), tinfo->num_chapters);
        widget = GHB_WIDGET (ud->builder, "start_chapter");
        gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
+       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->num_chapters);
+
+       widget = GHB_WIDGET (ud->builder, "angle");
+       gtk_spin_button_set_value (GTK_SPIN_BUTTON(widget), 1);
+       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 1, tinfo->angle_count);
+       ud->dont_clear_presets = FALSE;
 }
 
-static gint preview_button_width;
-static gint preview_button_height;
 static gboolean update_preview = FALSE;
 
-static void
-set_preview_image(signal_user_data_t *ud)
-{
-       GtkWidget *widget;
-       gint preview_width, preview_height, target_height, width, height;
-
-       g_debug("set_preview_button_image ()");
-       gint titleindex;
-
-       titleindex = ghb_settings_combo_int(ud->settings, "title");
-       if (titleindex < 0) return;
-       widget = GHB_WIDGET (ud->builder, "preview_frame");
-       gint frame = ghb_widget_int(widget) - 1;
-       GdkPixbuf *preview = ghb_get_preview_image (titleindex, frame, ud->settings, TRUE);
-       if (preview == NULL) return;
-       widget = GHB_WIDGET (ud->builder, "preview_image");
-       gtk_image_set_from_pixbuf(GTK_IMAGE(widget), preview);
-
-       preview_width = gdk_pixbuf_get_width(preview);
-       preview_height = gdk_pixbuf_get_height(preview);
-       gchar *text = g_strdup_printf("%d x %d", preview_width, preview_height);
-       widget = GHB_WIDGET (ud->builder, "preview_dims");
-       gtk_label_set_text(GTK_LABEL(widget), text);
-       g_free(text);
-       
-       g_debug("preview %d x %d", preview_width, preview_height);
-       target_height = MIN(preview_button_height - 12, 128);
-       height = target_height;
-       width = preview_width * height / preview_height;
-
-       if ((height >= 16) && (width >= 16))
-       {
-               GdkPixbuf *scaled_preview;
-               scaled_preview = gdk_pixbuf_scale_simple (preview, width, height, GDK_INTERP_NEAREST);
-               if (scaled_preview != NULL)
-               {
-                       g_object_unref (preview);
-                       
-                       widget = GHB_WIDGET (ud->builder, "preview_button_image");
-                       gtk_image_set_from_pixbuf(GTK_IMAGE(widget), scaled_preview);
-                       g_object_unref (scaled_preview);
-               }
-       }
-}
-
-void
+G_MODULE_EXPORT void
 title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        ghb_title_info_t tinfo;
        gint titleindex;
-       gchar *preset;
        
        g_debug("title_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
        ghb_check_dependency(ud, widget);
 
        titleindex = ghb_settings_combo_int(ud->settings, "title");
-       ghb_update_ui_combo_box (ud->builder, "audio_track", titleindex, FALSE);
-       ghb_update_ui_combo_box (ud->builder, "subtitle_lang", titleindex, FALSE);
+       ghb_update_ui_combo_box (ud, "AudioTrack", titleindex, FALSE);
+       ghb_update_ui_combo_box (ud, "SubtitleTrack", titleindex, FALSE);
 
-       preset = ghb_settings_get_string (ud->settings, "preset");
-       ghb_update_from_preset(ud, preset, "subtitle_lang");
-       g_free(preset);
        if (ghb_get_title_info (&tinfo, titleindex))
        {
                show_title_info(ud, &tinfo);
@@ -1029,123 +1393,123 @@ title_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        update_chapter_list (ud);
        ghb_adjust_audio_rate_combos(ud);
        ghb_set_pref_audio(titleindex, ud);
+       ghb_set_pref_subtitle(titleindex, ud);
        if (ghb_settings_get_boolean(ud->settings, "vquality_type_target"))
        {
                gint bitrate = ghb_calculate_target_bitrate (ud->settings, titleindex);
-               ghb_ui_update(ud, "video_bitrate", ghb_int64_value(bitrate));
+               ghb_ui_update(ud, "VideoAvgBitrate", ghb_int64_value(bitrate));
        }
 
        // Unfortunately, there is no way to query how many frames were
-       // actually generated during the scan.  It attempts to make 10.
+       // actually generated during the scan.
        // If I knew how many were generated, I would adjust the spin
        // control range here.
-       ghb_ui_update(ud, "preview_frame", ghb_int64_value(1));
-
-       set_preview_image (ud);
+       // I do know how many were asked for.
+       gint preview_count;
+       preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+       widget = GHB_WIDGET(ud->builder, "preview_frame");
+       gtk_range_set_range (GTK_RANGE(widget), 1, preview_count);
+       ghb_ui_update(ud, "preview_frame", ghb_int64_value(2));
+
+       ghb_set_preview_image (ud);
+       if (ghb_settings_get_boolean(ud->settings, "title_no_in_destination"))
+       {
+               set_destination(ud);
+       }
 }
 
-void
+G_MODULE_EXPORT void
 setting_widget_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        ghb_widget_to_setting(ud->settings, widget);
        ghb_check_dependency(ud, widget);
        ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
 }
 
-static void
-validate_filter_widget(signal_user_data_t *ud, const gchar *name)
+G_MODULE_EXPORT void
+chapter_markers_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       const gchar *str;
-       gboolean foundit = FALSE;
-       GtkComboBox *combo = GTK_COMBO_BOX(GHB_WIDGET(ud->builder, name));
-       if (gtk_combo_box_get_active(combo) < 0)
-       { // Validate user input
-               gchar *val = ghb_settings_get_string(ud->settings, name);
-               store = gtk_combo_box_get_model(combo);
-               // Check to see if user manually entered one of the combo options
-               if (gtk_tree_model_get_iter_first(store, &iter))
-               {
-                       do
-                       {
-                               gtk_tree_model_get(store, &iter, 0, &str, -1);
-                               if (strcasecmp(val, str) == 0)
-                               {
-                                       gtk_combo_box_set_active_iter(combo, &iter);
-                                       foundit = TRUE;
-                                       break;
-                               }
-                       } while (gtk_tree_model_iter_next(store, &iter));
-               }
-               if (!foundit)
-               { // validate format of filter string
-                       if (!ghb_validate_filter_string(val, -1))
-                               gtk_combo_box_set_active(combo, 0);
-               }
-               g_free(val);
-       }
+       ghb_widget_to_setting(ud->settings, widget);
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
+       ghb_update_destination_extension(ud);
 }
 
-gboolean
-deint_tweak_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
-       signal_user_data_t *ud)
+G_MODULE_EXPORT void
+vquality_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       g_debug("deint_tweak_focus_out_cb ()");
-       validate_filter_widget(ud, "tweak_deinterlace");
-       return FALSE;
-}
+       ghb_widget_to_setting(ud->settings, widget);
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
 
-gboolean
-denoise_tweak_focus_out_cb(GtkWidget *widget, GdkEventFocus *event, 
-       signal_user_data_t *ud)
-{
-       g_debug("denoise_tweak_focus_out_cb ()");
-       validate_filter_widget(ud, "tweak_noise");
-       return FALSE;
+       gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+       gdouble step;
+       if (vcodec == HB_VCODEC_X264)
+       {
+               step = ghb_settings_combo_double(ud->settings, 
+                                                                                       "VideoQualityGranularity");
+       }
+       else
+       {
+               step = 1;
+       }
+       gdouble val = gtk_range_get_value(GTK_RANGE(widget));
+       val = ((int)((val + step / 2) / step)) * step;
+       gtk_range_set_value(GTK_RANGE(widget), val);
 }
 
-void
+G_MODULE_EXPORT void
 http_opt_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        ghb_widget_to_setting(ud->settings, widget);
        ghb_check_dependency(ud, widget);
        ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
        // AC3 is not allowed when Web optimized
        ghb_grey_combo_options (ud->builder);
 }
 
-void
+G_MODULE_EXPORT void
 vcodec_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       gint vqmin, vqmax;
+       gdouble vqmin, vqmax, step, page;
+       gboolean inverted;
+       gint digits;
 
        ghb_widget_to_setting(ud->settings, widget);
        ghb_check_dependency(ud, widget);
        ghb_clear_presets_selection(ud);
-       ghb_vquality_range(ud, &vqmin, &vqmax);
-       GtkWidget *qp = GHB_WIDGET(ud->builder, "video_quality");
+       ghb_live_reset(ud);
+       ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits, &inverted);
+       GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
        gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
+       gtk_range_set_increments (GTK_RANGE(qp), step, page);
+       gtk_scale_set_digits(GTK_SCALE(qp), digits);
+       gtk_range_set_inverted (GTK_RANGE(qp), inverted);
 }
 
-void
+G_MODULE_EXPORT void
 target_size_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        const gchar *name = gtk_widget_get_name(widget);
-       g_debug("setting_widget_changed_cb () %s", name);
+       g_debug("target_size_changed_cb () %s", name);
        ghb_widget_to_setting(ud->settings, widget);
        ghb_check_dependency(ud, widget);
        ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
        if (ghb_settings_get_boolean(ud->settings, "vquality_type_target"))
        {
                gint titleindex;
                titleindex = ghb_settings_combo_int(ud->settings, "title");
                gint bitrate = ghb_calculate_target_bitrate (ud->settings, titleindex);
-               ghb_ui_update(ud, "video_bitrate", ghb_int64_value(bitrate));
+               ghb_ui_update(ud, "VideoAvgBitrate", ghb_int64_value(bitrate));
        }
 }
 
-void
+G_MODULE_EXPORT void
 start_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        gint start, end;
@@ -1162,9 +1526,20 @@ start_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        {
                set_destination(ud);
        }
+       widget = GHB_WIDGET (ud->builder, "chapters_tab");
+       // End may have been changed above, get it again
+       end = ghb_settings_get_int(ud->settings, "end_chapter");
+       if (start == end)
+       {
+               gtk_widget_hide(widget);
+       }
+       else
+       {
+               gtk_widget_show(widget);
+       }
 }
 
-void
+G_MODULE_EXPORT void
 end_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        gint start, end;
@@ -1181,15 +1556,28 @@ end_chapter_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        {
                set_destination(ud);
        }
+       widget = GHB_WIDGET (ud->builder, "chapters_tab");
+       // Start may have been changed above, get it again
+       start = ghb_settings_get_int(ud->settings, "start_chapter");
+       if (start == end)
+       {
+               gtk_widget_hide(widget);
+       }
+       else
+       {
+               gtk_widget_show(widget);
+       }
 }
 
-void
+G_MODULE_EXPORT void
 scale_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("scale_width_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
        ghb_check_dependency(ud, widget);
-       ghb_set_scale (ud, GHB_SCALE_KEEP_WIDTH);
+       ghb_clear_presets_selection(ud);
+       if (GTK_WIDGET_SENSITIVE(widget))
+               ghb_set_scale (ud, GHB_PIC_KEEP_WIDTH);
        update_preview = TRUE;
        gchar *text;
        gint width = ghb_settings_get_int(ud->settings, "scale_width");
@@ -1198,15 +1586,18 @@ scale_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        text = g_strdup_printf ("%d x %d", width, height);
        gtk_label_set_text (GTK_LABEL(widget), text);
        g_free(text);
+       ghb_live_reset(ud);
 }
 
-void
+G_MODULE_EXPORT void
 scale_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("scale_height_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
        ghb_check_dependency(ud, widget);
-       ghb_set_scale (ud, GHB_SCALE_KEEP_HEIGHT);
+       ghb_clear_presets_selection(ud);
+       if (GTK_WIDGET_SENSITIVE(widget))
+               ghb_set_scale (ud, GHB_PIC_KEEP_HEIGHT);
        update_preview = TRUE;
        gchar *text;
        gint width = ghb_settings_get_int(ud->settings, "scale_width");
@@ -1215,9 +1606,10 @@ scale_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        text = g_strdup_printf ("%d x %d", width, height);
        gtk_label_set_text (GTK_LABEL(widget), text);
        g_free(text);
+       ghb_live_reset(ud);
 }
 
-void
+G_MODULE_EXPORT void
 crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        gint titleindex, crop[4];
@@ -1226,12 +1618,14 @@ crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        g_debug("crop_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
        ghb_check_dependency(ud, widget);
-       ghb_set_scale (ud, GHB_SCALE_KEEP_NONE);
+       ghb_clear_presets_selection(ud);
+       if (GTK_WIDGET_SENSITIVE(widget))
+               ghb_set_scale (ud, 0);
 
-       crop[0] = ghb_settings_get_int(ud->settings, "crop_top");
-       crop[1] = ghb_settings_get_int(ud->settings, "crop_bottom");
-       crop[2] = ghb_settings_get_int(ud->settings, "crop_left");
-       crop[3] = ghb_settings_get_int(ud->settings, "crop_right");
+       crop[0] = ghb_settings_get_int(ud->settings, "PictureTopCrop");
+       crop[1] = ghb_settings_get_int(ud->settings, "PictureBottomCrop");
+       crop[2] = ghb_settings_get_int(ud->settings, "PictureLeftCrop");
+       crop[3] = ghb_settings_get_int(ud->settings, "PictureRightCrop");
        titleindex = ghb_settings_combo_int(ud->settings, "title");
        if (ghb_get_title_info (&tinfo, titleindex))
        {
@@ -1243,6 +1637,8 @@ crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
                widget = GHB_WIDGET (ud->builder, "crop_dimensions");
                text = g_strdup_printf ("%d x %d", width, height);
                gtk_label_set_text (GTK_LABEL(widget), text);
+               widget = GHB_WIDGET (ud->builder, "crop_dimensions2");
+               gtk_label_set_text (GTK_LABEL(widget), text);
                g_free(text);
        }
        gchar *text;
@@ -1251,32 +1647,106 @@ crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        gtk_label_set_text (GTK_LABEL(widget), text);
        g_free(text);
        update_preview = TRUE;
+       ghb_live_reset(ud);
 }
 
-void
+G_MODULE_EXPORT void
+display_width_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+       g_debug("display_width_changed_cb ()");
+       ghb_widget_to_setting(ud->settings, widget);
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
+       if (GTK_WIDGET_SENSITIVE(widget))
+               ghb_set_scale (ud, GHB_PIC_KEEP_DISPLAY_WIDTH);
+
+       update_preview = TRUE;
+}
+
+G_MODULE_EXPORT void
+display_height_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+       g_debug("display_height_changed_cb ()");
+       ghb_widget_to_setting(ud->settings, widget);
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
+       if (GTK_WIDGET_SENSITIVE(widget))
+               ghb_set_scale (ud, GHB_PIC_KEEP_DISPLAY_HEIGHT);
+
+       update_preview = TRUE;
+}
+
+G_MODULE_EXPORT void
+par_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+       g_debug("par_changed_cb ()");
+       ghb_widget_to_setting(ud->settings, widget);
+       ghb_check_dependency(ud, widget);
+       ghb_clear_presets_selection(ud);
+       ghb_live_reset(ud);
+       if (GTK_WIDGET_SENSITIVE(widget))
+               ghb_set_scale (ud, GHB_PIC_KEEP_PAR);
+
+       update_preview = TRUE;
+}
+
+G_MODULE_EXPORT void
 scale_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("scale_changed_cb ()");
        ghb_widget_to_setting(ud->settings, widget);
        ghb_check_dependency(ud, widget);
        ghb_clear_presets_selection(ud);
-       ghb_set_scale (ud, GHB_SCALE_KEEP_NONE);
+       ghb_live_reset(ud);
+       if (GTK_WIDGET_SENSITIVE(widget))
+               ghb_set_scale (ud, 0);
        update_preview = TRUE;
        
        gchar *text;
        
-       text = ghb_settings_get_boolean(ud->settings, "autocrop") ? "On" : "Off";
+       text = ghb_settings_get_boolean(ud->settings, "PictureAutoCrop") ? "On" : "Off";
        widget = GHB_WIDGET (ud->builder, "crop_auto");
        gtk_label_set_text (GTK_LABEL(widget), text);
        text = ghb_settings_get_boolean(ud->settings, "autoscale") ? "On" : "Off";
        widget = GHB_WIDGET (ud->builder, "scale_auto");
        gtk_label_set_text (GTK_LABEL(widget), text);
-       text = ghb_settings_get_boolean(ud->settings, "anamorphic") ? "On" : "Off";
+       switch (ghb_settings_combo_int(ud->settings, "PicturePAR"))
+       {
+               case 0:
+                       text = "Off";
+                       break;
+               case 1:
+                       text = "Strict";
+                       break;
+               case 2:
+                       text = "Loose";
+                       break;
+               case 3:
+                       text = "Custom";
+                       break;
+               default:
+                       text = "Unknown";
+                       break;
+       }
        widget = GHB_WIDGET (ud->builder, "scale_anamorphic");
        gtk_label_set_text (GTK_LABEL(widget), text);
 }
 
-void
+G_MODULE_EXPORT void
+show_crop_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+       g_debug("show_crop_changed_cb ()");
+       ghb_widget_to_setting(ud->settings, widget);
+       ghb_check_dependency(ud, widget);
+       ghb_live_reset(ud);
+       if (GTK_WIDGET_SENSITIVE(widget))
+               ghb_set_scale (ud, 0);
+       update_preview = TRUE;
+}
+
+G_MODULE_EXPORT void
 generic_entry_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
 {
        // Normally (due to user input) I only want to process the entry
@@ -1293,328 +1763,107 @@ generic_entry_changed_cb(GtkEntry *entry, signal_user_data_t *ud)
        }
 }
 
-void
-ghb_presets_list_update(signal_user_data_t *ud)
+G_MODULE_EXPORT void
+prefs_dialog_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-       GtkTreeView *treeview;
-       GtkTreeIter iter;
-       GtkListStore *store;
-       gboolean done;
-       GList *presets, *plink;
-       gchar *preset, *def_preset;
-       gchar *description;
-       gint flags, custom, def;
-       
-       g_debug("ghb_presets_list_update ()");
-       def_preset = ghb_settings_get_string(ud->settings, "default_preset");
-       plink = presets = ghb_presets_get_names();
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-       store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-       if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(store), &iter))
+       GtkWidget *dialog;
+       GtkResponseType response;
+
+       g_debug("prefs_dialog_cb ()");
+       dialog = GHB_WIDGET(ud->builder, "prefs_dialog");
+       response = gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_hide(dialog);
+}
+
+typedef struct
+{
+       GtkMessageDialog *dlg;
+       const gchar *msg;
+       const gchar *action;
+       gint timeout;
+} countdown_t;
+
+static gboolean
+shutdown_cb(countdown_t *cd)
+{
+       gchar *str;
+
+       cd->timeout--;
+       if (cd->timeout == 0)
        {
-               do
-               {
-                       if (plink)
-                       {
-                               // Update row with settings data
-                               g_debug("Updating row");
-                               preset = (gchar*)plink->data;
-                               def = 0;
-                               if (strcmp(preset, def_preset) == 0)
-                                       def = PRESET_DEFAULT;
-                               
-                               description = ghb_presets_get_description(preset);
-                               flags = ghb_preset_flags(preset);
-                               custom = flags & PRESET_CUSTOM;
-                               gtk_list_store_set(store, &iter, 
-                                                       0, preset, 
-                                                       1, def ? 800 : 400, 
-                                                       2, def ? 2 : 0,
-                                                       3, custom ? "black" : "blue", 
-                                                       4, description,
-                                                       -1);
-                               plink = plink->next;
-                               g_free(description);
-                               done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
-                       }
-                       else
-                       {
-                               // No more settings data, remove row
-                               g_debug("Removing row");
-                               done = !gtk_list_store_remove(store, &iter);
-                       }
-               } while (!done);
+               ghb_shutdown_gpm();
+               gtk_main_quit();
+               return FALSE;
        }
-       while (plink)
-       {
-               // Additional settings, add row
-               g_debug("Adding rows");
-               preset = (gchar*)plink->data;
-               def = 0;
-               if (strcmp(preset, def_preset) == 0)
-                       def = PRESET_DEFAULT;
+       str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
+                                                       cd->msg, cd->action, cd->timeout);
+       gtk_message_dialog_set_markup(cd->dlg, str);
+       g_free(str);
+       return TRUE;
+}
 
-               description = ghb_presets_get_description(preset);
-               gtk_list_store_append(store, &iter);
-               flags = ghb_preset_flags(preset);
-               custom = flags & PRESET_CUSTOM;
-               gtk_list_store_set(store, &iter, 0, preset, 
-                                                       1, def ? 800 : 400, 
-                                                       2, def ? 2 : 0,
-                                                       3, custom ? "black" : "blue", 
-                                                       4, description,
-                                                       -1);
-               plink = plink->next;
-               g_free(description);
+static gboolean
+suspend_cb(countdown_t *cd)
+{
+       gchar *str;
+
+       cd->timeout--;
+       if (cd->timeout == 0)
+       {
+               gtk_widget_destroy (GTK_WIDGET(cd->dlg));
+               ghb_suspend_gpm();
+               return FALSE;
        }
-       g_free(def_preset);
-       g_list_free (presets);
+       str = g_strdup_printf("%s\n\n%s in %d seconds ...", 
+                                                       cd->msg, cd->action, cd->timeout);
+       gtk_message_dialog_set_markup(cd->dlg, str);
+       g_free(str);
+       return TRUE;
 }
 
 void
-ghb_select_preset(GtkBuilder *builder, const gchar *preset)
-{
-       GtkTreeView *treeview;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gchar *tpreset;
-       gboolean done;
-       gboolean foundit = FALSE;
-       
-       g_debug("select_preset()");
-       if (preset == NULL) return;
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(builder, "presets_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       store = gtk_tree_view_get_model (treeview);
-       if (gtk_tree_model_get_iter_first(store, &iter))
-       {
-               do
-               {
-                       gtk_tree_model_get(store, &iter, 0, &tpreset, -1);
-                       if (strcmp(preset, tpreset) == 0)
-                       {
-                               gtk_tree_selection_select_iter (selection, &iter);
-                               foundit = TRUE;
-                               g_free(tpreset);
-                               break;
-                       }
-                       g_free(tpreset);
-                       done = !gtk_tree_model_iter_next(store, &iter);
-               } while (!done);
-       }
-       if (!foundit)
-       {
-               gtk_tree_model_get_iter_first(store, &iter);
-               gtk_tree_selection_select_iter (selection, &iter);
-       }
-}
-
-static void
-update_audio_presets(signal_user_data_t *ud)
-{
-       g_debug("update_audio_presets");
-       const GValue *audio_list;
-
-       audio_list = ghb_settings_get_value(ud->settings, "audio_list");
-       ghb_settings_set_value(ud->settings, "pref_audio_list", audio_list);
-}
-
-void
-presets_save_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+ghb_countdown_dialog(
+       GtkMessageType type, 
+       const gchar *message, 
+       const gchar *action, 
+       const gchar *cancel, 
+       GSourceFunc action_func,
+       gint timeout)
 {
        GtkWidget *dialog;
-       GtkEntry *entry;
-       GtkTextView *desc;
-       GtkResponseType response;
-       gchar *preset;
-
-       g_debug("presets_save_clicked_cb ()");
-       preset = ghb_settings_get_string (ud->settings, "preset");
-       // Clear the description
-       desc = GTK_TEXT_VIEW(GHB_WIDGET(ud->builder, "preset_description"));
-       dialog = GHB_WIDGET(ud->builder, "preset_save_dialog");
-       entry = GTK_ENTRY(GHB_WIDGET(ud->builder, "preset_name"));
-       gtk_entry_set_text(entry, preset);
-       g_free(preset);
-       response = gtk_dialog_run(GTK_DIALOG(dialog));
-       gtk_widget_hide(dialog);
-       if (response == GTK_RESPONSE_OK)
-       {
-               // save the preset
-               const gchar *name = gtk_entry_get_text(entry);
-               g_debug("description to settings");
-               ghb_widget_to_setting(ud->settings, GTK_WIDGET(desc));
-               // Construct the audio settings presets from the current audio list
-               update_audio_presets(ud);
-               ghb_settings_save(ud, name);
-               ghb_presets_list_update(ud);
-               // Make the new preset the selected item
-               ghb_select_preset(ud->builder, name);
-       }
-}
-
-void
-presets_restore_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       g_debug("presets_restore_clicked_cb ()");
-       // Reload only the standard presets
-       ghb_presets_reload(ud);
-       ghb_presets_list_update(ud);
-       // Updating the presets list shuffles things around
-       // need to make sure the proper preset is selected
-       gchar *preset = ghb_settings_get_string (ud->settings, "preset");
-       ghb_select_preset(ud->builder, preset);
-       g_free(preset);
-}
-
-void
-presets_remove_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gchar *preset;
        GtkResponseType response;
+       guint timeout_id;
+       countdown_t cd;
+                       
+       cd.msg = message;
+       cd.action = action;
+       cd.timeout = timeout;
 
-       g_debug("presets_remove_clicked_cb ()");
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-       selection = gtk_tree_view_get_selection (treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               GtkWidget *dialog;
-
-               gtk_tree_model_get(store, &iter, 0, &preset, -1);
-               dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
-                                                               GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
-                                                               "Confirm deletion of preset %s.", preset);
-               response = gtk_dialog_run(GTK_DIALOG(dialog));
-               gtk_widget_destroy (dialog);
-               if (response == GTK_RESPONSE_YES)
-               {
-                       GtkTreeIter nextIter = iter;
-                       gchar *nextPreset = NULL;
-                       if (!gtk_tree_model_iter_next(store, &nextIter))
-                       {
-                               if (gtk_tree_model_get_iter_first(store, &nextIter))
-                               {
-                                       gtk_tree_model_get(store, &nextIter, 0, &nextPreset, -1);
-                               }
-                       }
-                       else
-                       {
-                               gtk_tree_model_get(store, &nextIter, 0, &nextPreset, -1);
-                       }
-                       // Remove the selected item
-                       // First unselect it so that selecting the new item works properly
-                       gtk_tree_selection_unselect_iter (selection, &iter);
-                       ghb_presets_remove(preset);
-                       ghb_presets_list_update(ud);
-                       ghb_select_preset(ud->builder, nextPreset);
-               }
-       }
-}
-
-static void
-preset_update_title_deps(signal_user_data_t *ud, ghb_title_info_t *tinfo)
-{
-       GtkWidget *widget;
-
-       ghb_ui_update(ud, "scale_width", 
-                       ghb_int64_value(tinfo->width - tinfo->crop[2] - tinfo->crop[3]));
-       // If anamorphic or keep_aspect, the hight will be automatically calculated
-       gboolean keep_aspect, anamorphic;
-       keep_aspect = ghb_settings_get_boolean(ud->settings, "keep_aspect");
-       anamorphic = ghb_settings_get_boolean(ud->settings, "anamorphic");
-       if (!(keep_aspect || anamorphic))
-       {
-               ghb_ui_update(ud, "scale_height", 
-                       ghb_int64_value(tinfo->height - tinfo->crop[0] - tinfo->crop[1]));
-       }
+       // Toss up a warning dialog
+       dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+                                                       type, GTK_BUTTONS_NONE,
+                                                       "%s\n\n%s in %d seconds ...", 
+                                                       message, action, timeout);
+       gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+                                                  cancel, GTK_RESPONSE_CANCEL,
+                                                  NULL);
 
-       // Set the limits of cropping.  hb_set_anamorphic_size crashes if
-       // you pass it a cropped width or height == 0.
-       gint bound;
-       bound = tinfo->height / 2 - 2;
-       widget = GHB_WIDGET (ud->builder, "crop_top");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       widget = GHB_WIDGET (ud->builder, "crop_bottom");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       bound = tinfo->width / 2 - 2;
-       widget = GHB_WIDGET (ud->builder, "crop_left");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       widget = GHB_WIDGET (ud->builder, "crop_right");
-       gtk_spin_button_set_range (GTK_SPIN_BUTTON(widget), 0, bound);
-       if (ghb_settings_get_boolean(ud->settings, "autocrop"))
+       cd.dlg = GTK_MESSAGE_DIALOG(dialog);
+       timeout_id = g_timeout_add(1000, action_func, &cd);
+       response = gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_destroy (dialog);
+       if (response == GTK_RESPONSE_CANCEL)
        {
-               ghb_ui_update(ud, "crop_top", ghb_int64_value(tinfo->crop[0]));
-               ghb_ui_update(ud, "crop_bottom", ghb_int64_value(tinfo->crop[1]));
-               ghb_ui_update(ud, "crop_left", ghb_int64_value(tinfo->crop[2]));
-               ghb_ui_update(ud, "crop_right", ghb_int64_value(tinfo->crop[3]));
-       }
-}
-
-void
-presets_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
-{
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       gchar *preset;
-       ghb_title_info_t tinfo;
-       GtkWidget *widget;
-       
-       g_debug("presets_list_selection_changed_cb ()");
-       widget = GHB_WIDGET (ud->builder, "presets_remove");
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               gtk_tree_model_get(store, &iter, 0, &preset, -1);
-               ud->dont_clear_presets = TRUE;
-               // Temporarily set the video_quality range to (0,100)
-               // This is needed so the video_quality value does not get
-               // truncated when set.  The range will be readjusted below
-               GtkWidget *qp = GHB_WIDGET(ud->builder, "video_quality");
-               gtk_range_set_range (GTK_RANGE(qp), 0, 100);
-               // Clear the audio list prior to changing the preset.  Existing audio
-               // can cause the container extension to be automatically changed when
-               // it shouldn't be
-               ghb_clear_audio_list(ud);
-               ghb_set_preset(ud, preset);
-               gint titleindex;
-               titleindex = ghb_settings_combo_int(ud->settings, "title");
-               ghb_set_pref_audio(titleindex, ud);
-               ghb_settings_set_boolean(ud->settings, "preset_modified", FALSE);
-               ud->dont_clear_presets = FALSE;
-               if (ghb_get_title_info (&tinfo, titleindex))
-               {
-                       preset_update_title_deps(ud, &tinfo);
-               }
-               ghb_set_scale (ud, GHB_SCALE_KEEP_NONE);
+               GMainContext *mc;
+               GSource *source;
 
-               gint vqmin, vqmax;
-               ghb_vquality_range(ud, &vqmin, &vqmax);
-               gtk_range_set_range (GTK_RANGE(qp), vqmin, vqmax);
-               gtk_widget_set_sensitive(widget, TRUE);
-       }
-       else
-       {
-               g_debug("No selection???  Perhaps unselected.");
-               gtk_widget_set_sensitive(widget, FALSE);
+               mc = g_main_context_default();
+               source = g_main_context_find_source_by_id(mc, timeout_id);
+               if (source != NULL)
+                       g_source_destroy(source);
        }
 }
 
-void
-prefs_dialog_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       GtkWidget *dialog;
-       GtkResponseType response;
-
-       g_debug("prefs_dialog_cb ()");
-       dialog = GHB_WIDGET(ud->builder, "prefs_dialog");
-       response = gtk_dialog_run(GTK_DIALOG(dialog));
-       gtk_widget_hide(dialog);
-}
-
 gboolean
 ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, const gchar *yes)
 {
@@ -1624,7 +1873,7 @@ ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, c
        // Toss up a warning dialog
        dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
                                                        type, GTK_BUTTONS_NONE,
-                                                       message);
+                                                       "%s", message);
        gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
                                                   no, GTK_RESPONSE_NO,
                                                   yes, GTK_RESPONSE_YES, NULL);
@@ -1637,6 +1886,22 @@ ghb_message_dialog(GtkMessageType type, const gchar *message, const gchar *no, c
        return TRUE;
 }
 
+void
+ghb_error_dialog(GtkMessageType type, const gchar *message, const gchar *cancel)
+{
+       GtkWidget *dialog;
+       GtkResponseType response;
+                       
+       // Toss up a warning dialog
+       dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_MODAL,
+                                                       type, GTK_BUTTONS_NONE,
+                                                       "%s", message);
+       gtk_dialog_add_buttons( GTK_DIALOG(dialog), 
+                                                  cancel, GTK_RESPONSE_CANCEL, NULL);
+       response = gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_destroy (dialog);
+}
+
 gboolean
 ghb_cancel_encode(const gchar *extra_msg)
 {
@@ -1663,9 +1928,20 @@ static void
 submit_job(GValue *settings)
 {
        static gint unique_id = 1;
+       gchar *type, *modified, *preset;
+       const GValue *path;
+       gboolean preset_modified;
 
        g_debug("submit_job");
        if (settings == NULL) return;
+       preset_modified = ghb_settings_get_boolean(settings, "preset_modified");
+       path = ghb_settings_get_value(settings, "preset");
+       preset = ghb_preset_path_string(path);
+       type = ghb_preset_is_custom() ? "Custom " : "";
+       modified = preset_modified ? "Modified " : "";
+       ghb_log("%s%sPreset: %s", modified, type, preset);
+       g_free(preset);
+
        ghb_settings_set_int(settings, "job_unique_id", unique_id);
        ghb_settings_set_int(settings, "job_status", GHB_QUEUE_RUNNING);
        ghb_add_job (settings, unique_id);
@@ -1674,10 +1950,95 @@ submit_job(GValue *settings)
 }
 
 static void
-queue_scan(GValue *js)
+prune_logs(signal_user_data_t *ud)
+{
+       gchar *dest_dir;
+       gint days;
+
+       // Only prune logs stored in the default config dir location
+       days = ghb_settings_combo_int(ud->settings, "LogLongevity");
+       if (days > 365)
+               return;
+
+       dest_dir = ghb_get_user_config_dir("EncodeLogs");
+       if (g_file_test(dest_dir, G_FILE_TEST_IS_DIR))
+       {
+               const gchar *file;
+               gint duration = days * 24 * 60 * 60;
+               
+               GDir *gdir = g_dir_open(dest_dir, 0, NULL);
+               time_t now;
+
+               now = time(NULL);
+               file = g_dir_read_name(gdir);
+               while (file)
+               {
+                       gchar *path;
+                       struct stat stbuf;
+
+                       path = g_strdup_printf("%s/%s", dest_dir, file);
+                       g_stat(path, &stbuf);
+                       if (now - stbuf.st_mtime > duration)
+                       {
+                               g_unlink(path);
+                       }
+                       g_free(path);
+                       file = g_dir_read_name(gdir);
+               }
+               g_dir_close(gdir);
+       }
+       g_free(dest_dir);
+       ghb_preview_cleanup(ud);
+}
+
+static void
+queue_scan(signal_user_data_t *ud, GValue *js)
 {
        gchar *path;
        gint titlenum;
+       time_t  _now;
+       struct tm *now;
+       gchar *log_path, *pos, *destname, *basename, *dest_dir;
+
+       _now = time(NULL);
+       now = localtime(&_now);
+       destname = ghb_settings_get_string(js, "destination");
+       basename = g_path_get_basename(destname);
+       if (ghb_settings_get_boolean(ud->settings, "EncodeLogLocation"))
+       {
+               dest_dir = g_path_get_dirname (destname);
+       }
+       else
+       {
+               dest_dir = ghb_get_user_config_dir("EncodeLogs");
+       }
+       g_free(destname);
+       pos = g_strrstr( basename, "." );
+       if (pos != NULL)
+       {
+               *pos = 0;
+       }
+       log_path = g_strdup_printf("%s/%s %d-%02d-%02d %02d-%02d-%02d.log",
+               dest_dir,
+               basename,
+               now->tm_year + 1900, now->tm_mon + 1, now->tm_mday,
+               now->tm_hour, now->tm_min, now->tm_sec);
+       g_free(basename);
+       g_free(dest_dir);
+       if (ud->job_activity_log)
+               g_io_channel_unref(ud->job_activity_log);
+       ud->job_activity_log = g_io_channel_new_file (log_path, "w", NULL);
+       if (ud->job_activity_log)
+       {
+               gchar *ver_str;
+
+               ver_str = g_strdup_printf("Handbrake Version: %s (%d)\n", 
+                                                                       hb_get_version(NULL), hb_get_build(NULL));
+               g_io_channel_write_chars (ud->job_activity_log, ver_str, 
+                                                                       -1, NULL, NULL);
+               g_free(ver_str);
+       }
+       g_free(log_path);
 
        path = ghb_settings_get_string( js, "source");
        titlenum = ghb_settings_get_int(js, "titlenum");
@@ -1685,6 +2046,42 @@ queue_scan(GValue *js)
        g_free(path);
 }
 
+static gint
+queue_pending_count(GValue *queue)
+{
+       gint nn, ii, count;
+       GValue *js;
+       gint status;
+
+       nn = 0;
+       count = ghb_array_len(queue);
+       for (ii = 0; ii < count; ii++)
+       {
+
+               js = ghb_array_get_nth(queue, ii);
+               status = ghb_settings_get_int(js, "job_status");
+               if (status == GHB_QUEUE_PENDING)
+               {
+                       nn++;
+               }
+       }
+       return nn;
+}
+
+void
+ghb_update_pending(signal_user_data_t *ud)
+{
+       GtkLabel *label;
+       gint pending;
+       gchar *str;
+
+       label = GTK_LABEL(GHB_WIDGET(ud->builder, "pending_status"));
+       pending = queue_pending_count(ud->queue);
+       str = g_strdup_printf("%d encode(s) pending in the queue", pending);
+       gtk_label_set_text(label, str);
+       g_free(str);
+}
+
 GValue* 
 ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
 {
@@ -1692,8 +2089,12 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
        gint count, ii, jj;
        GValue *js;
        gint status;
+       GtkWidget *prog;
 
        g_debug("start_next_job");
+       prog = GHB_WIDGET(ud->builder, "progressbar");
+       gtk_widget_show(prog);
+
        count = ghb_array_len(ud->queue);
        if (find_first)
        {       // Start the first pending item in the queue
@@ -1706,11 +2107,15 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
                        if (status == GHB_QUEUE_PENDING)
                        {
                                current = ii;
-                               queue_scan(js);
+                               ghb_inhibit_gpm();
+                               queue_scan(ud, js);
+                               ghb_update_pending(ud);
                                return js;
                        }
                }
                // Nothing pending
+               ghb_uninhibit_gpm();
+               ghb_notify_done(ud);
                return NULL;
        }
        // Find the next pending item after the current running item
@@ -1727,7 +2132,9 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
                                if (status == GHB_QUEUE_PENDING)
                                {
                                        current = jj;
-                                       queue_scan(js);
+                                       ghb_inhibit_gpm();
+                                       queue_scan(ud, js);
+                                       ghb_update_pending(ud);
                                        return js;
                                }
                        }
@@ -1742,11 +2149,17 @@ ghb_start_next_job(signal_user_data_t *ud, gboolean find_first)
                if (status == GHB_QUEUE_PENDING)
                {
                        current = ii;
-                       queue_scan(js);
+                       ghb_inhibit_gpm();
+                       queue_scan(ud, js);
+                       ghb_update_pending(ud);
                        return js;
                }
        }
        // Nothing found
+       ghb_uninhibit_gpm();
+       ghb_notify_done(ud);
+       ghb_update_pending(ud);
+       gtk_widget_hide(prog);
        return NULL;
 }
 
@@ -1774,32 +2187,45 @@ find_queue_job(GValue *queue, gint unique_id, GValue **job)
 }
 
 gchar*
-working_status_string(signal_user_data_t *ud, ghb_status_t *status)
+working_status_string(signal_user_data_t *ud, ghb_instance_status_t *status)
 {
        gchar *task_str, *job_str, *status_str;
        gint qcount;
        gint index;
        GValue *js;
+       gboolean subtitle_scan = FALSE;
 
-       if (status->job_count > 1)
-       {
-               task_str = g_strdup_printf("pass %d of %d, ", 
-                       status->job_cur, status->job_count);
-       }
-       else
+       qcount = ghb_array_len(ud->queue);
+       index = find_queue_job(ud->queue, status->unique_id, &js);
+       if (js != NULL)
        {
-               task_str = g_strdup("");
+               subtitle_scan = ghb_settings_get_boolean(js, "subtitle_scan");
        }
-       qcount = ghb_array_len(ud->queue);
        if (qcount > 1)
        {
-               index = find_queue_job(ud->queue, status->unique_id, &js);
                job_str = g_strdup_printf("job %d of %d, ", index+1, qcount);
        }
        else
        {
                job_str = g_strdup("");
        }
+       if (status->job_count > 1)
+       {
+               if (status->job_cur == 1 && subtitle_scan)
+               {
+                       task_str = g_strdup_printf("pass %d (subtitle scan) of %d, ", 
+                               status->job_cur, status->job_count);
+               }
+               else
+               {
+                       task_str = g_strdup_printf("pass %d of %d, ", 
+                               status->job_cur, status->job_count);
+               }
+       }
+       else
+       {
+               task_str = g_strdup("");
+       }
        if(status->seconds > -1)
        {
                status_str= g_strdup_printf(
@@ -1828,110 +2254,190 @@ ghb_backend_events(signal_user_data_t *ud)
        ghb_status_t status;
        gchar *status_str;
        GtkProgressBar *progress;
+       GtkLabel       *work_status;
        gint titleindex;
        GValue *js;
        gint index;
        GtkTreeView *treeview;
        GtkTreeStore *store;
        GtkTreeIter iter;
-       static gint working = 0;
-       static gboolean work_started = FALSE;
+       static gint prev_scan_state = 0;
+       static gint prev_queue_state = 0;
        
        ghb_track_status();
        ghb_get_status(&status);
+       if (prev_scan_state != status.scan.state ||
+               prev_queue_state != status.queue.state)
+       {
+               ghb_queue_buttons_grey(ud);
+               prev_scan_state = status.scan.state;
+               prev_queue_state = status.queue.state;
+       }
        progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
+       work_status = GTK_LABEL(GHB_WIDGET (ud->builder, "work_status"));
+       if (status.scan.state == GHB_STATE_IDLE && 
+               status.queue.state == GHB_STATE_IDLE)
+       {
+               static gboolean prev_dvdnav;
+               gboolean dvdnav = ghb_settings_get_boolean(ud->settings, "use_dvdnav");
+               if (dvdnav != prev_dvdnav)
+               {
+                       hb_dvd_set_dvdnav(dvdnav);
+                       prev_dvdnav = dvdnav;
+               }
+       }
        // First handle the status of title scans
        // Then handle the status of the queue
-       if (status.state & GHB_STATE_SCANNING)
+       if (status.scan.state & GHB_STATE_SCANNING)
        {
-               status_str = g_strdup_printf ("Scanning title %d of %d...", 
-                                                                 status.title_cur, status.title_count );
-               gtk_progress_bar_set_text (progress, status_str);
+               GtkProgressBar *scan_prog;
+               GtkLabel *label;
+
+               scan_prog = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "scan_prog"));
+               label = GTK_LABEL(GHB_WIDGET (ud->builder, "source_title"));
+
+               if (status.scan.title_cur == 0)
+               {
+                       status_str = g_strdup ("Scanning...");
+               }
+               else
+               {
+                       status_str = g_strdup_printf ("Scanning title %d of %d...", 
+                                                         status.scan.title_cur, status.scan.title_count );
+               }
+               gtk_label_set_text (label, status_str);
                g_free(status_str);
-               if (status.title_count > 0)
+               if (status.scan.title_count > 0)
                {
-                       gtk_progress_bar_set_fraction (progress
-                               (gdouble)status.title_cur / status.title_count);
+                       gtk_progress_bar_set_fraction (scan_prog
+                               (gdouble)status.scan.title_cur / status.scan.title_count);
                }
        }
-       else if (status.state & GHB_STATE_SCANDONE)
+       else if (status.scan.state & GHB_STATE_SCANDONE)
        {
-               status_str = g_strdup_printf ("Scan done"); 
-               gtk_progress_bar_set_text (progress, status_str);
-               g_free(status_str);
-               gtk_progress_bar_set_fraction (progress, 1.0);
+               gchar *source;
+               GtkProgressBar *scan_prog;
+               GtkLabel *label;
+
+               source = ghb_settings_get_string(ud->settings, "source");
+               update_source_label(ud, source);
+
+               scan_prog = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "scan_prog"));
+               gtk_progress_bar_set_fraction (scan_prog, 1.0);
+               gtk_widget_hide(GTK_WIDGET(scan_prog));
 
                ghb_title_info_t tinfo;
                        
-               ghb_update_ui_combo_box(ud->builder, "title", 0, FALSE);
+               ghb_update_ui_combo_box(ud, "title", 0, FALSE);
                titleindex = ghb_longest_title();
                ghb_ui_update(ud, "title", ghb_int64_value(titleindex));
 
+               label = GTK_LABEL(GHB_WIDGET (ud->builder, "source_title"));
                // Are there really any titles.
                if (!ghb_get_title_info(&tinfo, titleindex))
                {
-                       GtkProgressBar *progress;
-                       progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
-                       gtk_progress_bar_set_fraction (progress, 0);
-                       gtk_progress_bar_set_text (progress, "No Source");
+                       gtk_label_set_text(label, "None");
+               }
+               ghb_clear_scan_state(GHB_STATE_SCANDONE);
+               if (ghb_queue_edit_settings)
+               {
+                       gint jstatus;
+
+                       jstatus = ghb_settings_get_int(ghb_queue_edit_settings, "job_status");
+                       ghb_settings_to_ui(ud, ghb_queue_edit_settings);
+                       ghb_set_audio(ud, ghb_queue_edit_settings);
+                       ghb_reset_subtitles(ud, ghb_queue_edit_settings);
+                       if (jstatus == GHB_QUEUE_PENDING)
+                       {
+                               ghb_value_free(ghb_queue_edit_settings);
+                       }
+                       ghb_queue_edit_settings = NULL;
                }
-               ghb_clear_state(GHB_STATE_SCANDONE);
-               ghb_queue_buttons_grey(ud, work_started);
        }
-       else if (status.queue_state & GHB_STATE_SCANNING)
+
+       if (status.queue.state & GHB_STATE_SCANNING)
        {
-               status_str = g_strdup_printf ("Scanning ...");
-               gtk_progress_bar_set_text (progress, status_str);
-               g_free(status_str);
+               // This needs to be in scanning and working since scanning
+               // happens fast enough that it can be missed
+               gtk_label_set_text (work_status, "Scanning ...");
                gtk_progress_bar_set_fraction (progress, 0);
        }
-       else if (status.queue_state & GHB_STATE_SCANDONE)
+       else if (status.queue.state & GHB_STATE_SCANDONE)
        {
                ghb_clear_queue_state(GHB_STATE_SCANDONE);
+               usleep(2000000);
                submit_job(ud->current_job);
+               ghb_update_pending(ud);
        }
-       else if (status.queue_state & GHB_STATE_PAUSED)
-       {
-               status_str = g_strdup_printf ("Paused"); 
-               gtk_progress_bar_set_text (progress, status_str);
-               g_free(status_str);
-       }
-       else if (status.queue_state & GHB_STATE_WORKING)
+       else if (status.queue.state & GHB_STATE_PAUSED)
        {
-               status_str = working_status_string(ud, &status);
-               gtk_progress_bar_set_text (progress, status_str);
-               gtk_progress_bar_set_fraction (progress, status.progress);
-               g_free(status_str);
+               gtk_label_set_text (work_status, "Paused");
        }
-       else if (status.queue_state & GHB_STATE_WORKDONE)
+       else if (status.queue.state & GHB_STATE_WORKING)
        {
-               gint qstatus;
+               static gint working = 0;
 
-               work_started = FALSE;
-               ghb_queue_buttons_grey(ud, FALSE);
-               index = find_queue_job(ud->queue, status.unique_id, &js);
-               treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
-               store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-               if (ud->cancel_encode)
-                       status.error = GHB_ERROR_CANCELED;
-               switch( status.error )
+               // This needs to be in scanning and working since scanning
+               // happens fast enough that it can be missed
+               index = find_queue_job(ud->queue, status.queue.unique_id, &js);
+               if (status.queue.unique_id != 0 && index >= 0)
                {
-                       case GHB_ERROR_NONE:
-                               gtk_progress_bar_set_text( progress, "Rip done!" );
-                               qstatus = GHB_QUEUE_DONE;
-                               if (js != NULL)
-                               {
-                                       gchar *path = g_strdup_printf ("%d", index);
-                                       if (gtk_tree_model_get_iter_from_string(
-                                                       GTK_TREE_MODEL(store), &iter, path))
-                                       {
-                                               gtk_tree_store_set(store, &iter, 0, "hb-complete", -1);
-                                       }
-                                       g_free(path);
-                               }
+                       gchar working_icon[] = "hb-working0";
+                       working_icon[10] = '0' + working;
+                       working = (working+1) % 6;
+                       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
+                       store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+                       gchar *path = g_strdup_printf ("%d", index);
+                       if (gtk_tree_model_get_iter_from_string(
+                                       GTK_TREE_MODEL(store), &iter, path))
+                       {
+                               gtk_tree_store_set(store, &iter, 0, working_icon, -1);
+                       }
+                       g_free(path);
+               }
+               GtkLabel *label;
+               gchar *status_str;
+
+               status_str = working_status_string(ud, &status.queue);
+               label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
+               gtk_label_set_text (label, status_str);
+#if !GTK_CHECK_VERSION(2, 16, 0)
+               GtkStatusIcon *si;
+
+               si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+               gtk_status_icon_set_tooltip(si, status_str);
+#endif
+               gtk_label_set_text (work_status, status_str);
+               gtk_progress_bar_set_fraction (progress, status.queue.progress);
+               g_free(status_str);
+       }
+       else if (status.queue.state & GHB_STATE_WORKDONE)
+       {
+               gint qstatus;
+
+               index = find_queue_job(ud->queue, status.queue.unique_id, &js);
+               treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
+               store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
+               if (ud->cancel_encode)
+                       status.queue.error = GHB_ERROR_CANCELED;
+               switch( status.queue.error )
+               {
+                       case GHB_ERROR_NONE:
+                               gtk_label_set_text (work_status, "Rip Done!");
+                               qstatus = GHB_QUEUE_DONE;
+                               if (js != NULL)
+                               {
+                                       gchar *path = g_strdup_printf ("%d", index);
+                                       if (gtk_tree_model_get_iter_from_string(
+                                                       GTK_TREE_MODEL(store), &iter, path))
+                                       {
+                                               gtk_tree_store_set(store, &iter, 0, "hb-complete", -1);
+                                       }
+                                       g_free(path);
+                               }
                                break;
                        case GHB_ERROR_CANCELED:
-                               gtk_progress_bar_set_text( progress, "Rip canceled." );
+                               gtk_label_set_text (work_status, "Rip Canceled.");
                                qstatus = GHB_QUEUE_CANCELED;
                                if (js != NULL)
                                {
@@ -1945,7 +2451,7 @@ ghb_backend_events(signal_user_data_t *ud)
                                }
                                break;
                        default:
-                               gtk_progress_bar_set_text( progress, "Rip failed.");
+                               gtk_label_set_text (work_status, "Rip Failed.");
                                qstatus = GHB_QUEUE_CANCELED;
                                if (js != NULL)
                                {
@@ -1960,69 +2466,96 @@ ghb_backend_events(signal_user_data_t *ud)
                }
                gtk_progress_bar_set_fraction (progress, 1.0);
                ghb_clear_queue_state(GHB_STATE_WORKDONE);
+               if (ud->job_activity_log)
+                       g_io_channel_unref(ud->job_activity_log);
+               ud->job_activity_log = NULL;
                if (!ud->cancel_encode)
+               {
                        ud->current_job = ghb_start_next_job(ud, FALSE);
+               }
                else
+               {
+                       ghb_uninhibit_gpm();
                        ud->current_job = NULL;
+                       gtk_widget_hide(GTK_WIDGET(progress));
+               }
                if (js)
                        ghb_settings_set_int(js, "job_status", qstatus);
                ghb_save_queue(ud->queue);
                ud->cancel_encode = FALSE;
+#if !GTK_CHECK_VERSION(2, 16, 0)
+               GtkStatusIcon *si;
+
+               si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+               gtk_status_icon_set_tooltip(si, "HandBrake");
+#endif
        }
-       else if (status.queue_state & GHB_STATE_MUXING)
+       else if (status.queue.state & GHB_STATE_MUXING)
        {
-               gtk_progress_bar_set_text(progress, "Muxing: this may take awhile...");
+               gtk_label_set_text (work_status, "Muxing: This may take a while...");
        }
-       if (status.queue_state & GHB_STATE_SCANNING)
+
+       if (status.scan.state & GHB_STATE_WORKING)
        {
-               // This needs to be in scanning and working since scanning
-               // happens fast enough that it can be missed
-               if (!work_started)
-               {
-                       work_started = TRUE;
-                       ghb_queue_buttons_grey(ud, TRUE);
-               }
+               GtkProgressBar *live_progress;
+               live_progress = GTK_PROGRESS_BAR(
+                       GHB_WIDGET(ud->builder, "live_encode_progress"));
+               status_str = working_status_string(ud, &status.scan);
+               gtk_progress_bar_set_text (live_progress, status_str);
+               gtk_progress_bar_set_fraction (live_progress, status.scan.progress);
+               g_free(status_str);
        }
-       if (status.queue_state & GHB_STATE_WORKING)
+       if (status.scan.state & GHB_STATE_WORKDONE)
        {
-               // This needs to be in scanning and working since scanning
-               // happens fast enough that it can be missed
-               if (!work_started)
-               {
-                       work_started = TRUE;
-                       ghb_queue_buttons_grey(ud, TRUE);
-               }
-               index = find_queue_job(ud->queue, status.unique_id, &js);
-               if (status.unique_id != 0 && index >= 0)
+               switch( status.scan.error )
                {
-                       gchar working_icon[] = "hb-working0";
-                       working_icon[10] = '0' + working;
-                       working = (working+1) % 6;
-                       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "queue_list"));
-                       store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
-                       gchar *path = g_strdup_printf ("%d", index);
-                       if (gtk_tree_model_get_iter_from_string(
-                                       GTK_TREE_MODEL(store), &iter, path))
+                       case GHB_ERROR_NONE:
                        {
-                               gtk_tree_store_set(store, &iter, 0, working_icon, -1);
-                       }
-                       g_free(path);
+                               ghb_live_encode_done(ud, TRUE);
+                       } break;
+                       default:
+                       {
+                               ghb_live_encode_done(ud, FALSE);
+                       } break;
                }
-               GtkLabel *label;
-               gchar *status_str;
-
-               status_str = working_status_string(ud, &status);
-               label = GTK_LABEL(GHB_WIDGET(ud->builder, "queue_status"));
-               gtk_label_set_text (label, status_str);
-               g_free(status_str);
+               ghb_clear_scan_state(GHB_STATE_WORKDONE);
        }
 }
 
-gboolean
+#if GTK_CHECK_VERSION(2, 16, 0)
+G_MODULE_EXPORT gboolean
+status_icon_query_tooltip_cb(
+       GtkStatusIcon *si,
+       gint           x,
+       gint           y,
+       gboolean       kbd_mode,
+       GtkTooltip    *tt,
+       signal_user_data_t *ud)
+{
+       ghb_status_t status;
+       gchar *status_str;
+
+       ghb_get_status(&status);
+       if (status.queue.state & GHB_STATE_WORKING)
+               status_str = working_status_string(ud, &status.queue);
+       else if (status.queue.state & GHB_STATE_WORKDONE)
+               status_str = g_strdup("Encode Complete");
+       else
+               status_str = g_strdup("HandBrake");
+
+       gtk_tooltip_set_text(tt, status_str);
+       gtk_tooltip_set_icon_from_icon_name(tt, "hb-icon", GTK_ICON_SIZE_BUTTON);
+       g_free(status_str);
+       return TRUE;
+}
+#endif
+
+G_MODULE_EXPORT gboolean
 ghb_timer_cb(gpointer data)
 {
        signal_user_data_t *ud = (signal_user_data_t*)data;
 
+       ghb_live_preview_progress(ud);
        ghb_backend_events(ud);
        if (update_default_destination)
        {
@@ -2042,13 +2575,45 @@ ghb_timer_cb(gpointer data)
        }
        if (update_preview)
        {
-               set_preview_image (ud);
+               g_debug("Updating preview\n");
+               ghb_set_preview_image (ud);
                update_preview = FALSE;
        }
+
+       if (!appcast_busy)
+       {
+               gchar *updates;
+               updates = ghb_settings_get_string(ud->settings, "check_updates");
+               gint64 duration = 0;
+               if (strcmp(updates, "daily") == 0)
+                       duration = 60 * 60 * 24;
+               else if (strcmp(updates, "weekly") == 0)
+                       duration = 60 * 60 * 24 * 7;
+               else if (strcmp(updates, "monthly") == 0)
+                       duration = 60 * 60 * 24 * 7;
+
+               g_free(updates);
+               if (duration != 0)
+               {
+                       gint64 last;
+                       time_t tt;
+
+                       last = ghb_settings_get_int64(ud->settings, "last_update_check");
+                       time(&tt);
+                       if (last + duration < tt)
+                       {
+                               ghb_settings_set_int64(ud->settings, 
+                                                                               "last_update_check", tt);
+                               ghb_pref_save(ud->settings, "last_update_check");
+                               g_thread_create((GThreadFunc)ghb_check_update, ud, 
+                                                               FALSE, NULL);
+                       }
+               }
+       }
        return TRUE;
 }
 
-gboolean
+G_MODULE_EXPORT gboolean
 ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
 {
        gchar *text = NULL;
@@ -2063,7 +2628,7 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
        signal_user_data_t *ud = (signal_user_data_t*)data;
 
        status = g_io_channel_read_line (source, &text, &length, NULL, &gerror);
-       if (text != NULL)
+       if (text != NULL && length > 0 && text[length-1] != 0)
        {
                GdkWindow *window;
                gint width, height;
@@ -2074,7 +2639,7 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
                buffer = gtk_text_view_get_buffer (textview);
                // I would like to auto-scroll the window when the scrollbar
                // is at the bottom, 
-               // must determining whether the insert point is at
+               // must determine whether the insert point is at
                // the bottom of the window 
                window = gtk_text_view_get_window(textview, GTK_TEXT_WINDOW_TEXT);
                if (window != NULL)
@@ -2097,11 +2662,32 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
                gtk_text_buffer_insert(buffer, &iter, text, -1);
                if (bottom)
                {
-                       //gtk_text_view_scroll_to_iter(textview, &iter, 0, FALSE, 0, 0);
-                       mark = gtk_text_buffer_get_insert (buffer);
+                       gtk_text_buffer_get_end_iter(buffer, &iter);
+                       mark = gtk_text_buffer_create_mark(buffer, NULL, &iter, FALSE);
                        gtk_text_view_scroll_mark_onscreen(textview, mark);
+                       gtk_text_buffer_delete_mark(buffer, mark);
+               }
+#if defined(_WIN32)
+               gsize one = 1;
+               text[length-1] = '\r';
+#endif
+               g_io_channel_write_chars (ud->activity_log, text, 
+                                                               length, &length, NULL);
+#if defined(_WIN32)
+               g_io_channel_write_chars (ud->activity_log, "\n", 
+                                                               one, &one, NULL);
+#endif
+               g_io_channel_flush(ud->activity_log, NULL);
+               if (ud->job_activity_log)
+               {
+                       g_io_channel_write_chars (ud->job_activity_log, text, 
+                                                                       length, &length, NULL);
+#if defined(_WIN32)
+                       g_io_channel_write_chars (ud->activity_log, "\n", 
+                                                                       one, &one, NULL);
+#endif
+                       g_io_channel_flush(ud->job_activity_log, NULL);
                }
-               g_io_channel_write_chars (ud->activity_log, text, length, &length, NULL);
                g_free(text);
        }
        if (status != G_IO_STATUS_NORMAL)
@@ -2121,20 +2707,69 @@ ghb_log_cb(GIOChannel *source, GIOCondition cond, gpointer data)
        return TRUE;
 }
 
-void
-about_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+static void
+set_visible(GtkWidget *widget, gboolean visible)
 {
-       GtkWidget *widget = GHB_WIDGET (ud->builder, "hb_about");
-       gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), ghb_version());
-       gtk_widget_show (widget);
+       if (visible)
+       {
+               gtk_widget_show_now(widget);
+       }
+       else
+       {
+               gtk_widget_hide(widget);
+       }
+}
+
+G_MODULE_EXPORT void
+show_activity_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
+       set_visible(widget, gtk_toggle_tool_button_get_active(
+                                               GTK_TOGGLE_TOOL_BUTTON(xwidget)));
+}
+
+G_MODULE_EXPORT void
+show_activity_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
+       set_visible(widget, TRUE);
+       widget = GHB_WIDGET (ud->builder, "show_activity");
+       gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
+}
+
+G_MODULE_EXPORT gboolean
+activity_window_delete_cb(GtkWidget *xwidget, GdkEvent *event, signal_user_data_t *ud)
+{
+       set_visible(xwidget, FALSE);
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "show_activity");
+       gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
+       return TRUE;
 }
 
 void
-guide_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+ghb_log(gchar *log, ...)
+{
+       va_list args;
+       time_t _now;
+    struct tm *now;
+       gchar fmt[362];
+
+       _now = time(NULL);
+       now = localtime( &_now );
+       snprintf(fmt, 362, "[%02d:%02d:%02d] gtkgui: %s\n", 
+                       now->tm_hour, now->tm_min, now->tm_sec, log);
+       va_start(args, log);
+       vfprintf(stderr, fmt, args);
+       va_end(args);
+}
+
+static void
+browse_url(const gchar *url)
 {
        gboolean result;
        char *argv[] = 
-               {"xdg-open","http://trac.handbrake.fr/wiki/HandBrakeGuide",NULL,NULL};
+               {"xdg-open",NULL,NULL,NULL};
+       argv[1] = (gchar*)url;
        result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
                                NULL, NULL, NULL);
        if (result) return;
@@ -2156,38 +2791,79 @@ guide_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
        argv[2] = NULL;
        result = g_spawn_async(NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL,
                                NULL, NULL, NULL);
-       if (result) return;
 }
 
 void
-hb_about_response_cb(GtkWidget *widget, gint response, signal_user_data_t *ud)
+about_web_hook(GtkAboutDialog *about, const gchar *link, gpointer data)
 {
-       gtk_widget_hide (widget);
+       browse_url(link);
 }
 
-void
-show_activity_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+G_MODULE_EXPORT void
+about_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
-       GtkWidget *widget = GHB_WIDGET (ud->builder, "activity_window");
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "hb_about");
+       gchar *ver;
+
+       ver = g_strdup_printf("%s (%s)", HB_PROJECT_VERSION, HB_PROJECT_BUILD_ARCH);
+       gtk_about_dialog_set_url_hook(about_web_hook, NULL, NULL);
+       gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(widget), ver);
+       g_free(ver);
+       gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(widget), 
+                                                               HB_PROJECT_URL_WEBSITE);
+       gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(widget), 
+                                                                               HB_PROJECT_URL_WEBSITE);
        gtk_widget_show (widget);
 }
 
-void
+G_MODULE_EXPORT void
+guide_activate_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+       browse_url("http://trac.handbrake.fr/wiki/HandBrakeGuide");
+}
+
+G_MODULE_EXPORT void
+hb_about_response_cb(GtkWidget *widget, gint response, signal_user_data_t *ud)
+{
+       gtk_widget_hide (widget);
+}
+
+G_MODULE_EXPORT void
 show_queue_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
 {
        GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
-       gtk_widget_show (widget);
+       set_visible(widget, gtk_toggle_tool_button_get_active(
+                                               GTK_TOGGLE_TOOL_BUTTON(xwidget)));
 }
 
-void
-show_presets_toggled_cb(GtkToggleButton *button, signal_user_data_t *ud)
+G_MODULE_EXPORT void
+show_queue_menu_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
+{
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "queue_window");
+       set_visible(widget, TRUE);
+       widget = GHB_WIDGET (ud->builder, "show_queue");
+       gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), TRUE);
+}
+
+G_MODULE_EXPORT gboolean
+queue_window_delete_cb(GtkWidget *xwidget, GdkEvent *event, signal_user_data_t *ud)
+{
+       set_visible(xwidget, FALSE);
+       GtkWidget *widget = GHB_WIDGET (ud->builder, "show_queue");
+       gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), FALSE);
+       return TRUE;
+}
+
+G_MODULE_EXPORT void
+show_presets_toggled_cb(GtkWidget *action, signal_user_data_t *ud)
 {
        GtkWidget *widget;
        GtkWindow *hb_window;
        
        g_debug("show_presets_clicked_cb ()");
        widget = GHB_WIDGET (ud->builder, "presets_frame");
-       if (gtk_toggle_button_get_active(button))
+       ghb_widget_to_setting(ud->settings, action);
+       if (ghb_settings_get_boolean(ud->settings, "show_presets"))
        {
                gtk_widget_show_now(widget);
        }
@@ -2197,30 +2873,9 @@ show_presets_toggled_cb(GtkToggleButton *button, signal_user_data_t *ud)
                hb_window = GTK_WINDOW(GHB_WIDGET (ud->builder, "hb_window"));
                gtk_window_resize(hb_window, 16, 16);
        }
-       ghb_widget_to_setting(ud->settings, GTK_WIDGET(button));
        ghb_pref_save(ud->settings, "show_presets");
 }
 
-void
-presets_frame_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, signal_user_data_t *ud)
-{
-       GtkTreeView *treeview;
-       GtkTreeSelection *selection;
-       GtkTreeModel *store;
-       GtkTreeIter iter;
-       
-       treeview = GTK_TREE_VIEW(GHB_WIDGET(ud->builder, "presets_list"));
-       selection = gtk_tree_view_get_selection(treeview);
-       if (gtk_tree_selection_get_selected(selection, &store, &iter))
-       {
-               GtkTreePath *path;
-               path = gtk_tree_model_get_path (store, &iter);
-               // Make the parent visible in scroll window if it is not.
-               gtk_tree_view_scroll_to_cell (treeview, path, NULL, FALSE, 0, 0);
-               gtk_tree_path_free(path);
-       }
-}
-
 static void
 update_chapter_list(signal_user_data_t *ud)
 {
@@ -2249,17 +2904,22 @@ update_chapter_list(signal_user_data_t *ud)
 
                        if (ii < count)
                        {
-                               gchar *chapter;
+                               gchar *chapter, *duration;
+                               gint hh, mm, ss;
 
                                // Update row with settings data
                                g_debug("Updating row");
                                chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
+                               ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
+                               duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
                                gtk_list_store_set(store, &iter, 
                                        0, ii+1,
-                                       1, chapter,
-                                       2, TRUE,
+                                       1, duration,
+                                       2, chapter,
+                                       3, TRUE,
                                        -1);
                                g_free(chapter);
+                               g_free(duration);
                                ii++;
                                done = !gtk_tree_model_iter_next(GTK_TREE_MODEL(store), &iter);
                        }
@@ -2273,25 +2933,30 @@ update_chapter_list(signal_user_data_t *ud)
        }
        while (ii < count)
        {
-               gchar *chapter;
+               gchar *chapter, *duration;
+               gint hh, mm, ss;
 
                // Additional settings, add row
                g_debug("Adding row");
                chapter = ghb_value_string(ghb_array_get_nth(chapters, ii));
+               ghb_get_chapter_duration(titleindex, ii, &hh, &mm, &ss);
+               duration = g_strdup_printf("%02d:%02d:%02d", hh, mm, ss);
                gtk_list_store_append(store, &iter);
                gtk_list_store_set(store, &iter, 
                        0, ii+1,
-                       1, chapter,
-                       2, TRUE,
+                       1, duration,
+                       2, chapter,
+                       3, TRUE,
                        -1);
                g_free(chapter);
+               g_free(duration);
                ii++;
        }
 }
 
 static gint chapter_edit_key = 0;
 
-gboolean
+G_MODULE_EXPORT gboolean
 chapter_keypress_cb(
        GhbCellRendererText *cell,
        GdkEventKey *event,
@@ -2301,7 +2966,7 @@ chapter_keypress_cb(
        return FALSE;
 }
 
-void
+G_MODULE_EXPORT void
 chapter_edited_cb(
        GhbCellRendererText *cell, 
        gchar *path, 
@@ -2326,12 +2991,12 @@ chapter_edited_cb(
        row = pi[0];
        gtk_tree_model_get_iter(GTK_TREE_MODEL(store), &iter, treepath);
        gtk_list_store_set(store, &iter, 
-               1, text,
-               2, TRUE,
+               2, text,
+               3, TRUE,
                -1);
        gtk_tree_model_get(GTK_TREE_MODEL(store), &iter, 0, &index, -1);
 
-       GValue *chapters;
+       const GValue *chapters;
        GValue *chapter;
 
        chapters = ghb_settings_get_value(ud->settings, "chapter_list");
@@ -2367,70 +3032,20 @@ chapter_edited_cb(
                // I got industrious and made my own CellTextRendererText that
                // passes on the key-press-event. So now I have much better
                // control of this.
-               column = gtk_tree_view_get_column(treeview, 1);
+               column = gtk_tree_view_get_column(treeview, 2);
                gtk_tree_view_set_cursor(treeview, treepath, column, TRUE);
        }
        else if (chapter_edit_key == GDK_Up && row > 0)
        {
                GtkTreeViewColumn *column;
                gtk_tree_path_prev(treepath);
-               column = gtk_tree_view_get_column(treeview, 1);
+               column = gtk_tree_view_get_column(treeview, 2);
                gtk_tree_view_set_cursor(treeview, treepath, column, TRUE);
        }
        gtk_tree_path_free (treepath);
 }
 
 void
-chapter_list_selection_changed_cb(GtkTreeSelection *selection, signal_user_data_t *ud)
-{
-       g_debug("chapter_list_selection_changed_cb ()");
-       //chapter_selection_changed = TRUE;
-}
-
-void
-preview_button_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       gint titleindex;
-
-       titleindex = ghb_settings_combo_int(ud->settings, "title");
-       if (titleindex < 0) return;
-       g_debug("titleindex %d", titleindex);
-
-       GtkWidget *widget = GHB_WIDGET (ud->builder, "preview_window");
-       gtk_widget_show (widget);
-}
-
-void
-preview_frame_value_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
-{
-       set_preview_image(ud);
-}
-
-void
-preview_button_size_allocate_cb(GtkWidget *widget, GtkAllocation *allocation, signal_user_data_t *ud)
-{
-       g_debug("-------------------------------allocate %d x %d", allocation->width, allocation->height);
-       if (preview_button_width == allocation->width &&
-               preview_button_height == allocation->height)
-       {
-               // Nothing to do. Bug out.
-               g_debug("nothing to do");
-               return;
-       }
-       g_debug("-------------------------------prev allocate %d x %d", preview_button_width, preview_button_height);
-       preview_button_width = allocation->width;
-       preview_button_height = allocation->height;
-       set_preview_image(ud);
-}
-
-void
-presets_default_clicked_cb(GtkWidget *xwidget, signal_user_data_t *ud)
-{
-       ghb_set_preset_default(ud->settings);
-       ghb_presets_list_update(ud);
-}
-
-void
 debug_log_handler(const gchar *domain, GLogLevelFlags flags, const gchar *msg, gpointer data)
 {
        signal_user_data_t *ud = (signal_user_data_t*)data;
@@ -2441,17 +3056,10 @@ debug_log_handler(const gchar *domain, GLogLevelFlags flags, const gchar *msg, g
        }
 }
 
-static void
-set_visible(GtkWidget *widget, gboolean visible)
+void
+warn_log_handler(const gchar *domain, GLogLevelFlags flags, const gchar *msg, gpointer data)
 {
-       if (visible)
-       {
-               gtk_widget_show_now(widget);
-       }
-       else
-       {
-               gtk_widget_hide(widget);
-       }
+       printf("%s: %s\n", domain, msg);
 }
 
 void
@@ -2478,14 +3086,12 @@ ghb_hbfd(signal_user_data_t *ud, gboolean hbfd)
        set_visible(widget, !hbfd);
        widget = GHB_WIDGET(ud->builder, "presets_remove");
        set_visible(widget, !hbfd);
-       widget = GHB_WIDGET(ud->builder, "presets_default");
-       set_visible(widget, !hbfd);
        widget = GHB_WIDGET (ud->builder, "hb_window");
        gtk_window_resize(GTK_WINDOW(widget), 16, 16);
 
 }
 
-void
+G_MODULE_EXPORT void
 hbfd_toggled_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("hbfd_toggled_cb");
@@ -2495,7 +3101,7 @@ hbfd_toggled_cb(GtkWidget *widget, signal_user_data_t *ud)
        ghb_pref_save(ud->settings, "hbfd");
 }
 
-void
+G_MODULE_EXPORT void
 pref_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("pref_changed_cb");
@@ -2505,43 +3111,62 @@ pref_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        ghb_pref_save(ud->settings, name);
 }
 
-void
-tweaks_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+G_MODULE_EXPORT void
+use_m4v_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
-       g_debug("tweaks_changed_cb");
+       g_debug("use_m4v_changed_cb");
        ghb_widget_to_setting (ud->settings, widget);
+       ghb_check_dependency(ud, widget);
        const gchar *name = gtk_widget_get_name(widget);
        ghb_pref_save(ud->settings, name);
+       ghb_update_destination_extension(ud);
+}
 
-       gboolean tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
-       widget = GHB_WIDGET(ud->builder, "deinterlace");
-       tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-       widget = GHB_WIDGET(ud->builder, "tweak_deinterlace");
-       !tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
+G_MODULE_EXPORT void
+show_status_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+       g_debug("show_status_cb");
+       ghb_widget_to_setting (ud->settings, widget);
+       ghb_check_dependency(ud, widget);
+       const gchar *name = gtk_widget_get_name(widget);
+       ghb_pref_save(ud->settings, name);
 
-       widget = GHB_WIDGET(ud->builder, "denoise");
-       tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-       widget = GHB_WIDGET(ud->builder, "tweak_denoise");
-       !tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-       if (tweaks)
-       {
-               const GValue *value;
-               value = ghb_settings_get_value(ud->settings, "deinterlace");
-               ghb_ui_update(ud, "tweak_deinterlace", value);
-               value = ghb_settings_get_value(ud->settings, "denoise");
-               ghb_ui_update(ud, "tweak_denoise", value);
-       }
-       else
-       {
-               const GValue *value;
-               value = ghb_settings_get_value(ud->settings, "tweak_deinterlace");
-               ghb_ui_update(ud, "deinterlace", value);
-               value = ghb_settings_get_value(ud->settings, "tweak_denoise");
-               ghb_ui_update(ud, "denoise", value);
-       }
+       GtkStatusIcon *si;
+
+       si = GTK_STATUS_ICON(GHB_OBJECT (ud->builder, "hb_status"));
+       gtk_status_icon_set_visible(si,
+                       ghb_settings_get_boolean(ud->settings, "show_status"));
 }
 
-void
+G_MODULE_EXPORT void
+vqual_granularity_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+       g_debug("vqual_granularity_changed_cb");
+       ghb_widget_to_setting (ud->settings, widget);
+       ghb_check_dependency(ud, widget);
+
+       const gchar *name = gtk_widget_get_name(widget);
+       ghb_pref_save(ud->settings, name);
+
+       gdouble vqmin, vqmax, step, page;
+       gboolean inverted;
+       gint digits;
+
+       ghb_vquality_range(ud, &vqmin, &vqmax, &step, &page, &digits, &inverted);
+       GtkWidget *qp = GHB_WIDGET(ud->builder, "VideoQualitySlider");
+       gtk_range_set_increments (GTK_RANGE(qp), step, page);
+}
+
+G_MODULE_EXPORT void
+tweaks_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
+{
+       g_debug("tweaks_changed_cb");
+       ghb_widget_to_setting (ud->settings, widget);
+       const gchar *name = gtk_widget_get_name(widget);
+       ghb_pref_save(ud->settings, name);
+}
+
+G_MODULE_EXPORT void
 hbfd_feature_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
 {
        g_debug("hbfd_feature_changed_cb");
@@ -2561,42 +3186,66 @@ hbfd_feature_changed_cb(GtkWidget *widget, signal_user_data_t *ud)
        gtk_action_set_visible(action, hbfd);
 }
 
-void
+gboolean
 ghb_file_menu_add_dvd(signal_user_data_t *ud)
 {
        GList *link, *drives;
+       static GtkActionGroup *agroup = NULL;
+       static gint merge_id;
 
-       GtkActionGroup *agroup = GTK_ACTION_GROUP(
-               gtk_builder_get_object(ud->builder, "actiongroup1"));
-       GtkUIManager *ui = GTK_UI_MANAGER(
-               gtk_builder_get_object(ud->builder, "uimanager1"));
-       guint merge_id = gtk_ui_manager_new_merge_id(ui);
-
+       g_debug("ghb_file_menu_add_dvd()");
        link = drives = dvd_device_list();
-       while (link != NULL)
+       if (drives != NULL)
        {
-               gchar *name = (gchar*)link->data;
-               // Create action for this drive
-               GtkAction *action = gtk_action_new(name, name,
-                       "Scan this DVD source", "gtk-cdrom");
-               // Add action to action group
-               gtk_action_group_add_action_with_accel(agroup, action, "");
-               // Add to ui manager
+               GtkUIManager *ui = GTK_UI_MANAGER(
+                       gtk_builder_get_object(ud->builder, "uimanager1"));
+
+               if (agroup == NULL)
+               {
+                       agroup = gtk_action_group_new("dvdgroup");
+                       gtk_ui_manager_insert_action_group(ui, agroup, 0);
+               }
+               else
+                       gtk_ui_manager_remove_ui(ui, merge_id);
+
+               merge_id = gtk_ui_manager_new_merge_id(ui);
+               // Add separator
                gtk_ui_manager_add_ui(ui, merge_id, 
-                       "ui/menubar1/menuitem1/quit1", name, name,
-                       GTK_UI_MANAGER_AUTO, TRUE);
-               // Connect signal to action (menu item)
-               g_signal_connect(action, "activate", 
-                       (GCallback)dvd_source_activate_cb, ud);
-               g_free(name);
-               link = link->next;
-       }
-       g_list_free(drives);
+                       "ui/menubar1/menuitem1/quit1", "dvdsep", NULL,
+                       GTK_UI_MANAGER_SEPARATOR, TRUE);
 
-       // Add separator
-       gtk_ui_manager_add_ui(ui, merge_id, 
-               "ui/menubar1/menuitem1/quit1", "", NULL,
-               GTK_UI_MANAGER_AUTO, TRUE);
+               while (link != NULL)
+               {
+                       GtkAction *action;
+                       gchar *drive = get_dvd_device_name(link->data);
+                       gchar *name = get_dvd_volume_name(link->data);
+               
+                       action = gtk_action_group_get_action(agroup, drive);
+                       if (action != NULL)
+                       {
+                               gtk_action_group_remove_action(agroup, action);
+                               g_object_unref(G_OBJECT(action));
+                       }
+                       // Create action for this drive
+                       action = gtk_action_new(drive, name,
+                               "Scan this DVD source", "gtk-cdrom");
+                       // Add action to action group
+                       gtk_action_group_add_action_with_accel(agroup, action, NULL);
+                       // Add to ui manager
+                       gtk_ui_manager_add_ui(ui, merge_id, 
+                               "ui/menubar1/menuitem1/dvdsep", drive, drive,
+                               GTK_UI_MANAGER_AUTO, TRUE);
+                       // Connect signal to action (menu item)
+                       g_signal_connect(action, "activate", 
+                               (GCallback)dvd_source_activate_cb, ud);
+                       g_free(name);
+                       g_free(drive);
+                       free_drive(link->data);
+                       link = link->next;
+               }
+               g_list_free(drives);
+       }
+       return FALSE;
 }
 
 gboolean ghb_is_cd(GDrive *gd);
@@ -2604,9 +3253,33 @@ gboolean ghb_is_cd(GDrive *gd);
 static GList*
 dvd_device_list()
 {
+       GList *dvd_devices = NULL;
+
+#if defined(_WIN32)
+       gint ii, drives;
+       gchar drive[5];
+
+       strcpy(drive, "A:" G_DIR_SEPARATOR_S);
+       drives = GetLogicalDrives();
+       for (ii = 0; ii < 26; ii++)
+       {
+               if (drives & 0x01)
+               {
+                       guint dtype;
+
+                       drive[0] = 'A' + ii;
+                       dtype = GetDriveType(drive);
+                       if (dtype == DRIVE_CDROM)
+                       {
+                               dvd_devices = g_list_append(dvd_devices, 
+                                               (gpointer)g_strdup(drive));
+                       }
+               }
+               drives >>= 1;
+       }
+#else
        GVolumeMonitor *gvm;
        GList *drives, *link;
-       GList *dvd_devices = NULL;
        
        gvm = g_volume_monitor_get ();
        drives = g_volume_monitor_get_connected_drives (gvm);
@@ -2618,120 +3291,526 @@ dvd_device_list()
                gd = (GDrive*)link->data;
                if (ghb_is_cd(gd))
                {
-                       gchar *device;
-                       device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
-                       dvd_devices = g_list_append(dvd_devices, (gpointer)device);
+                       dvd_devices = g_list_append(dvd_devices, gd);
                }
-               g_object_unref (gd);
+               else
+                       g_object_unref (gd);
                link = link->next;
        }
        g_list_free(drives);
+#endif
+
        return dvd_devices;
 }
 
-
-static DBusConnection *dbus_connection = NULL;
+#if !defined(_WIN32)
 static LibHalContext *hal_ctx;
+#endif
 
 gboolean
 ghb_is_cd(GDrive *gd)
 {
+#if !defined(_WIN32)
        gchar *device;
        LibHalDrive *halDrive;
        LibHalDriveType dtype;
 
        device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+       if (device == NULL)
+               return FALSE;
        halDrive = libhal_drive_from_device_file (hal_ctx, device);
+       g_free(device);
+       if (halDrive == NULL)
+               return FALSE;
        dtype = libhal_drive_get_type(halDrive);
        libhal_drive_free(halDrive);
-       g_free(device);
        return (dtype == LIBHAL_DRIVE_TYPE_CDROM);
+#else
+       return FALSE;
+#endif
+}
+
+#if defined(_WIN32)
+static void
+handle_media_change(const gchar *device, gboolean insert, signal_user_data_t *ud)
+{
+       guint dtype;
+       static gint ins_count = 0;
+       static gint rem_count = 0;
+
+       // The media change event in windows bounces around a bit
+       // so I debounce it here
+       // DVD insertion detected.  Scan it.
+       dtype = GetDriveType(device);
+       if (dtype != DRIVE_CDROM)
+               return;
+       if (insert)
+       {
+               rem_count = 0;
+               ins_count++;
+               if (ins_count == 2)
+               {
+                       g_thread_create((GThreadFunc)ghb_cache_volnames, ud, FALSE, NULL);
+                       if (ud->current_dvd_device != NULL &&
+                               strcmp(device, ud->current_dvd_device) == 0)
+                       {
+                               show_scan_progress(ud);
+                               update_source_label(ud, device);
+                               gint preview_count;
+                               preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+                               ghb_backend_scan(device, 0, preview_count);
+                       }
+               }
+       }
+       else
+       {
+               ins_count = 0;
+               rem_count++;
+               if (rem_count == 2)
+               {
+                       g_thread_create((GThreadFunc)ghb_cache_volnames, ud, FALSE, NULL);
+                       if (ud->current_dvd_device != NULL &&
+                               strcmp(device, ud->current_dvd_device) == 0)
+                       {
+                               ghb_hb_cleanup(TRUE);
+                               prune_logs(ud);
+                               ghb_backend_scan("/dev/null", 0, 1);
+                       }
+               }
+       }
+}
+
+static gchar
+FindDriveFromMask(ULONG unitmask)
+{
+       gchar cc;
+       for (cc = 0; cc < 26; cc++)
+       {
+               if (unitmask & 0x01)
+                       return 'A' + cc;
+               unitmask >>= 1;
+       }
+       return 0;
 }
 
 void
+wm_drive_changed(MSG *msg, signal_user_data_t *ud)
+{
+       PDEV_BROADCAST_HDR bch = (PDEV_BROADCAST_HDR)msg->lParam;
+       gchar drive[4];
+
+       g_strlcpy(drive, "A:" G_DIR_SEPARATOR_S, 4);
+       switch (msg->wParam)
+       {
+               case DBT_DEVICEARRIVAL:
+               {
+                       if (bch->dbch_devicetype == DBT_DEVTYP_VOLUME)
+                       {
+                               PDEV_BROADCAST_VOLUME bcv = (PDEV_BROADCAST_VOLUME)bch;
+
+                               if (bcv->dbcv_flags & DBTF_MEDIA)
+                               {
+                                       drive[0] = FindDriveFromMask(bcv->dbcv_unitmask);
+                                       handle_media_change(drive, TRUE, ud);
+                               }
+                       }
+               } break;
+
+               case DBT_DEVICEREMOVECOMPLETE:
+               {
+                       if (bch->dbch_devicetype == DBT_DEVTYP_VOLUME)
+                       {
+                               PDEV_BROADCAST_VOLUME bcv = (PDEV_BROADCAST_VOLUME)bch;
+
+                               if (bcv->dbcv_flags & DBTF_MEDIA)
+                               {
+                                       drive[0] = FindDriveFromMask(bcv->dbcv_unitmask);
+                                       handle_media_change(drive, FALSE, ud);
+                               }
+                       }
+               } break;
+               default: ;
+       }
+}
+
+#else
+
+G_MODULE_EXPORT void
 drive_changed_cb(GVolumeMonitor *gvm, GDrive *gd, signal_user_data_t *ud)
 {
        gchar *device;
-       gint state = ghb_get_state();
-       static gboolean first_time = TRUE;
+       gint state;
+
+       g_debug("drive_changed_cb()");
+       g_thread_create((GThreadFunc)ghb_cache_volnames, ud, FALSE, NULL);
 
-       if (ud->current_dvd_device == NULL) return;
-       // A drive change event happens when the program initially starts
-       // and I don't want to automatically scan at that time.
-       if (first_time)
+       state = ghb_get_scan_state();
+       device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+       if (ud->current_dvd_device == NULL ||
+               strcmp(device, ud->current_dvd_device) != 0 ||
+               state != GHB_STATE_IDLE )
        {
-               first_time = FALSE;
                return;
        }
-       if (state != GHB_STATE_IDLE) return;
-       device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE);
+       if (g_drive_has_media(gd))
+       {
+               show_scan_progress(ud);
+               update_source_label(ud, device);
+               gint preview_count;
+               preview_count = ghb_settings_get_int(ud->settings, "preview_count");
+               ghb_backend_scan(device, 0, preview_count);
+       }
+       else
+       {
+               ghb_hb_cleanup(TRUE);
+               prune_logs(ud);
+               ghb_backend_scan("/dev/null", 0, 1);
+       }
+}
+#endif
+
+#if !defined(_WIN32)
+static void
+dbus_init (void)
+{
+       dbus_g_thread_init();
+}
+
+#define GPM_DBUS_PM_SERVICE                    "org.freedesktop.PowerManagement"
+#define GPM_DBUS_PM_PATH                       "/org/freedesktop/PowerManagement"
+#define GPM_DBUS_PM_INTERFACE          "org.freedesktop.PowerManagement"
+#define GPM_DBUS_INHIBIT_PATH          "/org/freedesktop/PowerManagement/Inhibit"
+#define GPM_DBUS_INHIBIT_INTERFACE     "org.freedesktop.PowerManagement.Inhibit" 
+static gboolean gpm_inhibited = FALSE;
+static guint gpm_cookie = -1;
+#endif
+
+static gboolean
+ghb_can_suspend_gpm()
+{
+       gboolean can_suspend = FALSE;
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
        
-       // DVD insertion detected.  Scan it.
-       if (strcmp(device, ud->current_dvd_device) == 0)
+
+       g_debug("ghb_can_suspend_gpm()");
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return FALSE;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                                                       GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+               dbus_g_connection_unref(conn);
+               return FALSE;
+       }
+       res = dbus_g_proxy_call(proxy, "CanSuspend", &error,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_BOOLEAN, &can_suspend,
+                                                       G_TYPE_INVALID);
+       if (!res)
        {
-               if (g_drive_has_media (gd))
+               if (error != NULL)
                {
-                       GtkProgressBar *progress;
-                       progress = GTK_PROGRESS_BAR(GHB_WIDGET (ud->builder, "progressbar"));
-                       gtk_progress_bar_set_text (progress, "Scanning ...");
-                       gtk_progress_bar_set_fraction (progress, 0);
-                       update_source_label(ud, device);
-                       ghb_hb_cleanup(TRUE);
-                       ghb_backend_scan(device, 0);
+                       g_warning("CanSuspend failed: %s", error->message);
+                       g_error_free(error);
                }
                else
+                       g_warning("CanSuspend failed");
+               // Try to shutdown anyway
+               can_suspend = TRUE;
+       }
+       g_object_unref(G_OBJECT(proxy));
+       dbus_g_connection_unref(conn);
+#endif
+       return can_suspend;
+}
+
+static void
+ghb_suspend_gpm()
+{
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
+
+       g_debug("ghb_suspend_gpm()");
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                                                       GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+               dbus_g_connection_unref(conn);
+               return;
+       }
+       res = dbus_g_proxy_call(proxy, "Suspend", &error,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_INVALID);
+       if (!res)
+       {
+               if (error != NULL)
                {
-                       ghb_hb_cleanup(TRUE);
-                       ghb_backend_scan("/dev/null", 0);
+                       g_warning("Suspend failed: %s", error->message);
+                       g_error_free(error);
                }
+               else
+                       g_warning("Suspend failed");
        }
-       g_free(device);
+       g_object_unref(G_OBJECT(proxy));
+       dbus_g_connection_unref(conn);
+#endif
 }
 
-
 static gboolean
-dbus_init (void)
+ghb_can_shutdown_gpm()
 {
-       DBusError error;
-
-       if (dbus_connection != NULL)
-               return TRUE;
+       gboolean can_shutdown = FALSE;
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
 
-       dbus_error_init (&error);
-       if (!(dbus_connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error))) {
-               g_debug ("could not get system bus: %s", error.message);
-               dbus_error_free (&error);
+       g_debug("ghb_can_shutdown_gpm()");
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return FALSE;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                                                       GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+               dbus_g_connection_unref(conn);
                return FALSE;
        }
+       res = dbus_g_proxy_call(proxy, "CanShutdown", &error,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_BOOLEAN, &can_shutdown,
+                                                       G_TYPE_INVALID);
+       if (!res)
+       {
+               if (error != NULL)
+               {
+                       g_warning("CanShutdown failed: %s", error->message);
+                       g_error_free(error);
+               }
+               else
+                       g_warning("CanShutdown failed");
+               // Try to shutdown anyway
+               can_shutdown = TRUE;
+       }
+       g_object_unref(G_OBJECT(proxy));
+       dbus_g_connection_unref(conn);
+#endif
+       return can_shutdown;
+}
 
-       //dbus_connection_setup_with_g_main (dbus_connection, NULL);
-       //dbus_connection_set_exit_on_disconnect (dbus_connection, FALSE);
-       //dbus_connection_add_filter (dbus_connection, gvm_dbus_filter_function, NULL, NULL);
+static void
+ghb_shutdown_gpm()
+{
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
 
-       return TRUE;
+       g_debug("ghb_shutdown_gpm()");
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                                                       GPM_DBUS_PM_PATH, GPM_DBUS_PM_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+               dbus_g_connection_unref(conn);
+               return;
+       }
+       res = dbus_g_proxy_call(proxy, "Shutdown", &error,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_INVALID);
+       if (!res)
+       {
+               if (error != NULL)
+               {
+                       g_warning("Shutdown failed: %s", error->message);
+                       g_error_free(error);
+               }
+               else
+                       g_warning("Shutdown failed");
+       }
+       g_object_unref(G_OBJECT(proxy));
+       dbus_g_connection_unref(conn);
+#endif
+}
+
+void
+ghb_inhibit_gpm()
+{
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
+
+       if (gpm_inhibited)
+       {
+               // Already inhibited
+               return;
+       }
+       g_debug("ghb_inhibit_gpm()");
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                                                       GPM_DBUS_INHIBIT_PATH, GPM_DBUS_INHIBIT_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+               dbus_g_connection_unref(conn);
+               return;
+       }
+       res = dbus_g_proxy_call(proxy, "Inhibit", &error,
+                                                       G_TYPE_STRING, "ghb",
+                                                       G_TYPE_STRING, "Encoding",
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_UINT, &gpm_cookie,
+                                                       G_TYPE_INVALID);
+       gpm_inhibited = TRUE;
+       if (!res)
+       {
+               if (error != NULL)
+               {
+                       g_warning("Inhibit failed: %s", error->message);
+                       g_error_free(error);
+                       gpm_cookie = -1;
+               }
+               else
+                       g_warning("Inhibit failed");
+               gpm_cookie = -1;
+               gpm_inhibited = FALSE;
+       }
+       g_object_unref(G_OBJECT(proxy));
+       dbus_g_connection_unref(conn);
+#endif
+}
+
+void
+ghb_uninhibit_gpm()
+{
+#if !defined(_WIN32)
+       DBusGConnection *conn;
+       DBusGProxy      *proxy;
+       GError *error = NULL;
+       gboolean res;
+       
+       g_debug("ghb_uninhibit_gpm() gpm_cookie %u", gpm_cookie);
+
+       if (!gpm_inhibited)
+       {
+               // Not inhibited
+               return;
+       }
+       conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
+       if (error != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", error->message);
+               g_error_free(error);
+               return;
+       }
+       proxy = dbus_g_proxy_new_for_name(conn, GPM_DBUS_PM_SERVICE,
+                                                       GPM_DBUS_INHIBIT_PATH, GPM_DBUS_INHIBIT_INTERFACE);
+       if (proxy == NULL)
+       {
+               g_warning("Could not get DBUS proxy: %s", GPM_DBUS_PM_SERVICE);
+               dbus_g_connection_unref(conn);
+               return;
+       }
+       res = dbus_g_proxy_call(proxy, "UnInhibit", &error,
+                                                       G_TYPE_UINT, gpm_cookie,
+                                                       G_TYPE_INVALID,
+                                                       G_TYPE_INVALID);
+       if (!res)
+       {
+               if (error != NULL)
+               {
+                       g_warning("UnInhibit failed: %s", error->message);
+                       g_error_free(error);
+               }
+               else
+                       g_warning("UnInhibit failed");
+       }
+       gpm_inhibited = FALSE;
+       dbus_g_connection_unref(conn);
+       g_object_unref(G_OBJECT(proxy));
+#endif
 }
 
 void
 ghb_hal_init()
 {
+#if !defined(_WIN32)
+       DBusGConnection *gconn;
+       DBusConnection *conn;
+       GError *gerror = NULL;
        DBusError error;
        char **devices;
        int nr;
 
-       if (!dbus_init ())
-               return;
+       dbus_init ();
 
        if (!(hal_ctx = libhal_ctx_new ())) {
                g_warning ("failed to create a HAL context!");
                return;
        }
 
-       libhal_ctx_set_dbus_connection (hal_ctx, dbus_connection);
+       gconn = dbus_g_bus_get(DBUS_BUS_SYSTEM, &gerror);
+       if (gerror != NULL)
+       {
+               g_warning("DBUS cannot connect: %s", gerror->message);
+               g_error_free(gerror);
+               return;
+       }
+       conn = dbus_g_connection_get_connection(gconn);
+       libhal_ctx_set_dbus_connection (hal_ctx, conn);
        dbus_error_init (&error);
        if (!libhal_ctx_init (hal_ctx, &error)) {
                g_warning ("libhal_ctx_init failed: %s", error.message ? error.message : "unknown");
                dbus_error_free (&error);
                libhal_ctx_free (hal_ctx);
+               dbus_g_connection_unref(gconn);
                return;
        }
 
@@ -2747,15 +3826,16 @@ ghb_hal_init()
 
                libhal_ctx_shutdown (hal_ctx, NULL);
                libhal_ctx_free (hal_ctx);
+               dbus_g_connection_unref(gconn);
                return;
        }
 
        libhal_free_string_array (devices);
-
-       //gvm_hal_claim_branch ("/org/freedesktop/Hal/devices/local");
+       dbus_g_connection_unref(gconn);
+#endif
 }
 
-gboolean 
+G_MODULE_EXPORT gboolean 
 tweak_setting_cb(
        GtkWidget *widget, 
        GdkEventButton *event, 
@@ -2817,7 +3897,7 @@ tweak_setting_cb(
        return ret;
 }
 
-gboolean 
+G_MODULE_EXPORT gboolean 
 easter_egg_cb(
        GtkWidget *widget, 
        GdkEventButton *event, 
@@ -2843,7 +3923,7 @@ easter_egg_cb(
        return FALSE;
 }
 
-gchar*
+G_MODULE_EXPORT gchar*
 format_deblock_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
 {
        if (val < 5.0)
@@ -2855,3 +3935,329 @@ format_deblock_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
                return g_strdup_printf("%d", (gint)val);
        }
 }
+
+G_MODULE_EXPORT gchar*
+format_drc_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
+{
+       if (val <= 0.0)
+       {
+               return g_strdup_printf("Off");
+       }
+       else
+       {
+               return g_strdup_printf("%.1f", val);
+       }
+}
+
+G_MODULE_EXPORT gchar*
+format_vquality_cb(GtkScale *scale, gdouble val, signal_user_data_t *ud)
+{
+       gdouble percent;
+
+       gint vcodec = ghb_settings_combo_int(ud->settings, "VideoEncoder");
+       switch (vcodec)
+       {
+               case HB_VCODEC_X264:
+               {
+                       gboolean crf;
+                       crf = ghb_settings_get_boolean(ud->settings, "constant_rate_factor");
+                       percent = 100. * (51 - val) / 51.;
+                       if (crf)
+                               return g_strdup_printf("RF: %.4g (%.0f%%)", val, percent);
+                       else
+                               return g_strdup_printf("QP: %.4g (%.0f%%)", val, percent);
+               } break;
+
+               case HB_VCODEC_FFMPEG:
+               {
+                       percent = 100. * (30 - (val - 1)) / 30.;
+                       return g_strdup_printf("QP: %d (%.0f%%)", (int)val, percent);
+               } break;
+
+               case HB_VCODEC_THEORA:
+               {
+                       percent = 100. * val / 63.;
+                       return g_strdup_printf("QP: %d (%.0f%%)", (int)val, percent);
+               } break;
+
+               default:
+               {
+                       percent = 0;
+               } break;
+       }
+       return g_strdup_printf("QP: %.1f / %.1f%%", val, percent);
+}
+
+static void
+process_appcast(signal_user_data_t *ud)
+{
+       gchar *description = NULL, *build = NULL, *version = NULL, *msg;
+#if !defined(_WIN32)
+       GtkWidget *window;
+       static GtkWidget *html = NULL;
+#endif
+       GtkWidget *dialog, *label;
+       gint    response, ibuild = 0, skip;
+
+       if (ud->appcast == NULL || ud->appcast_len < 15 || 
+               strncmp(&(ud->appcast[9]), "200 OK", 6))
+       {
+               goto done;
+       }
+       ghb_appcast_parse(ud->appcast, &description, &build, &version);
+       if (build)
+               ibuild = g_strtod(build, NULL);
+       skip = ghb_settings_get_int(ud->settings, "update_skip_version");
+       if (description == NULL || build == NULL || version == NULL 
+               || ibuild <= hb_get_build(NULL) || skip == ibuild)
+       {
+               goto done;
+       }
+       msg = g_strdup_printf("HandBrake %s/%s is now available (you have %s/%d).",
+                       version, build, hb_get_version(NULL), hb_get_build(NULL));
+       label = GHB_WIDGET(ud->builder, "update_message");
+       gtk_label_set_text(GTK_LABEL(label), msg);
+
+#if !defined(_WIN32)
+       if (html == NULL)
+       {
+               html = webkit_web_view_new();
+               window = GHB_WIDGET(ud->builder, "update_scroll");
+               gtk_container_add(GTK_CONTAINER(window), html);
+               // Show it
+               gtk_widget_set_size_request(html, 420, 240);
+               gtk_widget_show(html);
+       }
+       webkit_web_view_open(WEBKIT_WEB_VIEW(html), description);
+#endif
+       dialog = GHB_WIDGET(ud->builder, "update_dialog");
+       response = gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_hide(dialog);
+       if (response == GTK_RESPONSE_OK)
+       {
+               // Skip
+               ghb_settings_set_int(ud->settings, "update_skip_version", ibuild);
+               ghb_pref_save(ud->settings, "update_skip_version");
+       }
+       g_free(msg);
+
+done:
+       if (description) g_free(description);
+       if (build) g_free(build);
+       if (version) g_free(version);
+       g_free(ud->appcast);
+       ud->appcast_len = 0;
+       ud->appcast = NULL;
+       appcast_busy = FALSE;
+}
+
+void
+ghb_net_close(GIOChannel *ioc)
+{
+       gint fd;
+
+       g_debug("ghb_net_close");
+       if (ioc == NULL) return;
+       fd = g_io_channel_unix_get_fd(ioc);
+       close(fd);
+       g_io_channel_unref(ioc);
+}
+
+G_MODULE_EXPORT gboolean
+ghb_net_recv_cb(GIOChannel *ioc, GIOCondition cond, gpointer data)
+{
+       gchar buf[2048];
+       gsize len;
+       GError *gerror = NULL;
+       GIOStatus status;
+       
+       g_debug("ghb_net_recv_cb");
+       signal_user_data_t *ud = (signal_user_data_t*)data;
+
+       status = g_io_channel_read_chars (ioc, buf, 2048, &len, &gerror);
+       if ((status == G_IO_STATUS_NORMAL || status == G_IO_STATUS_EOF) &&
+               len > 0)
+       {
+               gint new_len = ud->appcast_len + len;
+               ud->appcast = g_realloc(ud->appcast, new_len + 1);
+               memcpy(&(ud->appcast[ud->appcast_len]), buf, len);
+               ud->appcast_len = new_len;
+       }
+       if (status == G_IO_STATUS_EOF)
+       {
+               ud->appcast[ud->appcast_len] = 0;
+               ghb_net_close(ioc);
+               process_appcast(ud);
+               return FALSE;
+       }
+       return TRUE;
+}
+
+GIOChannel*
+ghb_net_open(signal_user_data_t *ud, gchar *address, gint port)
+{
+       GIOChannel *ioc;
+       gint fd;
+
+       struct sockaddr_in   sock;
+       struct hostent     * host;
+
+       g_debug("ghb_net_open");
+       if( !( host = gethostbyname( address ) ) )
+       {
+               g_warning( "gethostbyname failed (%s)", address );
+               appcast_busy = FALSE;
+               return NULL;
+       }
+
+       memset( &sock, 0, sizeof( struct sockaddr_in ) );
+       sock.sin_family = host->h_addrtype;
+       sock.sin_port   = htons( port );
+       memcpy( &sock.sin_addr, host->h_addr, host->h_length );
+
+       fd = socket(host->h_addrtype, SOCK_STREAM, 0);
+       if( fd < 0 )
+       {
+               g_debug( "socket failed" );
+               appcast_busy = FALSE;
+               return NULL;
+       }
+
+       if(connect(fd, (struct sockaddr*)&sock, sizeof(struct sockaddr_in )) < 0 )
+       {
+               g_debug( "connect failed" );
+               appcast_busy = FALSE;
+               return NULL;
+       }
+       ioc = g_io_channel_unix_new(fd);
+       g_io_channel_set_encoding (ioc, NULL, NULL);
+       g_io_channel_set_flags(ioc, G_IO_FLAG_NONBLOCK, NULL);
+       g_io_add_watch (ioc, G_IO_IN, ghb_net_recv_cb, (gpointer)ud );
+
+       return ioc;
+}
+
+gpointer
+ghb_check_update(signal_user_data_t *ud)
+{
+       gchar *query;
+       gsize len;
+       GIOChannel *ioc;
+       GError *gerror = NULL;
+       GRegex *regex;
+       GMatchInfo *mi;
+       gchar *host, *appcast;
+
+       g_debug("ghb_check_update");
+       appcast_busy = TRUE;
+       regex = g_regex_new("^http://(.+)/(.+)$", 0, 0, NULL);
+       if (!g_regex_match(regex, HB_PROJECT_URL_APPCAST, 0, &mi))
+       {
+               return NULL;
+       }
+
+       host = g_match_info_fetch(mi, 1);
+       appcast = g_match_info_fetch(mi, 2);
+
+       if (host == NULL || appcast == NULL)
+               return NULL;
+
+       query = g_strdup_printf( "GET /%s HTTP/1.0\r\nHost: %s\r\n\r\n",
+                                                       appcast, host);
+
+       ioc = ghb_net_open(ud, host, 80);
+       if (ioc == NULL)
+               return NULL;
+
+       g_io_channel_write_chars(ioc, query, strlen(query), &len, &gerror);
+       g_io_channel_flush(ioc, &gerror);
+       g_free(query);
+       g_free(host);
+       g_free(appcast);
+       g_match_info_free(mi);
+       g_regex_unref(regex);
+       return NULL;
+}
+
+G_MODULE_EXPORT gboolean
+hb_visibility_event_cb(
+       GtkWidget *widget, 
+       GdkEventVisibility *vs, 
+       signal_user_data_t *ud)
+{
+       ud->hb_visibility = vs->state;
+       return FALSE;
+}
+
+G_MODULE_EXPORT void
+status_activate_cb(GtkStatusIcon *si, signal_user_data_t *ud)
+{
+       GtkWindow *window;
+       GdkWindowState state;
+
+       window = GTK_WINDOW(GHB_WIDGET(ud->builder, "hb_window"));
+       state = gdk_window_get_state(GTK_WIDGET(window)->window);
+       if ((state & GDK_WINDOW_STATE_ICONIFIED) ||
+               (ud->hb_visibility != GDK_VISIBILITY_UNOBSCURED))
+       {
+               gtk_window_present(window);
+               gtk_window_set_skip_taskbar_hint(window, FALSE);
+       }
+       else
+       {
+               gtk_window_set_skip_taskbar_hint(window, TRUE);
+               gtk_window_iconify(window);
+       }
+}
+
+#if !defined(_WIN32)
+G_MODULE_EXPORT void
+notify_closed_cb(NotifyNotification *notification, signal_user_data_t *ud)
+{
+       g_object_unref(G_OBJECT(notification));
+}
+#endif
+
+void
+ghb_notify_done(signal_user_data_t *ud)
+{
+       GtkStatusIcon *si;
+
+       if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 0)
+               return;
+
+       si = GTK_STATUS_ICON(GHB_OBJECT(ud->builder, "hb_status"));
+
+#if !defined(_WIN32)
+       NotifyNotification *notification;
+       notification = notify_notification_new(
+               "Encode Complete",
+               "Put down that cocktail, Your HandBrake queue is done!",
+               "hb-icon",
+               NULL);
+       notify_notification_attach_to_status_icon(notification, si);
+       g_signal_connect(notification, "closed", (GCallback)notify_closed_cb, ud);
+       notify_notification_show(notification, NULL);
+#endif
+
+       if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 3)
+       {
+               if (ghb_can_shutdown_gpm())
+               {
+                       ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
+                               "Your encode is complete.",
+                               "Shutting down the computer", 
+                               "Cancel", (GSourceFunc)shutdown_cb, 60);
+               }
+       }
+       if (ghb_settings_combo_int(ud->settings, "WhenComplete") == 2)
+       {
+               if (ghb_can_suspend_gpm())
+               {
+                       ghb_countdown_dialog(GTK_MESSAGE_WARNING, 
+                               "Your encode is complete.",
+                               "Putting computer to sleep", 
+                               "Cancel", (GSourceFunc)suspend_cb, 60);
+               }
+       }
+}