X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fsettings.c;h=4bafd9b2d87ebdb36a2f328a21f816b3cb2aef85;hb=9460d9624a5cf24126bc39605bc47d43330fcdf4;hp=41dd26ba25bc3040e354602fdc02b15e5eec2855;hpb=e2cd98f3e71232b518b7165705d25d965ab9d9f3;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/settings.c b/gtk/src/settings.c
index 41dd26ba..4bafd9b2 100644
--- a/gtk/src/settings.c
+++ b/gtk/src/settings.c
@@ -238,6 +238,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");
@@ -322,6 +329,13 @@ ghb_widget_value(GtkWidget *widget)
 			value = ghb_int_value_new(dval);
 		}
 	}
+	else if (type == GTK_TYPE_SCALE_BUTTON)
+	{
+		gdouble dval;
+
+		dval = gtk_scale_button_get_value(GTK_SCALE_BUTTON(widget));
+		value = ghb_double_value_new(dval);
+	}
 	else if (type == GTK_TYPE_TEXT_VIEW)
 	{
 		GtkTextBuffer *buffer;
@@ -342,9 +356,13 @@ ghb_widget_value(GtkWidget *widget)
 	}
 	else if (type == GTK_TYPE_FILE_CHOOSER_BUTTON)
 	{
-		const gchar *str;
+		gchar *str;
 		str = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(widget));
+		if (str == NULL)
+			str = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(widget));
 		value = ghb_string_value_new(str);
+		if (str != NULL)
+			g_free(str);
 	}
 	else
 	{
@@ -469,6 +487,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");
@@ -588,6 +611,11 @@ update_widget(GtkWidget *widget, const GValue *value)
 		g_debug("hscale");
 		gtk_range_set_value(GTK_RANGE(widget), dval);
 	}
+	else if (type == GTK_TYPE_SCALE_BUTTON)
+	{
+		g_debug("scale_button");
+		gtk_scale_button_set_value(GTK_SCALE_BUTTON(widget), dval);
+	}
 	else if (type == GTK_TYPE_TEXT_VIEW)
 	{
 		g_debug("textview (%s)", str);
@@ -597,21 +625,47 @@ 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);
 		}
-		else
+		else if (act == GTK_FILE_CHOOSER_ACTION_SAVE)
 		{
 			gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(widget), str);
 		}
+		else
+		{
+			if (g_file_test(str, G_FILE_TEST_IS_DIR))
+			{
+				gtk_file_chooser_set_current_folder(
+					GTK_FILE_CHOOSER(widget), str);
+			}
+			else if (g_file_test(str, G_FILE_TEST_EXISTS))
+			{
+				gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(widget), str);
+			}
+			else
+			{
+				gchar *dirname;
+
+				dirname = g_path_get_dirname(str);
+				gtk_file_chooser_set_current_folder(
+					GTK_FILE_CHOOSER(widget), dirname);
+				g_free(dirname);
+			}
+		}
 	}
 	else
 	{