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

diff --git a/gtk/src/main.c b/gtk/src/main.c
index a3ec1f00..efc2fbc9 100644
--- a/gtk/src/main.c
+++ b/gtk/src/main.c
@@ -467,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
@@ -487,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);
@@ -822,6 +827,21 @@ main (int argc, char *argv[])
 	gtk_status_icon_set_tooltip(si, "HandBrake");
 #endif
 
+	// 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 ();