mirror of https://github.com/GNOME/gimp.git
Bug 779620 - "Advanced Color Options" in filter dialogs is confusing
Hide "Advanced Color Options" by default, and add a toggle to show them to prefs -> color management.
This commit is contained in:
parent
c940b5d376
commit
4455cd984d
|
@ -54,6 +54,7 @@ enum
|
||||||
PROP_0,
|
PROP_0,
|
||||||
PROP_MOVE_TOOL_CHANGES_ACTIVE,
|
PROP_MOVE_TOOL_CHANGES_ACTIVE,
|
||||||
PROP_FILTER_TOOL_MAX_RECENT,
|
PROP_FILTER_TOOL_MAX_RECENT,
|
||||||
|
PROP_FILTER_TOOL_SHOW_COLOR_OPTIONS,
|
||||||
PROP_TRUST_DIRTY_FLAG,
|
PROP_TRUST_DIRTY_FLAG,
|
||||||
PROP_SAVE_DEVICE_STATUS,
|
PROP_SAVE_DEVICE_STATUS,
|
||||||
PROP_DEVICES_SHARE_TOOL,
|
PROP_DEVICES_SHARE_TOOL,
|
||||||
|
@ -163,6 +164,13 @@ gimp_gui_config_class_init (GimpGuiConfigClass *klass)
|
||||||
0, 255, 10,
|
0, 255, 10,
|
||||||
GIMP_PARAM_STATIC_STRINGS);
|
GIMP_PARAM_STATIC_STRINGS);
|
||||||
|
|
||||||
|
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FILTER_TOOL_SHOW_COLOR_OPTIONS,
|
||||||
|
"filter-tool-show-color-options",
|
||||||
|
"Show avanced color options in filters",
|
||||||
|
FILTER_TOOL_SHOW_COLOR_OPTIONS_BLURB,
|
||||||
|
FALSE,
|
||||||
|
GIMP_PARAM_STATIC_STRINGS);
|
||||||
|
|
||||||
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_TRUST_DIRTY_FLAG,
|
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_TRUST_DIRTY_FLAG,
|
||||||
"trust-dirty-flag",
|
"trust-dirty-flag",
|
||||||
"Trust dirty flag",
|
"Trust dirty flag",
|
||||||
|
@ -567,6 +575,9 @@ gimp_gui_config_set_property (GObject *object,
|
||||||
case PROP_IMAGE_MAP_TOOL_MAX_RECENT:
|
case PROP_IMAGE_MAP_TOOL_MAX_RECENT:
|
||||||
gui_config->filter_tool_max_recent = g_value_get_int (value);
|
gui_config->filter_tool_max_recent = g_value_get_int (value);
|
||||||
break;
|
break;
|
||||||
|
case PROP_FILTER_TOOL_SHOW_COLOR_OPTIONS:
|
||||||
|
gui_config->filter_tool_show_color_options = g_value_get_boolean (value);
|
||||||
|
break;
|
||||||
case PROP_TRUST_DIRTY_FLAG:
|
case PROP_TRUST_DIRTY_FLAG:
|
||||||
gui_config->trust_dirty_flag = g_value_get_boolean (value);
|
gui_config->trust_dirty_flag = g_value_get_boolean (value);
|
||||||
break;
|
break;
|
||||||
|
@ -749,6 +760,9 @@ gimp_gui_config_get_property (GObject *object,
|
||||||
case PROP_IMAGE_MAP_TOOL_MAX_RECENT:
|
case PROP_IMAGE_MAP_TOOL_MAX_RECENT:
|
||||||
g_value_set_int (value, gui_config->filter_tool_max_recent);
|
g_value_set_int (value, gui_config->filter_tool_max_recent);
|
||||||
break;
|
break;
|
||||||
|
case PROP_FILTER_TOOL_SHOW_COLOR_OPTIONS:
|
||||||
|
g_value_set_boolean (value, gui_config->filter_tool_show_color_options);
|
||||||
|
break;
|
||||||
case PROP_TRUST_DIRTY_FLAG:
|
case PROP_TRUST_DIRTY_FLAG:
|
||||||
g_value_set_boolean (value, gui_config->trust_dirty_flag);
|
g_value_set_boolean (value, gui_config->trust_dirty_flag);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -43,6 +43,7 @@ struct _GimpGuiConfig
|
||||||
|
|
||||||
gboolean move_tool_changes_active;
|
gboolean move_tool_changes_active;
|
||||||
gint filter_tool_max_recent;
|
gint filter_tool_max_recent;
|
||||||
|
gboolean filter_tool_show_color_options;
|
||||||
gboolean trust_dirty_flag;
|
gboolean trust_dirty_flag;
|
||||||
gboolean save_device_status;
|
gboolean save_device_status;
|
||||||
gboolean devices_share_tool;
|
gboolean devices_share_tool;
|
||||||
|
|
|
@ -173,7 +173,10 @@ _("Sets the browser used by the help system.")
|
||||||
"If empty, the language is taken from the user's locale setting."
|
"If empty, the language is taken from the user's locale setting."
|
||||||
|
|
||||||
#define FILTER_TOOL_MAX_RECENT_BLURB \
|
#define FILTER_TOOL_MAX_RECENT_BLURB \
|
||||||
"How many recent settings to keep around in filter tools"
|
_("How many recent settings to keep around in filter tools.")
|
||||||
|
|
||||||
|
#define FILTER_TOOL_SHOW_COLOR_OPTIONS_BLURB \
|
||||||
|
_("Show advanced color options in filter tools.")
|
||||||
|
|
||||||
#define IMAGE_STATUS_FORMAT_BLURB \
|
#define IMAGE_STATUS_FORMAT_BLURB \
|
||||||
_("Sets the text to appear in image window status bars.")
|
_("Sets the text to appear in image window status bars.")
|
||||||
|
|
|
@ -441,6 +441,7 @@ prefs_color_management_reset (GtkWidget *widget,
|
||||||
|
|
||||||
gimp_config_reset (GIMP_CONFIG (core_config->color_management));
|
gimp_config_reset (GIMP_CONFIG (core_config->color_management));
|
||||||
gimp_config_reset_property (config, "color-profile-policy");
|
gimp_config_reset_property (config, "color-profile-policy");
|
||||||
|
gimp_config_reset_property (config, "filter-tool-show-color-options");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -1272,6 +1273,14 @@ prefs_dialog_new (Gimp *gimp,
|
||||||
_("File Open behaviour:"),
|
_("File Open behaviour:"),
|
||||||
GTK_TABLE (table), 0, size_group);
|
GTK_TABLE (table), 0, size_group);
|
||||||
|
|
||||||
|
/* Filter Dialogs */
|
||||||
|
vbox2 = prefs_frame_new (_("Filter Dialogs"), GTK_CONTAINER (vbox),
|
||||||
|
FALSE);
|
||||||
|
|
||||||
|
button = prefs_check_button_add (object, "filter-tool-show-color-options",
|
||||||
|
_("Show advanced color options"),
|
||||||
|
GTK_BOX (vbox2));
|
||||||
|
|
||||||
g_object_unref (size_group);
|
g_object_unref (size_group);
|
||||||
|
|
||||||
g_object_unref (store);
|
g_object_unref (store);
|
||||||
|
|
|
@ -426,7 +426,11 @@ gimp_filter_tool_initialize (GimpTool *tool,
|
||||||
/* The Color Options expander */
|
/* The Color Options expander */
|
||||||
expander = gtk_expander_new (_("Advanced Color Options"));
|
expander = gtk_expander_new (_("Advanced Color Options"));
|
||||||
gtk_box_pack_end (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
|
gtk_box_pack_end (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
|
||||||
gtk_widget_show (expander);
|
|
||||||
|
g_object_bind_property (G_OBJECT (image->gimp->config),
|
||||||
|
"filter-tool-show-color-options",
|
||||||
|
G_OBJECT (expander), "visible",
|
||||||
|
G_BINDING_SYNC_CREATE);
|
||||||
|
|
||||||
frame = gimp_frame_new (NULL);
|
frame = gimp_frame_new (NULL);
|
||||||
gtk_container_add (GTK_CONTAINER (expander), frame);
|
gtk_container_add (GTK_CONTAINER (expander), frame);
|
||||||
|
|
Loading…
Reference in New Issue