X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fmain.c;h=efc2fbc996f50a6d1e8b5c7297a08b11c29555aa;hb=44946a6f8be82a70e65ca534541183a26fdb804b;hp=2a3ee18f80985c205ac982197c3a960cdc79fd63;hpb=c8fd41085882c99882260b7af3a6045b7f1f9ad6;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/main.c b/gtk/src/main.c
index 2a3ee18f..efc2fbc9 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -404,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();
@@ -421,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);
 
@@ -443,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);
@@ -456,6 +467,7 @@ bind_subtitle_tree_model (signal_user_data_t *ud)
 extern G_MODULE_EXPORT void presets_list_selection_changed_cb(void);
 extern G_MODULE_EXPORT void presets_drag_cb(void);
 extern G_MODULE_EXPORT void presets_drag_motion_cb(void);
+extern G_MODULE_EXPORT void preset_edited_cb(void);
 extern void presets_row_expanded_cb(void);
 
 // Create and bind the tree model to the tree view for the preset list
@@ -476,13 +488,17 @@ bind_presets_tree_model (signal_user_data_t *ud)
 	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_tree_store_new(5, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, 
-								   G_TYPE_STRING, G_TYPE_STRING);
+	treestore = gtk_tree_store_new(6, 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();
 	column = gtk_tree_view_column_new_with_attributes(_("Preset Name"), cell, 
-					"text", 0, "weight", 1, "style", 2, "foreground", 3, NULL);
+		"text", 0, "weight", 1, "style", 2, 
+		"foreground", 3, "editable", 5, NULL);
+
+	g_signal_connect(cell, "edited", preset_edited_cb, ud);
+
     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);
@@ -800,6 +816,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", 
@@ -808,14 +827,25 @@ 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"));
-
+	// Ugly hack to keep subtitle table from bouncing around as I change
+	// which set of controls are visible
+	GtkRequisition req;
+	GtkWidget *widget;
+	gint height;
+	
+	widget = GHB_WIDGET(ud->builder, "SrtCodeset");
+	gtk_widget_size_request( widget, &req );
+	height = req.height;
+	widget = GHB_WIDGET(ud->builder, "srt_code_label");
+	gtk_widget_size_request( widget, &req );
+	height += req.height;
+	widget = GHB_WIDGET(ud->builder, "subtitle_table");
+	gtk_widget_set_size_request(widget, -1, height);
+	
 	// 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);