[gimp] app: rename all values of enum GimpContextPropMask
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: rename all values of enum GimpContextPropMask
- Date: Tue, 8 Sep 2015 19:20:27 +0000 (UTC)
commit 22fc50c279dc4179adb15b90c0c498984a423b53
Author: Michael Natterer <mitch gimp org>
Date: Tue Sep 8 21:18:49 2015 +0200
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.
app/core/core-enums.h | 79 +++++++++++++++++-----------------
app/core/gimpcontext.c | 26 ++++++------
app/core/gimpstrokeoptions.c | 22 +++++-----
app/core/gimptoolpreset.c | 46 ++++++++++----------
app/paint/gimppaintoptions.h | 14 +++---
app/pdb/gimppdbcontext.c | 2 +-
app/pdb/paint-tools-cmds.c | 2 +-
app/tools/gimp-tools.c | 8 ++--
app/tools/gimpairbrushtool.c | 2 +-
app/tools/gimpblendtool.c | 10 ++--
app/tools/gimpbucketfilltool.c | 10 ++--
app/tools/gimpclonetool.c | 2 +-
app/tools/gimpcolorpickertool.c | 3 +-
app/tools/gimpfliptool.c | 2 +-
app/tools/gimpforegroundselecttool.c | 3 +-
app/tools/gimphandletransformtool.c | 2 +-
app/tools/gimpinktool.c | 8 ++--
app/tools/gimpmybrushtool.c | 8 ++--
app/tools/gimpoperationtool.c | 4 +-
app/tools/gimppaintbrushtool.c | 2 +-
app/tools/gimppenciltool.c | 2 +-
app/tools/gimpperspectiveclonetool.c | 2 +-
app/tools/gimpperspectivetool.c | 2 +-
app/tools/gimprotatetool.c | 2 +-
app/tools/gimpscaletool.c | 2 +-
app/tools/gimptexttool.c | 6 +-
app/tools/gimpunifiedtransformtool.c | 2 +-
app/tools/gimpvectortool.c | 4 +-
app/tools/tool_manager.c | 16 +++---
app/widgets/gimpdeviceinfo.h | 16 +++---
app/widgets/gimpdockwindow.c | 10 ++--
app/widgets/gimptoolpreseteditor.c | 21 ++++++---
tools/pdbgen/pdb/paint_tools.pdb | 2 +-
33 files changed, 176 insertions(+), 166 deletions(-)
---
diff --git a/app/core/core-enums.h b/app/core/core-enums.h
index 92e0200..ca30d40 100644
--- a/app/core/core-enums.h
+++ b/app/core/core-enums.h
@@ -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;
diff --git a/app/core/gimpcontext.c b/app/core/gimpcontext.c
index 32daaf0..cb1f0af 100644
--- a/app/core/gimpcontext.c
+++ b/app/core/gimpcontext.c
@@ -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]);
diff --git a/app/core/gimpstrokeoptions.c b/app/core/gimpstrokeoptions.c
index 905cc50..ea9688a 100644
--- a/app/core/gimpstrokeoptions.c
+++ b/app/core/gimpstrokeoptions.c
@@ -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),
diff --git a/app/core/gimptoolpreset.c b/app/core/gimptoolpreset.c
index f47a89a..1a5ebda 100644
--- a/app/core/gimptoolpreset.c
+++ b/app/core/gimptoolpreset.c
@@ -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;
}
diff --git a/app/paint/gimppaintoptions.h b/app/paint/gimppaintoptions.h
index 7fae6e7..c4ec593 100644
--- a/app/paint/gimppaintoptions.h
+++ b/app/paint/gimppaintoptions.h
@@ -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;
diff --git a/app/pdb/gimppdbcontext.c b/app/pdb/gimppdbcontext.c
index 30ec917..b5257a8 100644
--- a/app/pdb/gimppdbcontext.c
+++ b/app/pdb/gimppdbcontext.c
@@ -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);
diff --git a/app/pdb/paint-tools-cmds.c b/app/pdb/paint-tools-cmds.c
index 44003a2..7e677eb 100644
--- a/app/pdb/paint-tools-cmds.c
+++ b/app/pdb/paint-tools-cmds.c
@@ -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);
diff --git a/app/tools/gimp-tools.c b/app/tools/gimp-tools.c
index 3426b23..87b885a 100644
--- a/app/tools/gimp-tools.c
+++ b/app/tools/gimp-tools.c
@@ -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);
diff --git a/app/tools/gimpairbrushtool.c b/app/tools/gimpairbrushtool.c
index a0816fd..e985ff3 100644
--- a/app/tools/gimpairbrushtool.c
+++ b/app/tools/gimpairbrushtool.c
@@ -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"),
diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c
index 265653c..aa992cc 100644
--- a/app/tools/gimpblendtool.c
+++ b/app/tools/gimpblendtool.c
@@ -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"),
diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c
index 0ba7e46..206c213 100644
--- a/app/tools/gimpbucketfilltool.c
+++ b/app/tools/gimpbucketfilltool.c
@@ -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"),
diff --git a/app/tools/gimpclonetool.c b/app/tools/gimpclonetool.c
index 1e51d13..4dde602 100644
--- a/app/tools/gimpclonetool.c
+++ b/app/tools/gimpclonetool.c
@@ -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"),
diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c
index 10ff09c..e989d71 100644
--- a/app/tools/gimpcolorpickertool.c
+++ b/app/tools/gimpcolorpickertool.c
@@ -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"),
diff --git a/app/tools/gimpfliptool.c b/app/tools/gimpfliptool.c
index 75347c7..3d6ee2d 100644
--- a/app/tools/gimpfliptool.c
+++ b/app/tools/gimpfliptool.c
@@ -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: "
diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c
index cf1a5fd..317039f 100644
--- a/app/tools/gimpforegroundselecttool.c
+++ b/app/tools/gimpforegroundselecttool.c
@@ -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"),
diff --git a/app/tools/gimphandletransformtool.c b/app/tools/gimphandletransformtool.c
index b82e034..e31e03d 100644
--- a/app/tools/gimphandletransformtool.c
+++ b/app/tools/gimphandletransformtool.c
@@ -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: "
diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c
index 5c9392a..17b05c6 100644
--- a/app/tools/gimpinktool.c
+++ b/app/tools/gimpinktool.c
@@ -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"),
diff --git a/app/tools/gimpmybrushtool.c b/app/tools/gimpmybrushtool.c
index 80e082f..6756c55 100644
--- a/app/tools/gimpmybrushtool.c
+++ b/app/tools/gimpmybrushtool.c
@@ -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"),
diff --git a/app/tools/gimpoperationtool.c b/app/tools/gimpoperationtool.c
index bd8807f..7fc3ff4 100644
--- a/app/tools/gimpoperationtool.c
+++ b/app/tools/gimpoperationtool.c
@@ -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"),
diff --git a/app/tools/gimppaintbrushtool.c b/app/tools/gimppaintbrushtool.c
index 32c5623..77f7609 100644
--- a/app/tools/gimppaintbrushtool.c
+++ b/app/tools/gimppaintbrushtool.c
@@ -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"),
diff --git a/app/tools/gimppenciltool.c b/app/tools/gimppenciltool.c
index fa038c2..bd83f60 100644
--- a/app/tools/gimppenciltool.c
+++ b/app/tools/gimppenciltool.c
@@ -46,7 +46,7 @@ gimp_pencil_tool_register (GimpToolRegisterCallback callback,
GIMP_TYPE_PENCIL_OPTIONS,
gimp_paint_options_gui,
GIMP_PAINT_OPTIONS_CONTEXT_MASK |
- GIMP_CONTEXT_GRADIENT_MASK,
+ GIMP_CONTEXT_PROP_MASK_GRADIENT,
"gimp-pencil-tool",
_("Pencil"),
_("Pencil Tool: Hard edge painting using a brush"),
diff --git a/app/tools/gimpperspectiveclonetool.c b/app/tools/gimpperspectiveclonetool.c
index f5b1712..b6ff187 100644
--- a/app/tools/gimpperspectiveclonetool.c
+++ b/app/tools/gimpperspectiveclonetool.c
@@ -128,7 +128,7 @@ gimp_perspective_clone_tool_register (GimpToolRegisterCallback callback,
GIMP_TYPE_PERSPECTIVE_CLONE_OPTIONS,
gimp_perspective_clone_options_gui,
GIMP_PAINT_OPTIONS_CONTEXT_MASK |
- GIMP_CONTEXT_PATTERN_MASK,
+ GIMP_CONTEXT_PROP_MASK_PATTERN,
"gimp-perspective-clone-tool",
_("Perspective Clone"),
_("Perspective Clone Tool: Clone from an image source "
diff --git a/app/tools/gimpperspectivetool.c b/app/tools/gimpperspectivetool.c
index cb5d974..6ec48c9 100644
--- a/app/tools/gimpperspectivetool.c
+++ b/app/tools/gimpperspectivetool.c
@@ -78,7 +78,7 @@ gimp_perspective_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_PERSPECTIVE_TOOL,
GIMP_TYPE_TRANSFORM_OPTIONS,
gimp_transform_options_gui,
- GIMP_CONTEXT_BACKGROUND_MASK,
+ GIMP_CONTEXT_PROP_MASK_BACKGROUND,
"gimp-perspective-tool",
_("Perspective"),
_("Perspective Tool: "
diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c
index 0f15697..1caccbe 100644
--- a/app/tools/gimprotatetool.c
+++ b/app/tools/gimprotatetool.c
@@ -89,7 +89,7 @@ gimp_rotate_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_ROTATE_TOOL,
GIMP_TYPE_TRANSFORM_OPTIONS,
gimp_transform_options_gui,
- GIMP_CONTEXT_BACKGROUND_MASK,
+ GIMP_CONTEXT_PROP_MASK_BACKGROUND,
"gimp-rotate-tool",
_("Rotate"),
_("Rotate Tool: Rotate the layer, selection or path"),
diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c
index 5201cc4..3e9863b 100644
--- a/app/tools/gimpscaletool.c
+++ b/app/tools/gimpscaletool.c
@@ -85,7 +85,7 @@ gimp_scale_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_SCALE_TOOL,
GIMP_TYPE_TRANSFORM_OPTIONS,
gimp_transform_options_gui,
- GIMP_CONTEXT_BACKGROUND_MASK,
+ GIMP_CONTEXT_PROP_MASK_BACKGROUND,
"gimp-scale-tool",
_("Scale"),
_("Scale Tool: Scale the layer, selection or path"),
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index 5b86a66..863e5d9 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -184,9 +184,9 @@ gimp_text_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_TEXT_TOOL,
GIMP_TYPE_TEXT_OPTIONS,
gimp_text_options_gui,
- GIMP_CONTEXT_FOREGROUND_MASK |
- GIMP_CONTEXT_FONT_MASK |
- GIMP_CONTEXT_PALETTE_MASK /* for the color popup's palette tab */,
+ GIMP_CONTEXT_PROP_MASK_FOREGROUND |
+ GIMP_CONTEXT_PROP_MASK_FONT |
+ GIMP_CONTEXT_PROP_MASK_PALETTE /* for the color popup's palette tab */,
"gimp-text-tool",
_("Text"),
_("Text Tool: Create or edit text layers"),
diff --git a/app/tools/gimpunifiedtransformtool.c b/app/tools/gimpunifiedtransformtool.c
index b9f7788..7338ba2 100644
--- a/app/tools/gimpunifiedtransformtool.c
+++ b/app/tools/gimpunifiedtransformtool.c
@@ -99,7 +99,7 @@ gimp_unified_transform_tool_register (GimpToolRegisterCallback callback,
(* callback) (GIMP_TYPE_UNIFIED_TRANSFORM_TOOL,
GIMP_TYPE_TRANSFORM_OPTIONS,
gimp_transform_options_gui,
- GIMP_CONTEXT_BACKGROUND_MASK,
+ GIMP_CONTEXT_PROP_MASK_BACKGROUND,
"gimp-unified-transform-tool",
_("Unified Transform"),
_("Unified Transform Tool: "
diff --git a/app/tools/gimpvectortool.c b/app/tools/gimpvectortool.c
index 476ae7b..19cf519 100644
--- a/app/tools/gimpvectortool.c
+++ b/app/tools/gimpvectortool.c
@@ -154,8 +154,8 @@ gimp_vector_tool_register (GimpToolRegisterCallback callback,
GIMP_TYPE_VECTOR_OPTIONS,
gimp_vector_options_gui,
GIMP_PAINT_OPTIONS_CONTEXT_MASK |
- GIMP_CONTEXT_PATTERN_MASK |
- GIMP_CONTEXT_GRADIENT_MASK, /* for stroking */
+ GIMP_CONTEXT_PROP_MASK_PATTERN |
+ GIMP_CONTEXT_PROP_MASK_GRADIENT, /* for stroking */
"gimp-vector-tool",
_("Paths"),
_("Paths Tool: Create and edit paths"),
diff --git a/app/tools/tool_manager.c b/app/tools/tool_manager.c
index d272e9e..48d7bfa 100644
--- a/app/tools/tool_manager.c
+++ b/app/tools/tool_manager.c
@@ -807,21 +807,21 @@ tool_manager_connect_options (GimpToolManager *tool_manager,
GimpContextPropMask global_props = 0;
/* 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 (GIMP_CONTEXT (tool_info->tool_options),
user_context,
diff --git a/app/widgets/gimpdeviceinfo.h b/app/widgets/gimpdeviceinfo.h
index a514f46..9b191cb 100644
--- a/app/widgets/gimpdeviceinfo.h
+++ b/app/widgets/gimpdeviceinfo.h
@@ -25,14 +25,14 @@
G_BEGIN_DECLS
-#define GIMP_DEVICE_INFO_CONTEXT_MASK (GIMP_CONTEXT_TOOL_MASK | \
- GIMP_CONTEXT_PAINT_INFO_MASK | \
- GIMP_CONTEXT_FOREGROUND_MASK | \
- GIMP_CONTEXT_BACKGROUND_MASK | \
- GIMP_CONTEXT_BRUSH_MASK | \
- GIMP_CONTEXT_DYNAMICS_MASK | \
- GIMP_CONTEXT_PATTERN_MASK | \
- GIMP_CONTEXT_GRADIENT_MASK)
+#define GIMP_DEVICE_INFO_CONTEXT_MASK (GIMP_CONTEXT_PROP_MASK_TOOL | \
+ GIMP_CONTEXT_PROP_MASK_PAINT_INFO | \
+ GIMP_CONTEXT_PROP_MASK_FOREGROUND | \
+ GIMP_CONTEXT_PROP_MASK_BACKGROUND | \
+ GIMP_CONTEXT_PROP_MASK_BRUSH | \
+ GIMP_CONTEXT_PROP_MASK_DYNAMICS | \
+ GIMP_CONTEXT_PROP_MASK_PATTERN | \
+ GIMP_CONTEXT_PROP_MASK_GRADIENT)
#define GIMP_TYPE_DEVICE_INFO (gimp_device_info_get_type ())
diff --git a/app/widgets/gimpdockwindow.c b/app/widgets/gimpdockwindow.c
index c049ce5..487234f 100644
--- a/app/widgets/gimpdockwindow.c
+++ b/app/widgets/gimpdockwindow.c
@@ -343,9 +343,9 @@ gimp_dock_window_constructed (GObject *object)
dock_window);
gimp_context_define_properties (dock_window->p->context,
- GIMP_CONTEXT_ALL_PROPS_MASK &
- ~(GIMP_CONTEXT_IMAGE_MASK |
- GIMP_CONTEXT_DISPLAY_MASK),
+ GIMP_CONTEXT_PROP_MASK_ALL &
+ ~(GIMP_CONTEXT_PROP_MASK_IMAGE |
+ GIMP_CONTEXT_PROP_MASK_DISPLAY),
FALSE);
gimp_context_set_parent (dock_window->p->context,
factory_context);
@@ -1087,8 +1087,8 @@ gimp_dock_window_auto_clicked (GtkWidget *widget,
{
gimp_context_copy_properties (gimp_dialog_factory_get_context (dock_window->p->dialog_factory),
dock_window->p->context,
- GIMP_CONTEXT_DISPLAY_MASK |
- GIMP_CONTEXT_IMAGE_MASK);
+ GIMP_CONTEXT_PROP_MASK_DISPLAY |
+ GIMP_CONTEXT_PROP_MASK_IMAGE);
}
}
diff --git a/app/widgets/gimptoolpreseteditor.c b/app/widgets/gimptoolpreseteditor.c
index 9367ee2..5cfafc0 100644
--- a/app/widgets/gimptoolpreseteditor.c
+++ b/app/widgets/gimptoolpreseteditor.c
@@ -303,19 +303,26 @@ gimp_tool_preset_editor_sync_data (GimpToolPresetEditor *editor)
gimp_context_get_serialize_properties (GIMP_CONTEXT (preset->tool_options));
gtk_widget_set_sensitive (priv->fg_bg_toggle,
- (serialize_props & GIMP_CONTEXT_FOREGROUND_MASK) != 0);
+ (serialize_props &
+ GIMP_CONTEXT_PROP_MASK_FOREGROUND) != 0);
gtk_widget_set_sensitive (priv->brush_toggle,
- (serialize_props & GIMP_CONTEXT_BRUSH_MASK) != 0);
+ (serialize_props &
+ GIMP_CONTEXT_PROP_MASK_BRUSH) != 0);
gtk_widget_set_sensitive (priv->dynamics_toggle,
- (serialize_props & GIMP_CONTEXT_DYNAMICS_MASK) != 0);
+ (serialize_props &
+ GIMP_CONTEXT_PROP_MASK_DYNAMICS) != 0);
gtk_widget_set_sensitive (priv->gradient_toggle,
- (serialize_props & GIMP_CONTEXT_GRADIENT_MASK) != 0);
+ (serialize_props &
+ GIMP_CONTEXT_PROP_MASK_GRADIENT) != 0);
gtk_widget_set_sensitive (priv->pattern_toggle,
- (serialize_props & GIMP_CONTEXT_PATTERN_MASK) != 0);
+ (serialize_props &
+ GIMP_CONTEXT_PROP_MASK_PATTERN) != 0);
gtk_widget_set_sensitive (priv->palette_toggle,
- (serialize_props & GIMP_CONTEXT_PALETTE_MASK) != 0);
+ (serialize_props &
+ GIMP_CONTEXT_PROP_MASK_PALETTE) != 0);
gtk_widget_set_sensitive (priv->font_toggle,
- (serialize_props & GIMP_CONTEXT_FONT_MASK) != 0);
+ (serialize_props &
+ GIMP_CONTEXT_PROP_MASK_FONT) != 0);
}
static void
diff --git a/tools/pdbgen/pdb/paint_tools.pdb b/tools/pdbgen/pdb/paint_tools.pdb
index 51ee4f0..e21ad08 100644
--- a/tools/pdbgen/pdb/paint_tools.pdb
+++ b/tools/pdbgen/pdb/paint_tools.pdb
@@ -1009,7 +1009,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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
