LinGui: Make preset key/values mostly align with macui presets.

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

diff --git a/gtk/src/main.c b/gtk/src/main.c
index 52c581c..c9021c5 100644 (file)
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -357,6 +357,8 @@ bind_audio_tree_model (signal_user_data_t *ud)
 }
 
 extern void presets_list_selection_changed_cb(void);
+extern void presets_drag_cb(void);
+extern void presets_drag_motion_cb(void);
 
 // Create and bind the tree model to the tree view for the preset list
 // Also, connect up the signal that lets us know the selection has changed
@@ -365,15 +367,18 @@ bind_presets_tree_model (signal_user_data_t *ud)
 {
        GtkCellRenderer *cell;
        GtkTreeViewColumn *column;
-       GtkListStore *treestore;
+       GtkTreeStore *treestore;
        GtkTreeView  *treeview;
        GtkTreeSelection *selection;
        GtkWidget *widget;
+       GtkTargetEntry SrcEntry;
+       SrcEntry.target = "DATA";
+       SrcEntry.flags = GTK_TARGET_SAME_WIDGET;
 
        g_debug("bind_presets_tree_model ()\n");
        treeview = GTK_TREE_VIEW(GHB_WIDGET (ud->builder, "presets_list"));
        selection = gtk_tree_view_get_selection (treeview);
-       treestore = gtk_list_store_new(5, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, 
+       treestore = gtk_tree_store_new(5, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, 
                                                                   G_TYPE_STRING, G_TYPE_STRING);
        gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
 
@@ -381,7 +386,16 @@ bind_presets_tree_model (signal_user_data_t *ud)
        column = gtk_tree_view_column_new_with_attributes(_("Preset Name"), cell, 
                                        "text", 0, "weight", 1, "style", 2, "foreground", 3, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+       gtk_tree_view_column_set_expand (column, TRUE);
        gtk_tree_view_set_tooltip_column (treeview, 4);
+
+       gtk_tree_view_enable_model_drag_dest (treeview, &SrcEntry, 1, 
+                                                                                       GDK_ACTION_MOVE);
+       gtk_tree_view_enable_model_drag_source (treeview, GDK_BUTTON1_MASK, 
+                                                                                       &SrcEntry, 1, GDK_ACTION_MOVE);
+
+       g_signal_connect(treeview, "drag_data_received", presets_drag_cb, ud);
+       g_signal_connect(treeview, "drag_motion", presets_drag_motion_cb, ud);
        g_signal_connect(selection, "changed", presets_list_selection_changed_cb, ud);
        widget = GHB_WIDGET (ud->builder, "presets_remove");
        gtk_widget_set_sensitive(widget, FALSE);
@@ -431,11 +445,13 @@ typedef struct
 
 static gchar *dvd_device = NULL;
 static gchar *arg_preset = NULL;
+static gboolean ghb_debug = FALSE;
 
 static GOptionEntry entries[] = 
 {
        { "device", 'd', 0, G_OPTION_ARG_FILENAME, &dvd_device, "The device or file to encode", NULL },
        { "preset", 'p', 0, G_OPTION_ARG_STRING, &arg_preset, "The preset values to use for encoding", NULL },
+       { "debug", 'x', 0, G_OPTION_ARG_NONE, &ghb_debug, "Spam a lot", NULL },
        { NULL }
 };
 
@@ -470,7 +486,7 @@ main (int argc, char *argv[])
 {
        GtkWidget *window;
        signal_user_data_t *ud;
-       gchar *preset;
+       GValue *preset;
        GError *error = NULL;
        GOptionContext *context;
 
@@ -498,7 +514,7 @@ main (int argc, char *argv[])
 #endif
 
        ud = g_malloc(sizeof(signal_user_data_t));
-       ud->debug = FALSE;
+       ud->debug = ghb_debug;
        ud->cancel_encode = FALSE;
        g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, debug_log_handler, ud);
        ud->settings = ghb_settings_new();
@@ -517,7 +533,7 @@ main (int argc, char *argv[])
        // since it can't be done automatically
        GtkTextView *textview;
        GtkTextBuffer *buffer;
-       textview = GTK_TEXT_VIEW(GHB_WIDGET (ud->builder, "x264_options"));
+       textview = GTK_TEXT_VIEW(GHB_WIDGET (ud->builder, "x264Option"));
        buffer = gtk_text_view_get_buffer (textview);
        g_signal_connect(buffer, "changed", (GCallback)x264_entry_changed_cb, ud);
 
@@ -554,14 +570,14 @@ main (int argc, char *argv[])
        }
        gboolean tweaks = ghb_settings_get_boolean(ud->settings, "allow_tweaks");
        GtkWidget *widget;
-       widget = GHB_WIDGET(ud->builder, "deinterlace");
+       widget = GHB_WIDGET(ud->builder, "PictureDeinterlace");
        tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-       widget = GHB_WIDGET(ud->builder, "tweak_deinterlace");
+       widget = GHB_WIDGET(ud->builder, "tweak_PictureDeinterlace");
        !tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
 
-       widget = GHB_WIDGET(ud->builder, "denoise");
+       widget = GHB_WIDGET(ud->builder, "PictureDenoise");
        tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
-       widget = GHB_WIDGET(ud->builder, "tweak_denoise");
+       widget = GHB_WIDGET(ud->builder, "tweak_PictureDenoise");
        !tweaks ? gtk_widget_hide(widget) : gtk_widget_show(widget);
 
        gchar *source = ghb_settings_get_string(ud->settings, "default_source");
@@ -572,17 +588,20 @@ main (int argc, char *argv[])
        ghb_x264_parse_options(ud, "");
 
        // Populate the presets tree view
-       ghb_presets_list_update(ud);
+       ghb_presets_list_init(ud, NULL, 0);
        // Get the first preset name
        if (arg_preset != NULL)
        {
-               ghb_select_preset(ud->builder, arg_preset);
+               preset = ghb_parse_preset_path(arg_preset);
+               if (preset)
+               {
+                       ghb_select_preset(ud->builder, preset);
+                       ghb_value_free(preset);
+               }
        }
        else
        {
-               preset = ghb_settings_get_string (ud->settings, "default_preset");
-               ghb_select_preset(ud->builder, preset);
-               g_free(preset);
+               ghb_select_default_preset(ud->builder);
        }
 
        // Grey out widgets that are dependent on a disabled feature