LinGui: Picture Filter enhancements

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

diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
index adf409e..05cae3b 100644 (file)
--- a/gtk/src/queuehandler.c
+++ b/gtk/src/queuehandler.c
@@ -74,6 +74,7 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
        gint source_width, source_height;
        gboolean pass2, anamorphic, round_dim, keep_aspect, vqtype, turbo;
        gboolean tweaks;
+       gchar *escape;
        
        g_debug("update_queue_list ()");
        if (settings == NULL) return;
@@ -81,21 +82,24 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
        store = GTK_TREE_STORE(gtk_tree_view_get_model(treeview));
                
        tweaks = ghb_settings_get_boolean(settings, "allow_tweaks");
-       title = ghb_settings_combo_int(settings, "title");
+       title = ghb_settings_get_int(settings, "titlenum");
        start_chapter = ghb_settings_get_int(settings, "start_chapter");
        end_chapter = ghb_settings_get_int(settings, "end_chapter");
        pass2 = ghb_settings_get_boolean(settings, "VideoTwoPass");
        vol_name = ghb_settings_get_string(settings, "volume_label");
        dest = ghb_settings_get_string(settings, "destination");
        basename = g_path_get_basename(dest);
+       escape = g_markup_escape_text(basename, -1);
        info = g_strdup_printf 
        (
                "<big><b>%s</b></big> "
                "<small>(Title %d, Chapters %d through %d, %d Video %s)"
                " --> %s</small>",
-                vol_name, title+1, start_chapter, end_chapter, 
-                pass2 ? 2:1, pass2 ? "Passes":"Pass", basename
+                vol_name, title, start_chapter, end_chapter, 
+                pass2 ? 2:1, pass2 ? "Passes":"Pass", escape
        );
+       g_free(basename);
+       g_free(escape);
 
        if (piter)
                iter = *piter;
@@ -176,8 +180,9 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
                        g_string_append_printf(str, "</small>\n");
                }
        }
+       escape = g_markup_escape_text(dest, -1);
        g_string_append_printf(str, 
-               "<b>Destination:</b> <small>%s</small>\n", dest);
+               "<b>Destination:</b> <small>%s</small>\n", escape);
 
        width = ghb_settings_get_int(settings, "scale_width");
        height = ghb_settings_get_int(settings, "scale_height");
@@ -253,7 +258,7 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
        if (strcmp("source", fps) == 0)
        {
                g_free(fps);
-               if (ghb_settings_get_boolean(settings, "PictureDetelecine"))
+               if (ghb_settings_combo_int(settings, "PictureDetelecine"))
                        fps = g_strdup("Same As Source (vfr detelecine)");
                else
                        fps = g_strdup("Same As Source (variable)");
@@ -276,9 +281,9 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
        gboolean decomb;
        gboolean filters = FALSE;
 
-       decomb = ghb_settings_get_boolean(settings, "PictureDecomb");
+       decomb = ghb_settings_combo_int(settings, "PictureDecomb");
        g_string_append_printf(str, "<b>Filters:</b><small>");
-       if (ghb_settings_get_boolean(settings, "PictureDetelecine"))
+       if (ghb_settings_combo_int(settings, "PictureDetelecine"))
        {
                g_string_append_printf(str, " - Detelecine");
                filters = TRUE;
@@ -290,22 +295,20 @@ add_to_queue_list(signal_user_data_t *ud, GValue *settings, GtkTreeIter *piter)
        }
        else
        {
-               gint deint = ghb_settings_combo_int(settings, 
-                                       tweaks ? "tweak_PictureDeinterlace":"PictureDeinterlace");
+               gint deint = ghb_settings_combo_int(settings, "PictureDeinterlace");
                if (deint)
                {
                        const gchar *opt = ghb_settings_combo_option(settings,
-                                       tweaks ? "tweak_PictureDeinterlace":"PictureDeinterlace");
+                                                                                                       "PictureDeinterlace");
                        g_string_append_printf(str, " - Deinterlace: %s", opt);
                        filters = TRUE;
                }
        }
-       gint denoise = ghb_settings_combo_int(settings, 
-                               tweaks ? "tweak_PictureDenoise":"PictureDenoise");
+       gint denoise = ghb_settings_combo_int(settings, "PictureDenoise");
        if (denoise)
        {
                const gchar *opt = ghb_settings_combo_option(settings,
-                               tweaks ? "tweak_PictureDenoise":"PictureDenoise");
+                                                                                                       "PictureDenoise");
                g_string_append_printf(str, " - Denoise: %s", opt);
                filters = TRUE;
        }
@@ -997,6 +1000,14 @@ ghb_reload_queue(signal_user_data_t *ud)
        gchar *message;
 
        g_debug("ghb_reload_queue");
+
+       // I really shouldn't have to do this, but at startup the
+       // initial window size is larger than it should be.  This
+       // make it adjust to the proper size.
+       GtkWindow *hb_window;
+       hb_window = GTK_WINDOW(GHB_WIDGET (ud->builder, "hb_window"));
+       gtk_window_resize(hb_window, 16, 16);
+
        queue = ghb_load_queue();
        // Look for unfinished entries
        count = ghb_array_len(queue);