Commit 22fc50c2 authored by Michael Natterer's avatar Michael Natterer 😴
Browse files

app: rename all values of enum GimpContextPropMask

from GIMP_CONTEXT_FOO_MASK to GIMP_CONTEXT_PROP_MASK_FOO.
Also rename the FIRST and LAST values of enum GimpContextPropType.
parent 67597f42
......@@ -579,9 +579,9 @@ typedef enum /*< pdb-skip >*/
typedef enum /*< pdb-skip, skip >*/
{
GIMP_CONTEXT_FIRST_PROP = 2,
GIMP_CONTEXT_PROP_FIRST = 2,
GIMP_CONTEXT_PROP_IMAGE = GIMP_CONTEXT_FIRST_PROP,
GIMP_CONTEXT_PROP_IMAGE = GIMP_CONTEXT_PROP_FIRST,
GIMP_CONTEXT_PROP_DISPLAY = 3,
GIMP_CONTEXT_PROP_TOOL = 4,
GIMP_CONTEXT_PROP_PAINT_INFO = 5,
......@@ -600,50 +600,51 @@ typedef enum /*< pdb-skip, skip >*/
GIMP_CONTEXT_PROP_IMAGEFILE = 18,
GIMP_CONTEXT_PROP_TEMPLATE = 19,
GIMP_CONTEXT_LAST_PROP = GIMP_CONTEXT_PROP_TEMPLATE
GIMP_CONTEXT_PROP_LAST = GIMP_CONTEXT_PROP_TEMPLATE
} GimpContextPropType;
typedef enum /*< pdb-skip, skip >*/
{
GIMP_CONTEXT_IMAGE_MASK = 1 << 2,
GIMP_CONTEXT_DISPLAY_MASK = 1 << 3,
GIMP_CONTEXT_TOOL_MASK = 1 << 4,
GIMP_CONTEXT_PAINT_INFO_MASK = 1 << 5,
GIMP_CONTEXT_FOREGROUND_MASK = 1 << 6,
GIMP_CONTEXT_BACKGROUND_MASK = 1 << 7,
GIMP_CONTEXT_OPACITY_MASK = 1 << 8,
GIMP_CONTEXT_PAINT_MODE_MASK = 1 << 9,
GIMP_CONTEXT_BRUSH_MASK = 1 << 10,
GIMP_CONTEXT_DYNAMICS_MASK = 1 << 11,
GIMP_CONTEXT_PATTERN_MASK = 1 << 12,
GIMP_CONTEXT_GRADIENT_MASK = 1 << 13,
GIMP_CONTEXT_PALETTE_MASK = 1 << 14,
GIMP_CONTEXT_TOOL_PRESET_MASK = 1 << 15,
GIMP_CONTEXT_FONT_MASK = 1 << 16,
GIMP_CONTEXT_BUFFER_MASK = 1 << 17,
GIMP_CONTEXT_IMAGEFILE_MASK = 1 << 18,
GIMP_CONTEXT_TEMPLATE_MASK = 1 << 19,
GIMP_CONTEXT_PROP_MASK_IMAGE = 1 << 2,
GIMP_CONTEXT_PROP_MASK_DISPLAY = 1 << 3,
GIMP_CONTEXT_PROP_MASK_TOOL = 1 << 4,
GIMP_CONTEXT_PROP_MASK_PAINT_INFO = 1 << 5,
GIMP_CONTEXT_PROP_MASK_FOREGROUND = 1 << 6,
GIMP_CONTEXT_PROP_MASK_BACKGROUND = 1 << 7,
GIMP_CONTEXT_PROP_MASK_OPACITY = 1 << 8,
GIMP_CONTEXT_PROP_MASK_PAINT_MODE = 1 << 9,
GIMP_CONTEXT_PROP_MASK_BRUSH = 1 << 10,
GIMP_CONTEXT_PROP_MASK_DYNAMICS = 1 << 11,
GIMP_CONTEXT_PROP_MASK_PATTERN = 1 << 12,
GIMP_CONTEXT_PROP_MASK_GRADIENT = 1 << 13,
GIMP_CONTEXT_PROP_MASK_PALETTE = 1 << 14,
GIMP_CONTEXT_PROP_MASK_TOOL_PRESET = 1 << 15,
GIMP_CONTEXT_PROP_MASK_FONT = 1 << 16,
GIMP_CONTEXT_PROP_MASK_BUFFER = 1 << 17,
GIMP_CONTEXT_PROP_MASK_IMAGEFILE = 1 << 18,
GIMP_CONTEXT_PROP_MASK_TEMPLATE = 1 << 19,
/* aliases */
GIMP_CONTEXT_PAINT_PROPS_MASK = (GIMP_CONTEXT_FOREGROUND_MASK |
GIMP_CONTEXT_BACKGROUND_MASK |
GIMP_CONTEXT_OPACITY_MASK |
GIMP_CONTEXT_PAINT_MODE_MASK |
GIMP_CONTEXT_BRUSH_MASK |
GIMP_CONTEXT_DYNAMICS_MASK |
GIMP_CONTEXT_PATTERN_MASK |
GIMP_CONTEXT_GRADIENT_MASK),
GIMP_CONTEXT_ALL_PROPS_MASK = (GIMP_CONTEXT_IMAGE_MASK |
GIMP_CONTEXT_DISPLAY_MASK |
GIMP_CONTEXT_TOOL_MASK |
GIMP_CONTEXT_PAINT_INFO_MASK |
GIMP_CONTEXT_PALETTE_MASK |
GIMP_CONTEXT_FONT_MASK |
GIMP_CONTEXT_BUFFER_MASK |
GIMP_CONTEXT_IMAGEFILE_MASK |
GIMP_CONTEXT_TEMPLATE_MASK |
GIMP_CONTEXT_PAINT_PROPS_MASK)
GIMP_CONTEXT_PROP_MASK_PAINT = (GIMP_CONTEXT_PROP_MASK_FOREGROUND |
GIMP_CONTEXT_PROP_MASK_BACKGROUND |
GIMP_CONTEXT_PROP_MASK_OPACITY |
GIMP_CONTEXT_PROP_MASK_PAINT_MODE |
GIMP_CONTEXT_PROP_MASK_BRUSH |
GIMP_CONTEXT_PROP_MASK_DYNAMICS |
GIMP_CONTEXT_PROP_MASK_PATTERN |
GIMP_CONTEXT_PROP_MASK_GRADIENT),
GIMP_CONTEXT_PROP_MASK_ALL = (GIMP_CONTEXT_PROP_MASK_IMAGE |
GIMP_CONTEXT_PROP_MASK_DISPLAY |
GIMP_CONTEXT_PROP_MASK_TOOL |
GIMP_CONTEXT_PROP_MASK_PAINT_INFO |
GIMP_CONTEXT_PROP_MASK_PALETTE |
GIMP_CONTEXT_PROP_MASK_FONT |
GIMP_CONTEXT_PROP_MASK_BUFFER |
GIMP_CONTEXT_PROP_MASK_IMAGEFILE |
GIMP_CONTEXT_PROP_MASK_TEMPLATE |
GIMP_CONTEXT_PROP_MASK_PAINT)
} GimpContextPropMask;
......
......@@ -734,8 +734,8 @@ gimp_context_init (GimpContext *context)
context->parent = NULL;
context->defined_props = GIMP_CONTEXT_ALL_PROPS_MASK;
context->serialize_props = GIMP_CONTEXT_ALL_PROPS_MASK;
context->defined_props = GIMP_CONTEXT_PROP_MASK_ALL;
context->serialize_props = GIMP_CONTEXT_PROP_MASK_ALL;
context->image = NULL;
context->display = NULL;
......@@ -1465,7 +1465,7 @@ gimp_context_new (Gimp *gimp,
context->defined_props = template->defined_props;
gimp_context_copy_properties (template, context,
GIMP_CONTEXT_ALL_PROPS_MASK);
GIMP_CONTEXT_PROP_MASK_ALL);
}
return context;
......@@ -1518,7 +1518,7 @@ gimp_context_set_parent (GimpContext *context,
/* copy all undefined properties from the new parent */
gimp_context_copy_properties (parent, context,
~context->defined_props &
GIMP_CONTEXT_ALL_PROPS_MASK);
GIMP_CONTEXT_PROP_MASK_ALL);
g_signal_connect_object (parent, "notify",
G_CALLBACK (gimp_context_parent_notify),
......@@ -1538,8 +1538,8 @@ gimp_context_define_property (GimpContext *context,
GimpContextPropMask mask;
g_return_if_fail (GIMP_IS_CONTEXT (context));
g_return_if_fail ((prop >= GIMP_CONTEXT_FIRST_PROP) &&
(prop <= GIMP_CONTEXT_LAST_PROP));
g_return_if_fail ((prop >= GIMP_CONTEXT_PROP_FIRST) &&
(prop <= GIMP_CONTEXT_PROP_LAST));
mask = (1 << prop);
......@@ -1580,7 +1580,7 @@ gimp_context_define_properties (GimpContext *context,
g_return_if_fail (GIMP_IS_CONTEXT (context));
for (prop = GIMP_CONTEXT_FIRST_PROP; prop <= GIMP_CONTEXT_LAST_PROP; prop++)
for (prop = GIMP_CONTEXT_PROP_FIRST; prop <= GIMP_CONTEXT_PROP_LAST; prop++)
if ((1 << prop) & prop_mask)
gimp_context_define_property (context, prop, defined);
}
......@@ -1620,8 +1620,8 @@ gimp_context_copy_property (GimpContext *src,
g_return_if_fail (GIMP_IS_CONTEXT (src));
g_return_if_fail (GIMP_IS_CONTEXT (dest));
g_return_if_fail ((prop >= GIMP_CONTEXT_FIRST_PROP) &&
(prop <= GIMP_CONTEXT_LAST_PROP));
g_return_if_fail ((prop >= GIMP_CONTEXT_PROP_FIRST) &&
(prop <= GIMP_CONTEXT_PROP_LAST));
switch (prop)
{
......@@ -1756,7 +1756,7 @@ gimp_context_copy_properties (GimpContext *src,
g_return_if_fail (GIMP_IS_CONTEXT (src));
g_return_if_fail (GIMP_IS_CONTEXT (dest));
for (prop = GIMP_CONTEXT_FIRST_PROP; prop <= GIMP_CONTEXT_LAST_PROP; prop++)
for (prop = GIMP_CONTEXT_PROP_FIRST; prop <= GIMP_CONTEXT_PROP_LAST; prop++)
if ((1 << prop) & prop_mask)
gimp_context_copy_property (src, dest, prop);
}
......@@ -1771,7 +1771,7 @@ gimp_context_type_to_property (GType type)
{
GimpContextPropType prop;
for (prop = GIMP_CONTEXT_FIRST_PROP; prop <= GIMP_CONTEXT_LAST_PROP; prop++)
for (prop = GIMP_CONTEXT_PROP_FIRST; prop <= GIMP_CONTEXT_PROP_LAST; prop++)
{
if (g_type_is_a (type, gimp_context_prop_types[prop]))
return prop;
......@@ -1785,7 +1785,7 @@ gimp_context_type_to_prop_name (GType type)
{
GimpContextPropType prop;
for (prop = GIMP_CONTEXT_FIRST_PROP; prop <= GIMP_CONTEXT_LAST_PROP; prop++)
for (prop = GIMP_CONTEXT_PROP_FIRST; prop <= GIMP_CONTEXT_PROP_LAST; prop++)
{
if (g_type_is_a (type, gimp_context_prop_types[prop]))
return gimp_context_prop_names[prop];
......@@ -1799,7 +1799,7 @@ gimp_context_type_to_signal_name (GType type)
{
GimpContextPropType prop;
for (prop = GIMP_CONTEXT_FIRST_PROP; prop <= GIMP_CONTEXT_LAST_PROP; prop++)
for (prop = GIMP_CONTEXT_PROP_FIRST; prop <= GIMP_CONTEXT_PROP_LAST; prop++)
{
if (g_type_is_a (type, gimp_context_prop_types[prop]))
return g_signal_name (gimp_context_signals[prop]);
......
......@@ -415,8 +415,8 @@ gimp_stroke_options_new (Gimp *gimp,
if (use_context_color)
{
gimp_context_define_properties (GIMP_CONTEXT (options),
GIMP_CONTEXT_FOREGROUND_MASK |
GIMP_CONTEXT_PATTERN_MASK,
GIMP_CONTEXT_PROP_MASK_FOREGROUND |
GIMP_CONTEXT_PROP_MASK_PATTERN,
FALSE);
gimp_context_set_parent (GIMP_CONTEXT (options), context);
......@@ -574,7 +574,7 @@ gimp_stroke_options_prepare (GimpStrokeOptions *options,
* from the passed context
*/
gimp_context_define_properties (GIMP_CONTEXT (paint_options),
GIMP_CONTEXT_PAINT_PROPS_MASK,
GIMP_CONTEXT_PROP_MASK_PAINT,
FALSE);
gimp_context_set_parent (GIMP_CONTEXT (paint_options), context);
......@@ -589,21 +589,21 @@ gimp_stroke_options_prepare (GimpStrokeOptions *options,
gimp_config_duplicate (GIMP_CONFIG (paint_info->paint_options));
/* FG and BG are always shared between all tools */
global_props |= GIMP_CONTEXT_FOREGROUND_MASK;
global_props |= GIMP_CONTEXT_BACKGROUND_MASK;
global_props |= GIMP_CONTEXT_PROP_MASK_FOREGROUND;
global_props |= GIMP_CONTEXT_PROP_MASK_BACKGROUND;
if (config->global_brush)
global_props |= GIMP_CONTEXT_BRUSH_MASK;
global_props |= GIMP_CONTEXT_PROP_MASK_BRUSH;
if (config->global_dynamics)
global_props |= GIMP_CONTEXT_DYNAMICS_MASK;
global_props |= GIMP_CONTEXT_PROP_MASK_DYNAMICS;
if (config->global_pattern)
global_props |= GIMP_CONTEXT_PATTERN_MASK;
global_props |= GIMP_CONTEXT_PROP_MASK_PATTERN;
if (config->global_palette)
global_props |= GIMP_CONTEXT_PALETTE_MASK;
global_props |= GIMP_CONTEXT_PROP_MASK_PALETTE;
if (config->global_gradient)
global_props |= GIMP_CONTEXT_GRADIENT_MASK;
global_props |= GIMP_CONTEXT_PROP_MASK_GRADIENT;
if (config->global_font)
global_props |= GIMP_CONTEXT_FONT_MASK;
global_props |= GIMP_CONTEXT_PROP_MASK_FONT;
gimp_context_copy_properties (context,
GIMP_CONTEXT (paint_options),
......
......@@ -384,12 +384,12 @@ gimp_tool_preset_deserialize_property (GimpConfig *config,
*/
gimp_context_copy_properties (gimp_get_user_context (tool_preset->gimp),
GIMP_CONTEXT (options),
GIMP_CONTEXT_BRUSH_MASK |
GIMP_CONTEXT_DYNAMICS_MASK |
GIMP_CONTEXT_PATTERN_MASK |
GIMP_CONTEXT_GRADIENT_MASK |
GIMP_CONTEXT_PALETTE_MASK |
GIMP_CONTEXT_FONT_MASK);
GIMP_CONTEXT_PROP_MASK_BRUSH |
GIMP_CONTEXT_PROP_MASK_DYNAMICS |
GIMP_CONTEXT_PROP_MASK_PATTERN |
GIMP_CONTEXT_PROP_MASK_GRADIENT |
GIMP_CONTEXT_PROP_MASK_PALETTE |
GIMP_CONTEXT_PROP_MASK_FONT);
if (! GIMP_CONFIG_GET_INTERFACE (options)->deserialize (GIMP_CONFIG (options),
scanner, 1,
......@@ -429,7 +429,7 @@ gimp_tool_preset_deserialize_property (GimpConfig *config,
gimp_context_set_serialize_properties (GIMP_CONTEXT (options),
serialize_props |
GIMP_CONTEXT_TOOL_MASK);
GIMP_CONTEXT_PROP_MASK_TOOL);
g_value_take_object (value, options);
}
......@@ -472,27 +472,27 @@ gimp_tool_preset_set_options (GimpToolPreset *preset,
gimp_context_set_serialize_properties (GIMP_CONTEXT (preset->tool_options),
serialize_props |
GIMP_CONTEXT_TOOL_MASK);
GIMP_CONTEXT_PROP_MASK_TOOL);
if (! (serialize_props & GIMP_CONTEXT_FOREGROUND_MASK))
if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_FOREGROUND))
g_object_set (preset, "use-fg-bg", FALSE, NULL);
if (! (serialize_props & GIMP_CONTEXT_BRUSH_MASK))
if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_BRUSH))
g_object_set (preset, "use-brush", FALSE, NULL);
if (! (serialize_props & GIMP_CONTEXT_DYNAMICS_MASK))
if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_DYNAMICS))
g_object_set (preset, "use-dynamics", FALSE, NULL);
if (! (serialize_props & GIMP_CONTEXT_GRADIENT_MASK))
if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_GRADIENT))
g_object_set (preset, "use-gradient", FALSE, NULL);
if (! (serialize_props & GIMP_CONTEXT_PATTERN_MASK))
if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_PATTERN))
g_object_set (preset, "use-pattern", FALSE, NULL);
if (! (serialize_props & GIMP_CONTEXT_PALETTE_MASK))
if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_PALETTE))
g_object_set (preset, "use-palette", FALSE, NULL);
if (! (serialize_props & GIMP_CONTEXT_FONT_MASK))
if (! (serialize_props & GIMP_CONTEXT_PROP_MASK_FONT))
g_object_set (preset, "use-font", FALSE, NULL);
g_signal_connect (preset->tool_options, "notify",
......@@ -585,27 +585,27 @@ gimp_tool_preset_get_prop_mask (GimpToolPreset *preset)
if (preset->use_fg_bg)
{
use_props |= (GIMP_CONTEXT_FOREGROUND_MASK & serialize_props);
use_props |= (GIMP_CONTEXT_BACKGROUND_MASK & serialize_props);
use_props |= (GIMP_CONTEXT_PROP_MASK_FOREGROUND & serialize_props);
use_props |= (GIMP_CONTEXT_PROP_MASK_BACKGROUND & serialize_props);
}
if (preset->use_brush)
use_props |= (GIMP_CONTEXT_BRUSH_MASK & serialize_props);
use_props |= (GIMP_CONTEXT_PROP_MASK_BRUSH & serialize_props);
if (preset->use_dynamics)
use_props |= (GIMP_CONTEXT_DYNAMICS_MASK & serialize_props);
use_props |= (GIMP_CONTEXT_PROP_MASK_DYNAMICS & serialize_props);
if (preset->use_pattern)
use_props |= (GIMP_CONTEXT_PATTERN_MASK & serialize_props);
use_props |= (GIMP_CONTEXT_PROP_MASK_PATTERN & serialize_props);
if (preset->use_palette)
use_props |= (GIMP_CONTEXT_PALETTE_MASK & serialize_props);
use_props |= (GIMP_CONTEXT_PROP_MASK_PALETTE & serialize_props);
if (preset->use_gradient)
use_props |= (GIMP_CONTEXT_GRADIENT_MASK & serialize_props);
use_props |= (GIMP_CONTEXT_PROP_MASK_GRADIENT & serialize_props);
if (preset->use_font)
use_props |= (GIMP_CONTEXT_FONT_MASK & serialize_props);
use_props |= (GIMP_CONTEXT_PROP_MASK_FONT & serialize_props);
return use_props;
}
......@@ -22,13 +22,13 @@
#include "core/gimptooloptions.h"
#define GIMP_PAINT_OPTIONS_CONTEXT_MASK GIMP_CONTEXT_FOREGROUND_MASK | \
GIMP_CONTEXT_BACKGROUND_MASK | \
GIMP_CONTEXT_OPACITY_MASK | \
GIMP_CONTEXT_PAINT_MODE_MASK | \
GIMP_CONTEXT_BRUSH_MASK | \
GIMP_CONTEXT_DYNAMICS_MASK | \
GIMP_CONTEXT_PALETTE_MASK
#define GIMP_PAINT_OPTIONS_CONTEXT_MASK GIMP_CONTEXT_PROP_MASK_FOREGROUND | \
GIMP_CONTEXT_PROP_MASK_BACKGROUND | \
GIMP_CONTEXT_PROP_MASK_OPACITY | \
GIMP_CONTEXT_PROP_MASK_PAINT_MODE | \
GIMP_CONTEXT_PROP_MASK_BRUSH | \
GIMP_CONTEXT_PROP_MASK_DYNAMICS | \
GIMP_CONTEXT_PROP_MASK_PALETTE
typedef struct _GimpJitterOptions GimpJitterOptions;
......
......@@ -341,7 +341,7 @@ gimp_pdb_context_new (Gimp *gimp,
if (set_parent)
{
gimp_context_define_properties (GIMP_CONTEXT (context),
GIMP_CONTEXT_ALL_PROPS_MASK, FALSE);
GIMP_CONTEXT_PROP_MASK_ALL, FALSE);
gimp_context_set_parent (GIMP_CONTEXT (context), parent);
for (list = gimp_get_paint_info_iter (gimp);
......
......@@ -70,7 +70,7 @@ paint_tools_stroke (Gimp *gimp,
* from the current context
*/
gimp_context_define_properties (GIMP_CONTEXT (options),
GIMP_CONTEXT_PAINT_PROPS_MASK,
GIMP_CONTEXT_PROP_MASK_PAINT,
FALSE);
gimp_context_set_parent (GIMP_CONTEXT (options), context);
......
......@@ -359,10 +359,10 @@ gimp_tools_restore (Gimp *gimp)
*/
gimp_context_copy_properties (gimp_get_user_context (gimp),
GIMP_CONTEXT (tool_info->tool_options),
GIMP_CONTEXT_ALL_PROPS_MASK &~
(tool_info->context_props |
GIMP_CONTEXT_TOOL_MASK |
GIMP_CONTEXT_PAINT_INFO_MASK));
GIMP_CONTEXT_PROP_MASK_ALL &~
(tool_info->context_props |
GIMP_CONTEXT_PROP_MASK_TOOL |
GIMP_CONTEXT_PROP_MASK_PAINT_INFO));
gimp_tool_options_deserialize (tool_info->tool_options, NULL);
......
......@@ -50,7 +50,7 @@ gimp_airbrush_tool_register (GimpToolRegisterCallback callback,
GIMP_TYPE_AIRBRUSH_OPTIONS,
gimp_airbrush_options_gui,
GIMP_PAINT_OPTIONS_CONTEXT_MASK |
GIMP_CONTEXT_GRADIENT_MASK,
GIMP_CONTEXT_PROP_MASK_GRADIENT,
"gimp-airbrush-tool",
_("Airbrush"),
_("Airbrush Tool: Paint using a brush, with variable pressure"),
......
......@@ -154,11 +154,11 @@ gimp_blend_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_BLEND_TOOL,
GIMP_TYPE_BLEND_OPTIONS,
gimp_blend_options_gui,
GIMP_CONTEXT_FOREGROUND_MASK |
GIMP_CONTEXT_BACKGROUND_MASK |
GIMP_CONTEXT_OPACITY_MASK |
GIMP_CONTEXT_PAINT_MODE_MASK |
GIMP_CONTEXT_GRADIENT_MASK,
GIMP_CONTEXT_PROP_MASK_FOREGROUND |
GIMP_CONTEXT_PROP_MASK_BACKGROUND |
GIMP_CONTEXT_PROP_MASK_OPACITY |
GIMP_CONTEXT_PROP_MASK_PAINT_MODE |
GIMP_CONTEXT_PROP_MASK_GRADIENT,
"gimp-blend-tool",
_("Blend"),
_("Blend Tool: Fill selected area with a color gradient"),
......
......@@ -78,11 +78,11 @@ gimp_bucket_fill_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_BUCKET_FILL_TOOL,
GIMP_TYPE_BUCKET_FILL_OPTIONS,
gimp_bucket_fill_options_gui,
GIMP_CONTEXT_FOREGROUND_MASK |
GIMP_CONTEXT_BACKGROUND_MASK |
GIMP_CONTEXT_OPACITY_MASK |
GIMP_CONTEXT_PAINT_MODE_MASK |
GIMP_CONTEXT_PATTERN_MASK,
GIMP_CONTEXT_PROP_MASK_FOREGROUND |
GIMP_CONTEXT_PROP_MASK_BACKGROUND |
GIMP_CONTEXT_PROP_MASK_OPACITY |
GIMP_CONTEXT_PROP_MASK_PAINT_MODE |
GIMP_CONTEXT_PROP_MASK_PATTERN,
"gimp-bucket-fill-tool",
_("Bucket Fill"),
_("Bucket Fill Tool: Fill selected area with a color or pattern"),
......
......@@ -51,7 +51,7 @@ gimp_clone_tool_register (GimpToolRegisterCallback callback,
GIMP_TYPE_CLONE_OPTIONS,
gimp_clone_options_gui,
GIMP_PAINT_OPTIONS_CONTEXT_MASK |
GIMP_CONTEXT_PATTERN_MASK,
GIMP_CONTEXT_PROP_MASK_PATTERN,
"gimp-clone-tool",
_("Clone"),
_("Clone Tool: Selectively copy from an image or pattern, using a brush"),
......
......@@ -91,7 +91,8 @@ gimp_color_picker_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_COLOR_PICKER_TOOL,
GIMP_TYPE_COLOR_PICKER_OPTIONS,
gimp_color_picker_options_gui,
GIMP_CONTEXT_FOREGROUND_MASK | GIMP_CONTEXT_BACKGROUND_MASK,
GIMP_CONTEXT_PROP_MASK_FOREGROUND |
GIMP_CONTEXT_PROP_MASK_BACKGROUND,
"gimp-color-picker-tool",
_("Color Picker"),
_("Color Picker Tool: Set colors from image pixels"),
......
......@@ -79,7 +79,7 @@ gimp_flip_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_FLIP_TOOL,
GIMP_TYPE_FLIP_OPTIONS,
gimp_flip_options_gui,
GIMP_CONTEXT_BACKGROUND_MASK,
GIMP_CONTEXT_PROP_MASK_BACKGROUND,
"gimp-flip-tool",
_("Flip"),
_("Flip Tool: "
......
......@@ -178,7 +178,8 @@ gimp_foreground_select_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_FOREGROUND_SELECT_TOOL,
GIMP_TYPE_FOREGROUND_SELECT_OPTIONS,
gimp_foreground_select_options_gui,
GIMP_CONTEXT_FOREGROUND_MASK | GIMP_CONTEXT_BACKGROUND_MASK,
GIMP_CONTEXT_PROP_MASK_FOREGROUND |
GIMP_CONTEXT_PROP_MASK_BACKGROUND,
"gimp-foreground-select-tool",
_("Foreground Select"),
_("Foreground Select Tool: Select a region containing foreground objects"),
......
......@@ -159,7 +159,7 @@ gimp_handle_transform_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_HANDLE_TRANSFORM_TOOL,
GIMP_TYPE_HANDLE_TRANSFORM_OPTIONS,
gimp_handle_transform_options_gui,
GIMP_CONTEXT_BACKGROUND_MASK,
GIMP_CONTEXT_PROP_MASK_BACKGROUND,
"gimp-handle-transform-tool",
_("Handle Transform"),
_("Handle Transform Tool: "
......
......@@ -53,10 +53,10 @@ gimp_ink_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_INK_TOOL,
GIMP_TYPE_INK_OPTIONS,
gimp_ink_options_gui,
GIMP_CONTEXT_FOREGROUND_MASK |
GIMP_CONTEXT_BACKGROUND_MASK |
GIMP_CONTEXT_OPACITY_MASK |
GIMP_CONTEXT_PAINT_MODE_MASK,
GIMP_CONTEXT_PROP_MASK_FOREGROUND |
GIMP_CONTEXT_PROP_MASK_BACKGROUND |
GIMP_CONTEXT_PROP_MASK_OPACITY |
GIMP_CONTEXT_PROP_MASK_PAINT_MODE,
"gimp-ink-tool",
_("Ink"),
_("Ink Tool: Calligraphy-style painting"),
......
......@@ -68,10 +68,10 @@ gimp_mybrush_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_MYBRUSH_TOOL,
GIMP_TYPE_MYBRUSH_OPTIONS,
gimp_mybrush_options_gui,
GIMP_CONTEXT_FOREGROUND_MASK |
GIMP_CONTEXT_BACKGROUND_MASK |
GIMP_CONTEXT_OPACITY_MASK |
GIMP_CONTEXT_PAINT_MODE_MASK,
GIMP_CONTEXT_PROP_MASK_FOREGROUND |
GIMP_CONTEXT_PROP_MASK_BACKGROUND |
GIMP_CONTEXT_PROP_MASK_OPACITY |
GIMP_CONTEXT_PROP_MASK_PAINT_MODE,
"gimp-mybrush-tool",
_("MyPaint Brush"),
_("MyPaint Brush Tool: Use MyPaint brushes in GIMP"),
......
......@@ -106,8 +106,8 @@ gimp_operation_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_OPERATION_TOOL,
GIMP_TYPE_COLOR_OPTIONS,
gimp_color_options_gui,
GIMP_CONTEXT_FOREGROUND_MASK |
GIMP_CONTEXT_BACKGROUND_MASK,
GIMP_CONTEXT_PROP_MASK_FOREGROUND |
GIMP_CONTEXT_PROP_MASK_BACKGROUND,
"gimp-operation-tool",
_("GEGL Operation"),
_("Operation Tool: Use an arbitrary GEGL operation"),
......
......@@ -46,7 +46,7 @@ gimp_paintbrush_tool_register (GimpToolRegisterCallback callback,
GIMP_TYPE_PAINT_OPTIONS,
gimp_paint_options_gui,
GIMP_PAINT_OPTIONS_CONTEXT_MASK |
GIMP_CONTEXT_GRADIENT_MASK,
GIMP_CONTEXT_PROP_MASK_GRADIENT,
"gimp-paintbrush-tool",
_("Paintbrush"),
_("Paintbrush Tool: Paint smooth strokes using a brush"),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment