LinGui: limit field width of srt filename in the subtitle list

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

diff --git a/gtk/src/main.c b/gtk/src/main.c
index edd5fec..a3ec1f0 100644 (file)
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -349,23 +349,25 @@ bind_audio_tree_model (signal_user_data_t *ud)
        column = gtk_tree_view_column_new_with_attributes(
                                                                        _("Codec"), cell, "text", 1, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+       gtk_tree_view_column_set_min_width (column, 130);
 
        cell = gtk_cell_renderer_text_new();
        column = gtk_tree_view_column_new_with_attributes(
                                                                        _("Bitrate"), cell, "text", 2, NULL);
     gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+       gtk_tree_view_column_set_min_width (column, 60);
 
        cell = gtk_cell_renderer_text_new();
        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);
+       gtk_tree_view_column_set_min_width (column, 130);
 
        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);
+       gtk_tree_view_column_set_min_width (column, 140);
 
        cell = gtk_cell_renderer_text_new();
        column = gtk_tree_view_column_new_with_attributes(
@@ -402,12 +404,16 @@ bind_subtitle_tree_model (signal_user_data_t *ud)
        selection = gtk_tree_view_get_selection (treeview);
        // 6 columns in model.  5 are visible, the other 1 is for storing
        // values that I need
-       // Track, force, burn, default, type, track short
-       treestore = gtk_list_store_new(6, 
+       // Track, force, burn, default, type, srt offset, track short, source
+       // force visible, burn visible, offset visible
+       treestore = gtk_list_store_new(11, 
                                                                        G_TYPE_STRING,
                                                                        G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
                                                                        G_TYPE_BOOLEAN, G_TYPE_STRING,  
-                                                                       G_TYPE_STRING);
+                                                                       G_TYPE_INT,     G_TYPE_STRING,
+                                                                       G_TYPE_INT,
+                                                                       G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
+                                                                       G_TYPE_BOOLEAN);
        gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
 
        cell = gtk_cell_renderer_text_new();
@@ -419,14 +425,14 @@ bind_subtitle_tree_model (signal_user_data_t *ud)
 
        cell = gtk_cell_renderer_toggle_new();
        column = gtk_tree_view_column_new_with_attributes(
-                                                                       _("Forced Only"), cell, "active", 1, NULL);
+                       _("Forced Only"), cell, "active", 1, "visible", 8, 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, NULL);
+                       _("Burned In"), cell, "active", 2, "visible", 9, NULL);
        gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
        g_signal_connect(cell, "toggled", subtitle_burned_toggled_cb, ud);
 
@@ -441,6 +447,13 @@ bind_subtitle_tree_model (signal_user_data_t *ud)
        column = gtk_tree_view_column_new_with_attributes(
                                                                        _("Type"), cell, "text", 4, NULL);
        gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
+       gtk_tree_view_column_set_min_width (column, 240);
+       gtk_tree_view_column_set_max_width (column, 240);
+
+       cell = gtk_cell_renderer_text_new();
+       column = gtk_tree_view_column_new_with_attributes(
+                       _("Srt Offset"), cell, "text", 5, "visible", 10, NULL);
+       gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
 
        g_signal_connect(selection, "changed", subtitle_list_selection_changed_cb, ud);
@@ -798,6 +811,9 @@ main (int argc, char *argv[])
        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"));
+
 #if GTK_CHECK_VERSION(2, 16, 0)
        gtk_status_icon_set_has_tooltip(si, TRUE);
        g_signal_connect(si, "query-tooltip", 
@@ -806,14 +822,10 @@ main (int argc, char *argv[])
        gtk_status_icon_set_tooltip(si, "HandBrake");
 #endif
 
-       GtkWindow *window;
-       window = GTK_WINDOW(GHB_WIDGET (ud->builder, "hb_window"));
-       gtk_window_set_skip_taskbar_hint(window, 
-                       ghb_settings_get_boolean(ud->settings, "skip_taskbar"));
-
        // Everything should be go-to-go.  Lets rock!
 
        gtk_main ();
+       gtk_status_icon_set_visible(si, FALSE);
        ghb_backend_close();
        if (ud->queue)
                ghb_value_free(ud->queue);