[gimp] app: rename the value-1...value-4 actions to opacity, size, aspect, angle
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: rename the value-1...value-4 actions to opacity, size, aspect, angle
- Date: Sat, 19 Apr 2014 18:12:09 +0000 (UTC)
commit 0bdb74710a1678cf8f258133b876688ced28c2e1
Author: Michael Natterer <mitch gimp org>
Date: Sat Apr 19 20:09:39 2014 +0200
app: rename the value-1...value-4 actions to opacity, size, aspect, angle
app/actions/tools-actions.c | 198 ++++++++++++++++-----------------
app/actions/tools-commands.c | 28 +++---
app/actions/tools-commands.h | 8 +-
app/tools/gimpblendtool.c | 2 +-
app/tools/gimpbrushtool.c | 6 +-
app/tools/gimpbucketfilltool.c | 2 +-
app/tools/gimpcolortool.c | 4 +-
app/tools/gimpforegroundselecttool.c | 4 +-
app/tools/gimpinktool.c | 14 ++--
app/tools/gimppainttool.c | 2 +-
app/tools/gimptoolcontrol.c | 68 ++++++------
app/tools/gimptoolcontrol.h | 24 ++--
app/tools/gimptransformtool.c | 2 +-
13 files changed, 178 insertions(+), 184 deletions(-)
---
diff --git a/app/actions/tools-actions.c b/app/actions/tools-actions.c
index 688d4e3..8cbe992 100644
--- a/app/actions/tools-actions.c
+++ b/app/actions/tools-actions.c
@@ -413,184 +413,178 @@ static const GimpEnumActionEntry tools_transform_preview_opacity_actions[] =
NULL },
};
-/* tools-value-1 is effectively used to control
- * opacity of the active tool
- */
-static const GimpEnumActionEntry tools_value_1_actions[] =
+static const GimpEnumActionEntry tools_opacity_actions[] =
{
- { "tools-value-1-set", GIMP_STOCK_TOOL_OPTIONS,
- "Set Value 1", NULL, NULL,
+ { "tools-opacity-set", GIMP_STOCK_TOOL_OPTIONS,
+ "Set Opacity", NULL, NULL,
GIMP_ACTION_SELECT_SET, TRUE,
NULL },
- { "tools-value-1-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
- "Set Value 1 To Default Value", NULL, NULL,
+ { "tools-opacity-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
+ "Set Opacity To Default Value", NULL, NULL,
GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
NULL },
- { "tools-value-1-minimum", GIMP_STOCK_TOOL_OPTIONS,
- "Minimize Value 1", NULL, NULL,
+ { "tools-opacity-minimum", GIMP_STOCK_TOOL_OPTIONS,
+ "Minimize Opacity", NULL, NULL,
GIMP_ACTION_SELECT_FIRST, FALSE,
NULL },
- { "tools-value-1-maximum", GIMP_STOCK_TOOL_OPTIONS,
- "Maximize Value 1", NULL, NULL,
+ { "tools-opacity-maximum", GIMP_STOCK_TOOL_OPTIONS,
+ "Maximize Opacity", NULL, NULL,
GIMP_ACTION_SELECT_LAST, FALSE,
NULL },
- { "tools-value-1-decrease", GIMP_STOCK_TOOL_OPTIONS,
- "Decrease Value 1", "less", NULL,
+ { "tools-opacity-decrease", GIMP_STOCK_TOOL_OPTIONS,
+ "Decrease Opacity", "less", NULL,
GIMP_ACTION_SELECT_PREVIOUS, FALSE,
NULL },
- { "tools-value-1-increase", GIMP_STOCK_TOOL_OPTIONS,
- "Increase Value 1", "greater", NULL,
+ { "tools-opacity-increase", GIMP_STOCK_TOOL_OPTIONS,
+ "Increase Opacity", "greater", NULL,
GIMP_ACTION_SELECT_NEXT, FALSE,
NULL },
- { "tools-value-1-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
- "Decrease Value 1 More", "<primary>less", NULL,
+ { "tools-opacity-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
+ "Decrease Opacity More", "<primary>less", NULL,
GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
NULL },
- { "tools-value-1-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
- "Increase Value 1 More", "<primary>greater", NULL,
+ { "tools-opacity-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
+ "Increase Opacity More", "<primary>greater", NULL,
GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
NULL },
- { "tools-value-1-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
- "Decrease Value 1 Relative", NULL, NULL,
+ { "tools-opacity-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
+ "Decrease Opacity Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
NULL },
- { "tools-value-1-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
- "Increase Value 1 Relative", NULL, NULL,
+ { "tools-opacity-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
+ "Increase Opacity Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
NULL },
};
-/* tools-value-2 is effectively used to control
- * the tip size of the active tool
- */
-static const GimpEnumActionEntry tools_value_2_actions[] =
+static const GimpEnumActionEntry tools_size_actions[] =
{
- { "tools-value-2-set", GIMP_STOCK_TOOL_OPTIONS,
- "Set Value 2", NULL, NULL,
+ { "tools-size-set", GIMP_STOCK_TOOL_OPTIONS,
+ "Set Size", NULL, NULL,
GIMP_ACTION_SELECT_SET, TRUE,
NULL },
- { "tools-value-2-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
- "Set Value 2 To Default Value", "backslash", NULL,
+ { "tools-size-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
+ "Set Size To Default Value", "backslash", NULL,
GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
NULL },
- { "tools-value-2-minimum", GIMP_STOCK_TOOL_OPTIONS,
- "Minimize Value 2", NULL, NULL,
+ { "tools-size-minimum", GIMP_STOCK_TOOL_OPTIONS,
+ "Minimize Size", NULL, NULL,
GIMP_ACTION_SELECT_FIRST, FALSE,
NULL },
- { "tools-value-2-maximum", GIMP_STOCK_TOOL_OPTIONS,
- "Maximize Value 2", NULL, NULL,
+ { "tools-size-maximum", GIMP_STOCK_TOOL_OPTIONS,
+ "Maximize Size", NULL, NULL,
GIMP_ACTION_SELECT_LAST, FALSE,
NULL },
- { "tools-value-2-decrease", GIMP_STOCK_TOOL_OPTIONS,
- "Decrease Value 2", "bracketleft", NULL,
+ { "tools-size-decrease", GIMP_STOCK_TOOL_OPTIONS,
+ "Decrease Size", "bracketleft", NULL,
GIMP_ACTION_SELECT_PREVIOUS, FALSE,
NULL },
- { "tools-value-2-increase", GIMP_STOCK_TOOL_OPTIONS,
- "Increase Value 2", "bracketright", NULL,
+ { "tools-size-increase", GIMP_STOCK_TOOL_OPTIONS,
+ "Increase Size", "bracketright", NULL,
GIMP_ACTION_SELECT_NEXT, FALSE,
NULL },
- { "tools-value-2-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
- "Decrease Value 2 More", "<shift>bracketleft", NULL,
+ { "tools-size-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
+ "Decrease Size More", "<shift>bracketleft", NULL,
GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
NULL },
- { "tools-value-2-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
- "Increase Value 2 More", "<shift>bracketright", NULL,
+ { "tools-size-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
+ "Increase Size More", "<shift>bracketright", NULL,
GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
NULL },
- { "tools-value-2-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
- "Decrease Value 2 Relative", NULL, NULL,
+ { "tools-size-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
+ "Decrease Size Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
NULL },
- { "tools-value-2-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
- "Increase Value 2 Relative", NULL, NULL,
+ { "tools-size-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
+ "Increase Size Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
NULL },
};
-static const GimpEnumActionEntry tools_value_3_actions[] =
+static const GimpEnumActionEntry tools_aspect_actions[] =
{
- { "tools-value-3-set", GIMP_STOCK_TOOL_OPTIONS,
- "Set Value 3", NULL, NULL,
+ { "tools-aspect-set", GIMP_STOCK_TOOL_OPTIONS,
+ "Set Aspect Ratio", NULL, NULL,
GIMP_ACTION_SELECT_SET, TRUE,
NULL },
- { "tools-value-3-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
- "Set Value 3 To Default Value", NULL, NULL,
+ { "tools-aspect-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
+ "Set Aspect Ratio To Default Value", NULL, NULL,
GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
NULL },
- { "tools-value-3-minimum", GIMP_STOCK_TOOL_OPTIONS,
- "Minimize Value 3", NULL, NULL,
+ { "tools-aspect-minimum", GIMP_STOCK_TOOL_OPTIONS,
+ "Minimize Aspect Ratio", NULL, NULL,
GIMP_ACTION_SELECT_FIRST, FALSE,
NULL },
- { "tools-value-3-maximum", GIMP_STOCK_TOOL_OPTIONS,
- "Maximize Value 3", NULL, NULL,
+ { "tools-aspect-maximum", GIMP_STOCK_TOOL_OPTIONS,
+ "Maximize Aspect Ratio", NULL, NULL,
GIMP_ACTION_SELECT_LAST, FALSE,
NULL },
- { "tools-value-3-decrease", GIMP_STOCK_TOOL_OPTIONS,
- "Decrease Value 3", NULL, NULL,
+ { "tools-aspect-decrease", GIMP_STOCK_TOOL_OPTIONS,
+ "Decrease Aspect Ratio", NULL, NULL,
GIMP_ACTION_SELECT_PREVIOUS, FALSE,
NULL },
- { "tools-value-3-increase", GIMP_STOCK_TOOL_OPTIONS,
- "Increase Value 3", NULL, NULL,
+ { "tools-aspect-increase", GIMP_STOCK_TOOL_OPTIONS,
+ "Increase Aspect Ratio", NULL, NULL,
GIMP_ACTION_SELECT_NEXT, FALSE,
NULL },
- { "tools-value-3-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
- "Decrease Value 3 More", NULL, NULL,
+ { "tools-aspect-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
+ "Decrease Aspect Ratio More", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
NULL },
- { "tools-value-3-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
- "Increase Value 3 More", NULL, NULL,
+ { "tools-aspect-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
+ "Increase Aspect Ratio More", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
NULL },
- { "tools-value-3-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
- "Decrease Value 3 Relative", NULL, NULL,
+ { "tools-aspect-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
+ "Decrease Aspect Ratio Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
NULL },
- { "tools-value-3-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
- "Increase Value 3 Relative", NULL, NULL,
+ { "tools-aspect-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
+ "Increase Aspect Ratio Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
NULL },
};
-static const GimpEnumActionEntry tools_value_4_actions[] =
+static const GimpEnumActionEntry tools_angle_actions[] =
{
- { "tools-value-4-set", GIMP_STOCK_TOOL_OPTIONS,
- "Set Value 4", NULL, NULL,
+ { "tools-angle-set", GIMP_STOCK_TOOL_OPTIONS,
+ "Set Angle", NULL, NULL,
GIMP_ACTION_SELECT_SET, TRUE,
NULL },
- { "tools-value-4-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
- "Set Value 4 To Default Value", NULL, NULL,
+ { "tools-angle-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
+ "Set Angle To Default Value", NULL, NULL,
GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
NULL },
- { "tools-value-4-minimum", GIMP_STOCK_TOOL_OPTIONS,
- "Minimize Value 4", NULL, NULL,
+ { "tools-angle-minimum", GIMP_STOCK_TOOL_OPTIONS,
+ "Minimize Angle", NULL, NULL,
GIMP_ACTION_SELECT_FIRST, FALSE,
NULL },
- { "tools-value-4-maximum", GIMP_STOCK_TOOL_OPTIONS,
- "Maximize Value 4", NULL, NULL,
+ { "tools-angle-maximum", GIMP_STOCK_TOOL_OPTIONS,
+ "Maximize Angle", NULL, NULL,
GIMP_ACTION_SELECT_LAST, FALSE,
NULL },
- { "tools-value-4-decrease", GIMP_STOCK_TOOL_OPTIONS,
- "Decrease Value 4", NULL, NULL,
+ { "tools-angle-decrease", GIMP_STOCK_TOOL_OPTIONS,
+ "Decrease Angle", NULL, NULL,
GIMP_ACTION_SELECT_PREVIOUS, FALSE,
NULL },
- { "tools-value-4-increase", GIMP_STOCK_TOOL_OPTIONS,
- "Increase Value 4", NULL, NULL,
+ { "tools-angle-increase", GIMP_STOCK_TOOL_OPTIONS,
+ "Increase Angle", NULL, NULL,
GIMP_ACTION_SELECT_NEXT, FALSE,
NULL },
- { "tools-value-4-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
- "Decrease Value 4 More", NULL, NULL,
+ { "tools-angle-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
+ "Decrease Angle More", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
NULL },
- { "tools-value-4-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
- "Increase Value 4 More", NULL, NULL,
+ { "tools-angle-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
+ "Increase Angle More", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
NULL },
- { "tools-value-4-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
- "Decrease Value 4 Relative", NULL, NULL,
+ { "tools-angle-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
+ "Decrease Angle Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
NULL },
- { "tools-value-4-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
- "Increase Value 4 Relative", NULL, NULL,
+ { "tools-angle-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
+ "Increase Angle Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
NULL },
};
@@ -707,21 +701,21 @@ tools_actions_setup (GimpActionGroup *group)
G_CALLBACK (tools_transform_preview_opacity_cmd_callback));
gimp_action_group_add_enum_actions (group, NULL,
- tools_value_1_actions,
- G_N_ELEMENTS (tools_value_1_actions),
- G_CALLBACK (tools_value_1_cmd_callback));
+ tools_opacity_actions,
+ G_N_ELEMENTS (tools_opacity_actions),
+ G_CALLBACK (tools_opacity_cmd_callback));
gimp_action_group_add_enum_actions (group, NULL,
- tools_value_2_actions,
- G_N_ELEMENTS (tools_value_2_actions),
- G_CALLBACK (tools_value_2_cmd_callback));
+ tools_size_actions,
+ G_N_ELEMENTS (tools_size_actions),
+ G_CALLBACK (tools_size_cmd_callback));
gimp_action_group_add_enum_actions (group, NULL,
- tools_value_3_actions,
- G_N_ELEMENTS (tools_value_3_actions),
- G_CALLBACK (tools_value_3_cmd_callback));
+ tools_aspect_actions,
+ G_N_ELEMENTS (tools_aspect_actions),
+ G_CALLBACK (tools_aspect_cmd_callback));
gimp_action_group_add_enum_actions (group, NULL,
- tools_value_4_actions,
- G_N_ELEMENTS (tools_value_4_actions),
- G_CALLBACK (tools_value_4_cmd_callback));
+ tools_angle_actions,
+ G_N_ELEMENTS (tools_angle_actions),
+ G_CALLBACK (tools_angle_cmd_callback));
gimp_action_group_add_enum_actions (group, NULL,
tools_object_1_actions,
diff --git a/app/actions/tools-commands.c b/app/actions/tools-commands.c
index 9c3a41d..fcb4143 100644
--- a/app/actions/tools-commands.c
+++ b/app/actions/tools-commands.c
@@ -292,7 +292,7 @@ tools_transform_preview_opacity_cmd_callback (GtkAction *action,
}
void
-tools_value_1_cmd_callback (GtkAction *action,
+tools_opacity_cmd_callback (GtkAction *action,
gint value,
gpointer data)
{
@@ -306,7 +306,7 @@ tools_value_1_cmd_callback (GtkAction *action,
{
const gchar *action_desc;
- action_desc = gimp_tool_control_get_action_value_1 (tool->control);
+ action_desc = gimp_tool_control_get_action_opacity (tool->control);
if (action_desc)
tools_activate_enum_action (action_desc, value);
@@ -314,9 +314,9 @@ tools_value_1_cmd_callback (GtkAction *action,
}
void
-tools_value_2_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_size_cmd_callback (GtkAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpTool *tool;
@@ -328,7 +328,7 @@ tools_value_2_cmd_callback (GtkAction *action,
{
const gchar *action_desc;
- action_desc = gimp_tool_control_get_action_value_2 (tool->control);
+ action_desc = gimp_tool_control_get_action_size (tool->control);
if (action_desc)
tools_activate_enum_action (action_desc, value);
@@ -336,9 +336,9 @@ tools_value_2_cmd_callback (GtkAction *action,
}
void
-tools_value_3_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_aspect_cmd_callback (GtkAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpTool *tool;
@@ -350,7 +350,7 @@ tools_value_3_cmd_callback (GtkAction *action,
{
const gchar *action_desc;
- action_desc = gimp_tool_control_get_action_value_3 (tool->control);
+ action_desc = gimp_tool_control_get_action_aspect (tool->control);
if (action_desc)
tools_activate_enum_action (action_desc, value);
@@ -358,9 +358,9 @@ tools_value_3_cmd_callback (GtkAction *action,
}
void
-tools_value_4_cmd_callback (GtkAction *action,
- gint value,
- gpointer data)
+tools_angle_cmd_callback (GtkAction *action,
+ gint value,
+ gpointer data)
{
GimpContext *context;
GimpTool *tool;
@@ -372,7 +372,7 @@ tools_value_4_cmd_callback (GtkAction *action,
{
const gchar *action_desc;
- action_desc = gimp_tool_control_get_action_value_4 (tool->control);
+ action_desc = gimp_tool_control_get_action_angle (tool->control);
if (action_desc)
tools_activate_enum_action (action_desc, value);
diff --git a/app/actions/tools-commands.h b/app/actions/tools-commands.h
index 3e19b51..c923e62 100644
--- a/app/actions/tools-commands.h
+++ b/app/actions/tools-commands.h
@@ -56,16 +56,16 @@ void tools_transform_preview_opacity_cmd_callback (GtkAction *action,
gint value,
gpointer data);
-void tools_value_1_cmd_callback (GtkAction *action,
+void tools_opacity_cmd_callback (GtkAction *action,
gint value,
gpointer data);
-void tools_value_2_cmd_callback (GtkAction *action,
+void tools_size_cmd_callback (GtkAction *action,
gint value,
gpointer data);
-void tools_value_3_cmd_callback (GtkAction *action,
+void tools_aspect_cmd_callback (GtkAction *action,
gint value,
gpointer data);
-void tools_value_4_cmd_callback (GtkAction *action,
+void tools_angle_cmd_callback (GtkAction *action,
gint value,
gpointer data);
diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c
index b4ccbef..20cd26c 100644
--- a/app/tools/gimpblendtool.c
+++ b/app/tools/gimpblendtool.c
@@ -140,7 +140,7 @@ gimp_blend_tool_init (GimpBlendTool *blend_tool)
GIMP_CURSOR_PRECISION_SUBPIXEL);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_BLEND);
- gimp_tool_control_set_action_value_1 (tool->control,
+ gimp_tool_control_set_action_opacity (tool->control,
"context/context-opacity-set");
gimp_tool_control_set_action_object_1 (tool->control,
"context/context-gradient-select-set");
diff --git a/app/tools/gimpbrushtool.c b/app/tools/gimpbrushtool.c
index bda2e09..9b5c253 100644
--- a/app/tools/gimpbrushtool.c
+++ b/app/tools/gimpbrushtool.c
@@ -101,11 +101,11 @@ gimp_brush_tool_init (GimpBrushTool *brush_tool)
{
GimpTool *tool = GIMP_TOOL (brush_tool);
- gimp_tool_control_set_action_value_2 (tool->control,
+ gimp_tool_control_set_action_size (tool->control,
"tools/tools-paint-brush-size-set");
- gimp_tool_control_set_action_value_3 (tool->control,
+ gimp_tool_control_set_action_aspect (tool->control,
"tools/tools-paint-brush-aspect-ratio-set");
- gimp_tool_control_set_action_value_4 (tool->control,
+ gimp_tool_control_set_action_angle (tool->control,
"tools/tools-paint-brush-angle-set");
gimp_tool_control_set_action_object_1 (tool->control,
"context/context-brush-select-set");
diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c
index e077f22..3722a23 100644
--- a/app/tools/gimpbucketfilltool.c
+++ b/app/tools/gimpbucketfilltool.c
@@ -112,7 +112,7 @@ gimp_bucket_fill_tool_init (GimpBucketFillTool *bucket_fill_tool)
gimp_tool_control_set_wants_click (tool->control, TRUE);
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_BUCKET_FILL);
- gimp_tool_control_set_action_value_1 (tool->control,
+ gimp_tool_control_set_action_opacity (tool->control,
"context/context-opacity-set");
gimp_tool_control_set_action_object_1 (tool->control,
"context/context-pattern-select-set");
diff --git a/app/tools/gimpcolortool.c b/app/tools/gimpcolortool.c
index 9798aea..76eb7d5 100644
--- a/app/tools/gimpcolortool.c
+++ b/app/tools/gimpcolortool.c
@@ -168,8 +168,8 @@ gimp_color_tool_init (GimpColorTool *color_tool)
{
GimpTool *tool = GIMP_TOOL (color_tool);
- gimp_tool_control_set_action_value_2 (tool->control,
- "tools/tools-color-average-radius-set");
+ gimp_tool_control_set_action_size (tool->control,
+ "tools/tools-color-average-radius-set");
color_tool->enabled = FALSE;
color_tool->center_x = 0;
diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c
index 3b6a18d..203d0a8 100644
--- a/app/tools/gimpforegroundselecttool.c
+++ b/app/tools/gimpforegroundselecttool.c
@@ -236,8 +236,8 @@ gimp_foreground_select_tool_init (GimpForegroundSelectTool *fg_select)
gimp_tool_control_set_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_FREE_SELECT);
- gimp_tool_control_set_action_value_2 (tool->control,
- "tools/tools-foreground-select-brush-size-set");
+ gimp_tool_control_set_action_size (tool->control,
+ "tools/tools-foreground-select-brush-size-set");
fg_select->state = MATTING_STATE_FREE_SELECT;
}
diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c
index 4df6026..5c9392a 100644
--- a/app/tools/gimpinktool.c
+++ b/app/tools/gimpinktool.c
@@ -79,13 +79,13 @@ gimp_ink_tool_init (GimpInkTool *ink_tool)
{
GimpTool *tool = GIMP_TOOL (ink_tool);
- gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_INK);
- gimp_tool_control_set_action_value_2 (tool->control,
- "tools/tools-ink-blob-size-set");
- gimp_tool_control_set_action_value_3 (tool->control,
- "tools/tools-ink-blob-aspect-set");
- gimp_tool_control_set_action_value_4 (tool->control,
- "tools/tools-ink-blob-angle-set");
+ gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_INK);
+ gimp_tool_control_set_action_size (tool->control,
+ "tools/tools-ink-blob-size-set");
+ gimp_tool_control_set_action_aspect (tool->control,
+ "tools/tools-ink-blob-aspect-set");
+ gimp_tool_control_set_action_angle (tool->control,
+ "tools/tools-ink-blob-angle-set");
gimp_paint_tool_enable_color_picker (GIMP_PAINT_TOOL (ink_tool),
GIMP_COLOR_PICK_MODE_FOREGROUND);
diff --git a/app/tools/gimppainttool.c b/app/tools/gimppainttool.c
index 91f5f51..ab8deee 100644
--- a/app/tools/gimppainttool.c
+++ b/app/tools/gimppainttool.c
@@ -140,7 +140,7 @@ gimp_paint_tool_init (GimpPaintTool *paint_tool)
gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
- gimp_tool_control_set_action_value_1 (tool->control,
+ gimp_tool_control_set_action_opacity (tool->control,
"context/context-opacity-set");
paint_tool->pick_colors = FALSE;
diff --git a/app/tools/gimptoolcontrol.c b/app/tools/gimptoolcontrol.c
index c7e939e..f4c92e8 100644
--- a/app/tools/gimptoolcontrol.c
+++ b/app/tools/gimptoolcontrol.c
@@ -76,10 +76,10 @@ gimp_tool_control_init (GimpToolControl *control)
control->toggle_tool_cursor = -1;
control->toggle_cursor_modifier = -1;
- control->action_value_1 = NULL;
- control->action_value_2 = NULL;
- control->action_value_3 = NULL;
- control->action_value_4 = NULL;
+ control->action_opacity = NULL;
+ control->action_size = NULL;
+ control->action_aspect = NULL;
+ control->action_size = NULL;
control->action_object_1 = NULL;
control->action_object_2 = NULL;
@@ -92,10 +92,10 @@ gimp_tool_control_finalize (GObject *object)
g_slist_free (control->preserve_stack);
- g_free (control->action_value_1);
- g_free (control->action_value_2);
- g_free (control->action_value_3);
- g_free (control->action_value_4);
+ g_free (control->action_opacity);
+ g_free (control->action_size);
+ g_free (control->action_aspect);
+ g_free (control->action_angle);
g_free (control->action_object_1);
g_free (control->action_object_2);
@@ -504,87 +504,87 @@ gimp_tool_control_get_cursor_modifier (GimpToolControl *control)
}
void
-gimp_tool_control_set_action_value_1 (GimpToolControl *control,
+gimp_tool_control_set_action_opacity (GimpToolControl *control,
const gchar *action)
{
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
- if (action != control->action_value_1)
+ if (action != control->action_opacity)
{
- g_free (control->action_value_1);
- control->action_value_1 = g_strdup (action);
+ g_free (control->action_opacity);
+ control->action_opacity = g_strdup (action);
}
}
const gchar *
-gimp_tool_control_get_action_value_1 (GimpToolControl *control)
+gimp_tool_control_get_action_opacity (GimpToolControl *control)
{
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
- return control->action_value_1;
+ return control->action_opacity;
}
void
-gimp_tool_control_set_action_value_2 (GimpToolControl *control,
+gimp_tool_control_set_action_size (GimpToolControl *control,
const gchar *action)
{
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
- if (action != control->action_value_2)
+ if (action != control->action_size)
{
- g_free (control->action_value_2);
- control->action_value_2 = g_strdup (action);
+ g_free (control->action_size);
+ control->action_size = g_strdup (action);
}
}
const gchar *
-gimp_tool_control_get_action_value_2 (GimpToolControl *control)
+gimp_tool_control_get_action_size (GimpToolControl *control)
{
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
- return control->action_value_2;
+ return control->action_size;
}
void
-gimp_tool_control_set_action_value_3 (GimpToolControl *control,
- const gchar *action)
+gimp_tool_control_set_action_aspect (GimpToolControl *control,
+ const gchar *action)
{
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
- if (action != control->action_value_3)
+ if (action != control->action_aspect)
{
- g_free (control->action_value_3);
- control->action_value_3 = g_strdup (action);
+ g_free (control->action_aspect);
+ control->action_aspect = g_strdup (action);
}
}
const gchar *
-gimp_tool_control_get_action_value_3 (GimpToolControl *control)
+gimp_tool_control_get_action_aspect (GimpToolControl *control)
{
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
- return control->action_value_3;
+ return control->action_aspect;
}
void
-gimp_tool_control_set_action_value_4 (GimpToolControl *control,
- const gchar *action)
+gimp_tool_control_set_action_angle (GimpToolControl *control,
+ const gchar *action)
{
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control));
- if (action != control->action_value_4)
+ if (action != control->action_angle)
{
- g_free (control->action_value_4);
- control->action_value_4 = g_strdup (action);
+ g_free (control->action_angle);
+ control->action_angle = g_strdup (action);
}
}
const gchar *
-gimp_tool_control_get_action_value_4 (GimpToolControl *control)
+gimp_tool_control_get_action_angle (GimpToolControl *control)
{
g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
- return control->action_value_4;
+ return control->action_angle;
}
void
diff --git a/app/tools/gimptoolcontrol.h b/app/tools/gimptoolcontrol.h
index 398a8b7..d850cc6 100644
--- a/app/tools/gimptoolcontrol.h
+++ b/app/tools/gimptoolcontrol.h
@@ -74,10 +74,10 @@ struct _GimpToolControl
GimpToolCursorType toggle_tool_cursor;
GimpCursorModifier toggle_cursor_modifier;
- gchar *action_value_1;
- gchar *action_value_2;
- gchar *action_value_3;
- gchar *action_value_4;
+ gchar *action_opacity;
+ gchar *action_size;
+ gchar *action_aspect;
+ gchar *action_angle;
gchar *action_object_1;
gchar *action_object_2;
};
@@ -184,21 +184,21 @@ GimpToolCursorType
GimpCursorModifier
gimp_tool_control_get_cursor_modifier (GimpToolControl *control);
-void gimp_tool_control_set_action_value_1 (GimpToolControl *control,
+void gimp_tool_control_set_action_opacity (GimpToolControl *control,
const gchar *action);
-const gchar * gimp_tool_control_get_action_value_1 (GimpToolControl *control);
+const gchar * gimp_tool_control_get_action_opacity (GimpToolControl *control);
-void gimp_tool_control_set_action_value_2 (GimpToolControl *control,
+void gimp_tool_control_set_action_size (GimpToolControl *control,
const gchar *action);
-const gchar * gimp_tool_control_get_action_value_2 (GimpToolControl *control);
+const gchar * gimp_tool_control_get_action_size (GimpToolControl *control);
-void gimp_tool_control_set_action_value_3 (GimpToolControl *control,
+void gimp_tool_control_set_action_aspect (GimpToolControl *control,
const gchar *action);
-const gchar * gimp_tool_control_get_action_value_3 (GimpToolControl *control);
+const gchar * gimp_tool_control_get_action_aspect (GimpToolControl *control);
-void gimp_tool_control_set_action_value_4 (GimpToolControl *control,
+void gimp_tool_control_set_action_angle (GimpToolControl *control,
const gchar *action);
-const gchar * gimp_tool_control_get_action_value_4 (GimpToolControl *control);
+const gchar * gimp_tool_control_get_action_angle (GimpToolControl *control);
void gimp_tool_control_set_action_object_1 (GimpToolControl *control,
const gchar *action);
diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c
index df87d6f..ef72997 100644
--- a/app/tools/gimptransformtool.c
+++ b/app/tools/gimptransformtool.c
@@ -225,7 +225,7 @@ gimp_transform_tool_init (GimpTransformTool *tr_tool)
{
GimpTool *tool = GIMP_TOOL (tr_tool);
- gimp_tool_control_set_action_value_1 (tool->control,
+ gimp_tool_control_set_action_opacity (tool->control,
"tools/tools-transform-preview-opacity-set");
gimp_tool_control_set_scroll_lock (tool->control, TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
