X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fmain.c;h=7e62d6099774324f92efc5603dcc7ed443e8b081;hb=fdb09bb478a03a07f7de8c19a1ee4d75832533c8;hp=c26966db2d3781640799d924dba512b553aa9ad7;hpb=508bdc865d2ec20e9fdae1774cb1f71a8d667f0d;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/main.c b/gtk/src/main.c
index c26966db..7e62d609 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -330,12 +330,9 @@ bind_audio_tree_model (signal_user_data_t *ud)
 	selection = gtk_tree_view_get_selection (treeview);
 	// 12 columns in model.  6 are visible, the other 6 are for storing
 	// values that I need
-	treestore = gtk_list_store_new(12, G_TYPE_STRING, G_TYPE_STRING, 
+	treestore = gtk_list_store_new(6, G_TYPE_STRING, G_TYPE_STRING, 
 								   G_TYPE_STRING, G_TYPE_STRING, 
-								   G_TYPE_STRING, G_TYPE_STRING,
-								   G_TYPE_STRING, G_TYPE_STRING, 
-								   G_TYPE_STRING, G_TYPE_STRING,
-								   G_TYPE_STRING, G_TYPE_DOUBLE);
+								   G_TYPE_STRING, G_TYPE_STRING);
 	gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(treestore));
 
 	cell = gtk_cell_renderer_text_new();
@@ -406,10 +403,10 @@ bind_subtitle_tree_model (signal_user_data_t *ud)
 	// values that I need
 	// Track, force, burn, default, type, srt offset, track short, source
 	// force visible, burn visible, offset visible
-	treestore = gtk_list_store_new(11, 
+	treestore = gtk_list_store_new(10, 
 									G_TYPE_STRING,
 									G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
-									G_TYPE_BOOLEAN, G_TYPE_STRING,  
+									G_TYPE_BOOLEAN,
 									G_TYPE_INT,     G_TYPE_STRING,
 									G_TYPE_INT,
 									G_TYPE_BOOLEAN, G_TYPE_BOOLEAN,
@@ -420,19 +417,19 @@ bind_subtitle_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, 190);
-	gtk_tree_view_column_set_max_width (column, 190);
+	gtk_tree_view_column_set_min_width (column, 350);
+	gtk_tree_view_column_set_max_width (column, 350);
 
 	cell = gtk_cell_renderer_toggle_new();
 	column = gtk_tree_view_column_new_with_attributes(
-			_("Forced Only"), cell, "active", 1, "visible", 8, NULL);
+			_("Forced Only"), cell, "active", 1, "visible", 7, 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, "visible", 9, NULL);
+			_("Burned In"), cell, "active", 2, "visible", 8, NULL);
 	gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 	g_signal_connect(cell, "toggled", subtitle_burned_toggled_cb, ud);
 
@@ -445,14 +442,7 @@ bind_subtitle_tree_model (signal_user_data_t *ud)
 
 	cell = gtk_cell_renderer_text_new();
 	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, 190);
-	gtk_tree_view_column_set_max_width (column, 190);
-
-	cell = gtk_cell_renderer_text_new();
-	column = gtk_tree_view_column_new_with_attributes(
-			_("Srt Offset"), cell, "text", 5, "visible", 10, NULL);
+			_("Srt Offset"), cell, "text", 4, "visible", 9, NULL);
 	gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column));
 
 
@@ -827,6 +817,11 @@ main (int argc, char *argv[])
 	// Since GtkBuilder no longer assigns object ids to widget names
 	// Assign a few that are necessary for style overrides to work
 	GtkWidget *widget;
+#if defined(_NO_UPDATE_CHECK)
+	widget = GHB_WIDGET(ud->builder, "check_updates_box");
+	gtk_widget_hide(widget);
+#endif
+
 	widget = GHB_WIDGET(ud->builder, "preview_hud");
 	gtk_widget_set_name(widget, "preview_hud");
 	widget = GHB_WIDGET(ud->builder, "preview_window");