X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fsettings.c;h=cc9ae4bc8830184335a24f00bff5dbb94cdcad03;hb=541a1a480c131997178d482d7eb0b1f7f33d90ba;hp=20cdb38c9b35869a3661a8fd84aae878af5a7375;hpb=c452f684acd234755f7cfe9555c8bccaf6bd1083;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/settings.c b/gtk/src/settings.c
index 20cdb38c..cc9ae4bc 100644
--- a/gtk/src/settings.c
+++ b/gtk/src/settings.c
@@ -179,17 +179,14 @@ ghb_settings_combo_string(const GValue *settings, const gchar *key)
 // Map widget names to setting keys
 // Widgets that map to settings have names
 // of this format: s_<setting key>
-static const gchar*
-get_setting_key(GtkWidget *widget)
+const gchar*
+ghb_get_setting_key(GtkWidget *widget)
 {
 	const gchar *name;
 	
 	g_debug("get_setting_key ()\n");
 	if (widget == NULL) return NULL;
-	if (GTK_IS_ACTION(widget))
-		name = gtk_action_get_name(GTK_ACTION(widget));
-	else
-		name = gtk_widget_get_name(widget);
+	name = gtk_buildable_get_name(GTK_BUILDABLE(widget));
 		
 	if (name == NULL)
 	{
@@ -214,10 +211,7 @@ ghb_widget_value(GtkWidget *widget)
 	}
 
 	type = GTK_WIDGET_TYPE(widget);
-	if (GTK_IS_ACTION(widget))
-		name = gtk_action_get_name(GTK_ACTION(widget));
-	else
-		name = gtk_widget_get_name(widget);
+	name = ghb_get_setting_key(widget);
 	g_debug("ghb_widget_value widget (%s)\n", name);
 	if (type == GTK_TYPE_ENTRY)
 	{
@@ -238,6 +232,13 @@ ghb_widget_value(GtkWidget *widget)
 		bval = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
 		value = ghb_boolean_value_new(bval);
 	}
+	else if (type == GTK_TYPE_TOGGLE_TOOL_BUTTON)
+	{
+		g_debug("\ttoggle_tool_button");
+		gboolean bval;
+		bval = gtk_toggle_tool_button_get_active(GTK_TOGGLE_TOOL_BUTTON(widget));
+		value = ghb_boolean_value_new(bval);
+	}
 	else if (type == GTK_TYPE_TOGGLE_BUTTON)
 	{
 		g_debug("\ttoggle_button");
@@ -435,7 +436,7 @@ ghb_widget_to_setting(GValue *settings, GtkWidget *widget)
 	if (widget == NULL) return;
 	g_debug("ghb_widget_to_setting");
 	// Find corresponding setting
-	key = get_setting_key(widget);
+	key = ghb_get_setting_key(widget);
 	if (key == NULL) return;
 	value = ghb_widget_value(widget);
 	if (value != NULL)
@@ -480,6 +481,11 @@ update_widget(GtkWidget *widget, const GValue *value)
 		g_debug("check button");
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), ival);
 	}
+	else if (type == GTK_TYPE_TOGGLE_TOOL_BUTTON)
+	{
+		g_debug("toggle button");
+		gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(widget), ival);
+	}
 	else if (type == GTK_TYPE_TOGGLE_BUTTON)
 	{
 		g_debug("toggle button");
@@ -613,13 +619,18 @@ update_widget(GtkWidget *widget, const GValue *value)
 	}
 	else if (type == GTK_TYPE_LABEL)
 	{
-		gtk_label_set_text (GTK_LABEL(widget), str);
+		gtk_label_set_markup (GTK_LABEL(widget), str);
 	}
 	else if (type == GTK_TYPE_FILE_CHOOSER_BUTTON)
 	{
 		GtkFileChooserAction act;
 		act = gtk_file_chooser_get_action(GTK_FILE_CHOOSER(widget));
-		if (act == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
+		if (str[0] == 0)
+		{
+			// Do nothing
+			;
+		}
+		else if (act == GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER ||
 			act == GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER)
 		{
 			gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(widget), str);