eUgEntOptIc44/gimp
1
1
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-10-06 01:12:40 +02:00
Code Issues Releases Activity

app: the "color-options-expanded" filter option is now bogus.

Browse Source 
I missed this together with commit c3ef79b3ef. It's of no use now.
This commit is contained in:
Jehan
2025-01-10 23:43:31 +01:00
parent bc3b6e5927
commit d8a8d2f138
3 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/core/gimp-user-install.c
View File

@@ -1073,9 +1073,10 @@ user_update_tool_presets (const GMatchInfo *matched_value,
* well as "toolrc" (but this one is skipped anyway).
*/
#define CONTEXTRC_UPDATE_PATTERN \
"gimp-blend-tool" "|" \
"dynamics \"Dynamics Off\"" "|" \
"\\(dynamics-expanded yes\\)"
"gimp-blend-tool" "|" \
"dynamics \"Dynamics Off\"" "|" \
"\\(dynamics-expanded yes\\)" "|" \
"\\(color-options-expanded [^)]*\\)"
static gboolean
user_update_contextrc_over20 (const GMatchInfo *matched_value,
@@ -1096,6 +1097,10 @@ user_update_contextrc_over20 (const GMatchInfo *matched_value,
{
/* This option just doesn't exist anymore. */
}
else if (g_str_has_prefix (match, "(color-options-expanded "))
{
/* This option was removed with the gamma-hack. Cf. #12577. */
}
else
{
g_message ("(WARNING) %s: invalid match \"%s\"", G_STRFUNC, match);

15
app/tools/gimpfilteroptions.c
View File

@@ -39,7 +39,6 @@ enum
PROP_PREVIEW_SPLIT_POSITION,
PROP_CONTROLLER,
PROP_BLENDING_OPTIONS_EXPANDED,
PROP_COLOR_OPTIONS_EXPANDED,
PROP_MERGE_FILTER
};
@@ -111,12 +110,6 @@ gimp_filter_options_class_init (GimpFilterOptionsClass *klass)
FALSE,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_COLOR_OPTIONS_EXPANDED,
"color-options-expanded",
NULL, NULL,
FALSE,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_MERGE_FILTER,
"merge-filter",
_("_Merge filter"),
@@ -165,10 +158,6 @@ gimp_filter_options_set_property (GObject *object,
options->blending_options_expanded = g_value_get_boolean (value);
break;
case PROP_COLOR_OPTIONS_EXPANDED:
options->color_options_expanded = g_value_get_boolean (value);
break;
case PROP_MERGE_FILTER:
options->merge_filter = g_value_get_boolean (value);
break;
@@ -213,10 +202,6 @@ gimp_filter_options_get_property (GObject *object,
g_value_set_boolean (value, options->blending_options_expanded);
break;
case PROP_COLOR_OPTIONS_EXPANDED:
g_value_set_boolean (value, options->color_options_expanded);
break;
case PROP_MERGE_FILTER:
g_value_set_boolean (value, options->merge_filter);
break;

1
app/tools/gimpfilteroptions.h
View File

@@ -43,7 +43,6 @@ struct _GimpFilterOptions
gboolean controller;
gboolean blending_options_expanded;
gboolean color_options_expanded;
gboolean merge_filter;
};