LinGui: automatically update the built-in presets when the hb build number changes

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

diff --git a/gtk/src/main.c b/gtk/src/main.c
index a9c07fa..ef0dc18 100644 (file)
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -342,6 +342,8 @@ bind_audio_tree_model (signal_user_data_t *ud)
        column = gtk_tree_view_column_new_with_attributes(
                                                                        _("Track"), cell, "text", 0, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+       gtk_tree_view_column_set_min_width (column, 210);
+       gtk_tree_view_column_set_max_width (column, 210);
 
        cell = gtk_cell_renderer_text_new();
        column = gtk_tree_view_column_new_with_attributes(
@@ -357,11 +359,13 @@ bind_audio_tree_model (signal_user_data_t *ud)
        column = gtk_tree_view_column_new_with_attributes(
                                                                        _("Sample Rate"), cell, "text", 3, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+       gtk_tree_view_column_set_min_width (column, 120);
 
        cell = gtk_cell_renderer_text_new();
        column = gtk_tree_view_column_new_with_attributes(
                                                                        _("Mix"), cell, "text", 4, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+       gtk_tree_view_column_set_min_width (column, 120);
 
        cell = gtk_cell_renderer_text_new();
        column = gtk_tree_view_column_new_with_attributes(
@@ -377,8 +381,10 @@ bind_audio_tree_model (signal_user_data_t *ud)
 }
 
 extern G_MODULE_EXPORT void subtitle_list_selection_changed_cb(void);
+extern G_MODULE_EXPORT void subtitle_enable_toggled_cb(void);
 extern G_MODULE_EXPORT void subtitle_forced_toggled_cb(void);
 extern G_MODULE_EXPORT void subtitle_burned_toggled_cb(void);
+extern G_MODULE_EXPORT void subtitle_track_changed_cb(void);
 
 // Create and bind the tree model to the tree view for the subtitle track list
 // Also, connect up the signal that lets us know the selection has changed
@@ -397,37 +403,44 @@ bind_subtitle_tree_model (signal_user_data_t *ud)
        selection = gtk_tree_view_get_selection (treeview);
        // 6 columns in model.  4 are visible, the other 2 is for storing
        // values that I need
-       treestore = gtk_list_store_new(8, 
-                                                                       G_TYPE_STRING,
+       treestore = gtk_list_store_new(7, 
+                                                                       G_TYPE_BOOLEAN, G_TYPE_STRING,
                                                                        G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
-                                                                       G_TYPE_STRING,  G_TYPE_STRING, 
-                                                                       G_TYPE_STRING,  G_TYPE_INT, 
-                                                                       G_TYPE_INT);
+                                                                       G_TYPE_STRING,  G_TYPE_STRING,
+                                                                       G_TYPE_BOOLEAN);
        gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
 
-       cell = gtk_cell_renderer_text_new();
+       cell = gtk_cell_renderer_toggle_new();
+       column = gtk_tree_view_column_new_with_attributes(
+                                                                       _("On"), cell, "active", 0, NULL);
+       gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+       g_signal_connect(cell, "toggled", subtitle_enable_toggled_cb, ud);
+
+       cell = gtk_cell_renderer_combo_new();
+       ghb_subtitle_track_model(ud, -1);
+       g_object_set(G_OBJECT(cell), "model", ud->subtitle_track_model,
+       "text-column", 0, "editable", TRUE, "width", 200, "has-entry", FALSE, NULL);
        column = gtk_tree_view_column_new_with_attributes( _("Track"), cell, 
-                               "text", 0, "foreground", 5, "weight", 6, "style", 7, NULL);
+                               "text", 1, NULL);
        gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+       g_signal_connect(cell, "changed", subtitle_track_changed_cb, ud);
 
        cell = gtk_cell_renderer_toggle_new();
        column = gtk_tree_view_column_new_with_attributes(
-                                                                       _("Forced Only"), cell, "active", 1, NULL);
-       gtk_tree_view_column_set_max_width (column, 50);
+                                                                       _("Forced Only"), cell, "active", 2, NULL);
        gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
        g_signal_connect(cell, "toggled", subtitle_forced_toggled_cb, ud);
 
        cell = gtk_cell_renderer_toggle_new();
        gtk_cell_renderer_toggle_set_radio(GTK_CELL_RENDERER_TOGGLE(cell), TRUE);
        column = gtk_tree_view_column_new_with_attributes(
-                               _("Burned In"), cell, "active", 2, "cell-background", 5, NULL);
-       gtk_tree_view_column_set_max_width (column, 50);
+                               _("Burned In"), cell, "active", 3, NULL);
        gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
        g_signal_connect(cell, "toggled", subtitle_burned_toggled_cb, ud);
 
        cell = gtk_cell_renderer_text_new();
        column = gtk_tree_view_column_new_with_attributes(
-                                                                       _("Type"), cell, "text", 3, NULL);
+                                                                       _("Type"), cell, "text", 4, NULL);
        gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
 
@@ -723,7 +736,7 @@ main (int argc, char *argv[])
        // Load all internal settings
        ghb_settings_init(ud);
        // Load the presets files
-       ghb_presets_load();
+       ghb_presets_load(ud);
        ghb_prefs_load(ud);
 
        ghb_prefs_to_ui(ud);