dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app: rename the value-1...value-4 actions to opacity, size, aspect, angle

This commit is contained in:
Michael Natterer 2014-04-19 20:09:39 +02:00
parent 6e726f248f
commit 0bdb74710a
13 changed files with 178 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
app/actions/tools-actions.c
View File

@ -413,184 +413,178 @@ static const GimpEnumActionEntry tools_transform_preview_opacity_actions[] =
NULL }, NULL },
}; };
/* tools-value-1 is effectively used to control static const GimpEnumActionEntry tools_opacity_actions[] =
* opacity of the active tool
*/
static const GimpEnumActionEntry tools_value_1_actions[] =
{ {
{ "tools-value-1-set", GIMP_STOCK_TOOL_OPTIONS, { "tools-opacity-set", GIMP_STOCK_TOOL_OPTIONS,
"Set Value 1", NULL, NULL, "Set Opacity", NULL, NULL,
GIMP_ACTION_SELECT_SET, TRUE, GIMP_ACTION_SELECT_SET, TRUE,
NULL }, NULL },
{ "tools-value-1-set-to-default", GIMP_STOCK_TOOL_OPTIONS, { "tools-opacity-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
"Set Value 1 To Default Value", NULL, NULL, "Set Opacity To Default Value", NULL, NULL,
GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE, GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
NULL }, NULL },
{ "tools-value-1-minimum", GIMP_STOCK_TOOL_OPTIONS, { "tools-opacity-minimum", GIMP_STOCK_TOOL_OPTIONS,
"Minimize Value 1", NULL, NULL, "Minimize Opacity", NULL, NULL,
GIMP_ACTION_SELECT_FIRST, FALSE, GIMP_ACTION_SELECT_FIRST, FALSE,
NULL }, NULL },
{ "tools-value-1-maximum", GIMP_STOCK_TOOL_OPTIONS, { "tools-opacity-maximum", GIMP_STOCK_TOOL_OPTIONS,
"Maximize Value 1", NULL, NULL, "Maximize Opacity", NULL, NULL,
GIMP_ACTION_SELECT_LAST, FALSE, GIMP_ACTION_SELECT_LAST, FALSE,
NULL }, NULL },
{ "tools-value-1-decrease", GIMP_STOCK_TOOL_OPTIONS, { "tools-opacity-decrease", GIMP_STOCK_TOOL_OPTIONS,
"Decrease Value 1", "less", NULL, "Decrease Opacity", "less", NULL,
GIMP_ACTION_SELECT_PREVIOUS, FALSE, GIMP_ACTION_SELECT_PREVIOUS, FALSE,
NULL }, NULL },
{ "tools-value-1-increase", GIMP_STOCK_TOOL_OPTIONS, { "tools-opacity-increase", GIMP_STOCK_TOOL_OPTIONS,
"Increase Value 1", "greater", NULL, "Increase Opacity", "greater", NULL,
GIMP_ACTION_SELECT_NEXT, FALSE, GIMP_ACTION_SELECT_NEXT, FALSE,
NULL }, NULL },
{ "tools-value-1-decrease-skip", GIMP_STOCK_TOOL_OPTIONS, { "tools-opacity-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
"Decrease Value 1 More", "<primary>less", NULL, "Decrease Opacity More", "<primary>less", NULL,
GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE, GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
NULL }, NULL },
{ "tools-value-1-increase-skip", GIMP_STOCK_TOOL_OPTIONS, { "tools-opacity-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
"Increase Value 1 More", "<primary>greater", NULL, "Increase Opacity More", "<primary>greater", NULL,
GIMP_ACTION_SELECT_SKIP_NEXT, FALSE, GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
NULL }, NULL },
{ "tools-value-1-decrease-percent", GIMP_STOCK_TOOL_OPTIONS, { "tools-opacity-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
"Decrease Value 1 Relative", NULL, NULL, "Decrease Opacity Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE, GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
NULL }, NULL },
{ "tools-value-1-increase-percent", GIMP_STOCK_TOOL_OPTIONS, { "tools-opacity-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
"Increase Value 1 Relative", NULL, NULL, "Increase Opacity Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE, GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
NULL }, NULL },
}; };
/* tools-value-2 is effectively used to control static const GimpEnumActionEntry tools_size_actions[] =
* the tip size of the active tool
*/
static const GimpEnumActionEntry tools_value_2_actions[] =
{ {
{ "tools-value-2-set", GIMP_STOCK_TOOL_OPTIONS, { "tools-size-set", GIMP_STOCK_TOOL_OPTIONS,
"Set Value 2", NULL, NULL, "Set Size", NULL, NULL,
GIMP_ACTION_SELECT_SET, TRUE, GIMP_ACTION_SELECT_SET, TRUE,
NULL }, NULL },
{ "tools-value-2-set-to-default", GIMP_STOCK_TOOL_OPTIONS, { "tools-size-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
"Set Value 2 To Default Value", "backslash", NULL, "Set Size To Default Value", "backslash", NULL,
GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE, GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
NULL }, NULL },
{ "tools-value-2-minimum", GIMP_STOCK_TOOL_OPTIONS, { "tools-size-minimum", GIMP_STOCK_TOOL_OPTIONS,
"Minimize Value 2", NULL, NULL, "Minimize Size", NULL, NULL,
GIMP_ACTION_SELECT_FIRST, FALSE, GIMP_ACTION_SELECT_FIRST, FALSE,
NULL }, NULL },
{ "tools-value-2-maximum", GIMP_STOCK_TOOL_OPTIONS, { "tools-size-maximum", GIMP_STOCK_TOOL_OPTIONS,
"Maximize Value 2", NULL, NULL, "Maximize Size", NULL, NULL,
GIMP_ACTION_SELECT_LAST, FALSE, GIMP_ACTION_SELECT_LAST, FALSE,
NULL }, NULL },
{ "tools-value-2-decrease", GIMP_STOCK_TOOL_OPTIONS, { "tools-size-decrease", GIMP_STOCK_TOOL_OPTIONS,
"Decrease Value 2", "bracketleft", NULL, "Decrease Size", "bracketleft", NULL,
GIMP_ACTION_SELECT_PREVIOUS, FALSE, GIMP_ACTION_SELECT_PREVIOUS, FALSE,
NULL }, NULL },
{ "tools-value-2-increase", GIMP_STOCK_TOOL_OPTIONS, { "tools-size-increase", GIMP_STOCK_TOOL_OPTIONS,
"Increase Value 2", "bracketright", NULL, "Increase Size", "bracketright", NULL,
GIMP_ACTION_SELECT_NEXT, FALSE, GIMP_ACTION_SELECT_NEXT, FALSE,
NULL }, NULL },
{ "tools-value-2-decrease-skip", GIMP_STOCK_TOOL_OPTIONS, { "tools-size-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
"Decrease Value 2 More", "<shift>bracketleft", NULL, "Decrease Size More", "<shift>bracketleft", NULL,
GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE, GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
NULL }, NULL },
{ "tools-value-2-increase-skip", GIMP_STOCK_TOOL_OPTIONS, { "tools-size-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
"Increase Value 2 More", "<shift>bracketright", NULL, "Increase Size More", "<shift>bracketright", NULL,
GIMP_ACTION_SELECT_SKIP_NEXT, FALSE, GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
NULL }, NULL },
{ "tools-value-2-decrease-percent", GIMP_STOCK_TOOL_OPTIONS, { "tools-size-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
"Decrease Value 2 Relative", NULL, NULL, "Decrease Size Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE, GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
NULL }, NULL },
{ "tools-value-2-increase-percent", GIMP_STOCK_TOOL_OPTIONS, { "tools-size-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
"Increase Value 2 Relative", NULL, NULL, "Increase Size Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE, GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
NULL }, NULL },
}; };
static const GimpEnumActionEntry tools_value_3_actions[] = static const GimpEnumActionEntry tools_aspect_actions[] =
{ {
{ "tools-value-3-set", GIMP_STOCK_TOOL_OPTIONS, { "tools-aspect-set", GIMP_STOCK_TOOL_OPTIONS,
"Set Value 3", NULL, NULL, "Set Aspect Ratio", NULL, NULL,
GIMP_ACTION_SELECT_SET, TRUE, GIMP_ACTION_SELECT_SET, TRUE,
NULL }, NULL },
{ "tools-value-3-set-to-default", GIMP_STOCK_TOOL_OPTIONS, { "tools-aspect-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
"Set Value 3 To Default Value", NULL, NULL, "Set Aspect Ratio To Default Value", NULL, NULL,
GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE, GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
NULL }, NULL },
{ "tools-value-3-minimum", GIMP_STOCK_TOOL_OPTIONS, { "tools-aspect-minimum", GIMP_STOCK_TOOL_OPTIONS,
"Minimize Value 3", NULL, NULL, "Minimize Aspect Ratio", NULL, NULL,
GIMP_ACTION_SELECT_FIRST, FALSE, GIMP_ACTION_SELECT_FIRST, FALSE,
NULL }, NULL },
{ "tools-value-3-maximum", GIMP_STOCK_TOOL_OPTIONS, { "tools-aspect-maximum", GIMP_STOCK_TOOL_OPTIONS,
"Maximize Value 3", NULL, NULL, "Maximize Aspect Ratio", NULL, NULL,
GIMP_ACTION_SELECT_LAST, FALSE, GIMP_ACTION_SELECT_LAST, FALSE,
NULL }, NULL },
{ "tools-value-3-decrease", GIMP_STOCK_TOOL_OPTIONS, { "tools-aspect-decrease", GIMP_STOCK_TOOL_OPTIONS,
"Decrease Value 3", NULL, NULL, "Decrease Aspect Ratio", NULL, NULL,
GIMP_ACTION_SELECT_PREVIOUS, FALSE, GIMP_ACTION_SELECT_PREVIOUS, FALSE,
NULL }, NULL },
{ "tools-value-3-increase", GIMP_STOCK_TOOL_OPTIONS, { "tools-aspect-increase", GIMP_STOCK_TOOL_OPTIONS,
"Increase Value 3", NULL, NULL, "Increase Aspect Ratio", NULL, NULL,
GIMP_ACTION_SELECT_NEXT, FALSE, GIMP_ACTION_SELECT_NEXT, FALSE,
NULL }, NULL },
{ "tools-value-3-decrease-skip", GIMP_STOCK_TOOL_OPTIONS, { "tools-aspect-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
"Decrease Value 3 More", NULL, NULL, "Decrease Aspect Ratio More", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE, GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
NULL }, NULL },
{ "tools-value-3-increase-skip", GIMP_STOCK_TOOL_OPTIONS, { "tools-aspect-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
"Increase Value 3 More", NULL, NULL, "Increase Aspect Ratio More", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_NEXT, FALSE, GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
NULL }, NULL },
{ "tools-value-3-decrease-percent", GIMP_STOCK_TOOL_OPTIONS, { "tools-aspect-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
"Decrease Value 3 Relative", NULL, NULL, "Decrease Aspect Ratio Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE, GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
NULL }, NULL },
{ "tools-value-3-increase-percent", GIMP_STOCK_TOOL_OPTIONS, { "tools-aspect-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
"Increase Value 3 Relative", NULL, NULL, "Increase Aspect Ratio Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE, GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
NULL }, NULL },
}; };
static const GimpEnumActionEntry tools_value_4_actions[] = static const GimpEnumActionEntry tools_angle_actions[] =
{ {
{ "tools-value-4-set", GIMP_STOCK_TOOL_OPTIONS, { "tools-angle-set", GIMP_STOCK_TOOL_OPTIONS,
"Set Value 4", NULL, NULL, "Set Angle", NULL, NULL,
GIMP_ACTION_SELECT_SET, TRUE, GIMP_ACTION_SELECT_SET, TRUE,
NULL }, NULL },
{ "tools-value-4-set-to-default", GIMP_STOCK_TOOL_OPTIONS, { "tools-angle-set-to-default", GIMP_STOCK_TOOL_OPTIONS,
"Set Value 4 To Default Value", NULL, NULL, "Set Angle To Default Value", NULL, NULL,
GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE, GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
NULL }, NULL },
{ "tools-value-4-minimum", GIMP_STOCK_TOOL_OPTIONS, { "tools-angle-minimum", GIMP_STOCK_TOOL_OPTIONS,
"Minimize Value 4", NULL, NULL, "Minimize Angle", NULL, NULL,
GIMP_ACTION_SELECT_FIRST, FALSE, GIMP_ACTION_SELECT_FIRST, FALSE,
NULL }, NULL },
{ "tools-value-4-maximum", GIMP_STOCK_TOOL_OPTIONS, { "tools-angle-maximum", GIMP_STOCK_TOOL_OPTIONS,
"Maximize Value 4", NULL, NULL, "Maximize Angle", NULL, NULL,
GIMP_ACTION_SELECT_LAST, FALSE, GIMP_ACTION_SELECT_LAST, FALSE,
NULL }, NULL },
{ "tools-value-4-decrease", GIMP_STOCK_TOOL_OPTIONS, { "tools-angle-decrease", GIMP_STOCK_TOOL_OPTIONS,
"Decrease Value 4", NULL, NULL, "Decrease Angle", NULL, NULL,
GIMP_ACTION_SELECT_PREVIOUS, FALSE, GIMP_ACTION_SELECT_PREVIOUS, FALSE,
NULL }, NULL },
{ "tools-value-4-increase", GIMP_STOCK_TOOL_OPTIONS, { "tools-angle-increase", GIMP_STOCK_TOOL_OPTIONS,
"Increase Value 4", NULL, NULL, "Increase Angle", NULL, NULL,
GIMP_ACTION_SELECT_NEXT, FALSE, GIMP_ACTION_SELECT_NEXT, FALSE,
NULL }, NULL },
{ "tools-value-4-decrease-skip", GIMP_STOCK_TOOL_OPTIONS, { "tools-angle-decrease-skip", GIMP_STOCK_TOOL_OPTIONS,
"Decrease Value 4 More", NULL, NULL, "Decrease Angle More", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE, GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
NULL }, NULL },
{ "tools-value-4-increase-skip", GIMP_STOCK_TOOL_OPTIONS, { "tools-angle-increase-skip", GIMP_STOCK_TOOL_OPTIONS,
"Increase Value 4 More", NULL, NULL, "Increase Angle More", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_NEXT, FALSE, GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
NULL }, NULL },
{ "tools-value-4-decrease-percent", GIMP_STOCK_TOOL_OPTIONS, { "tools-angle-decrease-percent", GIMP_STOCK_TOOL_OPTIONS,
"Decrease Value 4 Relative", NULL, NULL, "Decrease Angle Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE, GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
NULL }, NULL },
{ "tools-value-4-increase-percent", GIMP_STOCK_TOOL_OPTIONS, { "tools-angle-increase-percent", GIMP_STOCK_TOOL_OPTIONS,
"Increase Value 4 Relative", NULL, NULL, "Increase Angle Relative", NULL, NULL,
GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE, GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
NULL }, NULL },
}; };
@ -707,21 +701,21 @@ tools_actions_setup (GimpActionGroup *group)
G_CALLBACK (tools_transform_preview_opacity_cmd_callback)); G_CALLBACK (tools_transform_preview_opacity_cmd_callback));
gimp_action_group_add_enum_actions (group, NULL, gimp_action_group_add_enum_actions (group, NULL,
tools_value_1_actions, tools_opacity_actions,
G_N_ELEMENTS (tools_value_1_actions), G_N_ELEMENTS (tools_opacity_actions),
G_CALLBACK (tools_value_1_cmd_callback)); G_CALLBACK (tools_opacity_cmd_callback));
gimp_action_group_add_enum_actions (group, NULL, gimp_action_group_add_enum_actions (group, NULL,
tools_value_2_actions, tools_size_actions,
G_N_ELEMENTS (tools_value_2_actions), G_N_ELEMENTS (tools_size_actions),
G_CALLBACK (tools_value_2_cmd_callback)); G_CALLBACK (tools_size_cmd_callback));
gimp_action_group_add_enum_actions (group, NULL, gimp_action_group_add_enum_actions (group, NULL,
tools_value_3_actions, tools_aspect_actions,
G_N_ELEMENTS (tools_value_3_actions), G_N_ELEMENTS (tools_aspect_actions),
G_CALLBACK (tools_value_3_cmd_callback)); G_CALLBACK (tools_aspect_cmd_callback));
gimp_action_group_add_enum_actions (group, NULL, gimp_action_group_add_enum_actions (group, NULL,
tools_value_4_actions, tools_angle_actions,
G_N_ELEMENTS (tools_value_4_actions), G_N_ELEMENTS (tools_angle_actions),
G_CALLBACK (tools_value_4_cmd_callback)); G_CALLBACK (tools_angle_cmd_callback));
gimp_action_group_add_enum_actions (group, NULL, gimp_action_group_add_enum_actions (group, NULL,
tools_object_1_actions, tools_object_1_actions,

28
app/actions/tools-commands.c
View File

@ -292,7 +292,7 @@ tools_transform_preview_opacity_cmd_callback (GtkAction *action,
} }
void void
tools_value_1_cmd_callback (GtkAction *action, tools_opacity_cmd_callback (GtkAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
@ -306,7 +306,7 @@ tools_value_1_cmd_callback (GtkAction *action,
{ {
const gchar *action_desc; 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) if (action_desc)
tools_activate_enum_action (action_desc, value); tools_activate_enum_action (action_desc, value);
@ -314,9 +314,9 @@ tools_value_1_cmd_callback (GtkAction *action,
} }
void void
tools_value_2_cmd_callback (GtkAction *action, tools_size_cmd_callback (GtkAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpContext *context; GimpContext *context;
GimpTool *tool; GimpTool *tool;
@ -328,7 +328,7 @@ tools_value_2_cmd_callback (GtkAction *action,
{ {
const gchar *action_desc; 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) if (action_desc)
tools_activate_enum_action (action_desc, value); tools_activate_enum_action (action_desc, value);
@ -336,9 +336,9 @@ tools_value_2_cmd_callback (GtkAction *action,
} }
void void
tools_value_3_cmd_callback (GtkAction *action, tools_aspect_cmd_callback (GtkAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpContext *context; GimpContext *context;
GimpTool *tool; GimpTool *tool;
@ -350,7 +350,7 @@ tools_value_3_cmd_callback (GtkAction *action,
{ {
const gchar *action_desc; 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) if (action_desc)
tools_activate_enum_action (action_desc, value); tools_activate_enum_action (action_desc, value);
@ -358,9 +358,9 @@ tools_value_3_cmd_callback (GtkAction *action,
} }
void void
tools_value_4_cmd_callback (GtkAction *action, tools_angle_cmd_callback (GtkAction *action,
gint value, gint value,
gpointer data) gpointer data)
{ {
GimpContext *context; GimpContext *context;
GimpTool *tool; GimpTool *tool;
@ -372,7 +372,7 @@ tools_value_4_cmd_callback (GtkAction *action,
{ {
const gchar *action_desc; 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) if (action_desc)
tools_activate_enum_action (action_desc, value); tools_activate_enum_action (action_desc, value);

8
app/actions/tools-commands.h
View File

@ -56,16 +56,16 @@ void tools_transform_preview_opacity_cmd_callback (GtkAction *action,
gint value, gint value,
gpointer data); gpointer data);
void tools_value_1_cmd_callback (GtkAction *action, void tools_opacity_cmd_callback (GtkAction *action,
gint value, gint value,
gpointer data); gpointer data);
void tools_value_2_cmd_callback (GtkAction *action, void tools_size_cmd_callback (GtkAction *action,
gint value, gint value,
gpointer data); gpointer data);
void tools_value_3_cmd_callback (GtkAction *action, void tools_aspect_cmd_callback (GtkAction *action,
gint value, gint value,
gpointer data); gpointer data);
void tools_value_4_cmd_callback (GtkAction *action, void tools_angle_cmd_callback (GtkAction *action,
gint value, gint value,
gpointer data); gpointer data);

2
app/tools/gimpblendtool.c
View File

@ -140,7 +140,7 @@ gimp_blend_tool_init (GimpBlendTool *blend_tool)
GIMP_CURSOR_PRECISION_SUBPIXEL); GIMP_CURSOR_PRECISION_SUBPIXEL);
gimp_tool_control_set_tool_cursor (tool->control, gimp_tool_control_set_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_BLEND); 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"); "context/context-opacity-set");
gimp_tool_control_set_action_object_1 (tool->control, gimp_tool_control_set_action_object_1 (tool->control,
"context/context-gradient-select-set"); "context/context-gradient-select-set");

6
app/tools/gimpbrushtool.c
View File

@ -101,11 +101,11 @@ gimp_brush_tool_init (GimpBrushTool *brush_tool)
{ {
GimpTool *tool = GIMP_TOOL (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"); "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"); "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"); "tools/tools-paint-brush-angle-set");
gimp_tool_control_set_action_object_1 (tool->control, gimp_tool_control_set_action_object_1 (tool->control,
"context/context-brush-select-set"); "context/context-brush-select-set");

2
app/tools/gimpbucketfilltool.c
View File

@ -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_wants_click (tool->control, TRUE);
gimp_tool_control_set_tool_cursor (tool->control, gimp_tool_control_set_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_BUCKET_FILL); 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"); "context/context-opacity-set");
gimp_tool_control_set_action_object_1 (tool->control, gimp_tool_control_set_action_object_1 (tool->control,
"context/context-pattern-select-set"); "context/context-pattern-select-set");

4
app/tools/gimpcolortool.c
View File

@ -168,8 +168,8 @@ gimp_color_tool_init (GimpColorTool *color_tool)
{ {
GimpTool *tool = GIMP_TOOL (color_tool); GimpTool *tool = GIMP_TOOL (color_tool);
gimp_tool_control_set_action_value_2 (tool->control, gimp_tool_control_set_action_size (tool->control,
"tools/tools-color-average-radius-set"); "tools/tools-color-average-radius-set");
color_tool->enabled = FALSE; color_tool->enabled = FALSE;
color_tool->center_x = 0; color_tool->center_x = 0;

4
app/tools/gimpforegroundselecttool.c
View File

@ -236,8 +236,8 @@ gimp_foreground_select_tool_init (GimpForegroundSelectTool *fg_select)
gimp_tool_control_set_tool_cursor (tool->control, gimp_tool_control_set_tool_cursor (tool->control,
GIMP_TOOL_CURSOR_FREE_SELECT); GIMP_TOOL_CURSOR_FREE_SELECT);
gimp_tool_control_set_action_value_2 (tool->control, gimp_tool_control_set_action_size (tool->control,
"tools/tools-foreground-select-brush-size-set"); "tools/tools-foreground-select-brush-size-set");
fg_select->state = MATTING_STATE_FREE_SELECT; fg_select->state = MATTING_STATE_FREE_SELECT;
} }

14
app/tools/gimpinktool.c
View File

@ -79,13 +79,13 @@ gimp_ink_tool_init (GimpInkTool *ink_tool)
{ {
GimpTool *tool = GIMP_TOOL (ink_tool); GimpTool *tool = GIMP_TOOL (ink_tool);
gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_INK); gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_INK);
gimp_tool_control_set_action_value_2 (tool->control, gimp_tool_control_set_action_size (tool->control,
"tools/tools-ink-blob-size-set"); "tools/tools-ink-blob-size-set");
gimp_tool_control_set_action_value_3 (tool->control, gimp_tool_control_set_action_aspect (tool->control,
"tools/tools-ink-blob-aspect-set"); "tools/tools-ink-blob-aspect-set");
gimp_tool_control_set_action_value_4 (tool->control, gimp_tool_control_set_action_angle (tool->control,
"tools/tools-ink-blob-angle-set"); "tools/tools-ink-blob-angle-set");
gimp_paint_tool_enable_color_picker (GIMP_PAINT_TOOL (ink_tool), gimp_paint_tool_enable_color_picker (GIMP_PAINT_TOOL (ink_tool),
GIMP_COLOR_PICK_MODE_FOREGROUND); GIMP_COLOR_PICK_MODE_FOREGROUND);

2
app/tools/gimppainttool.c
View File

@ -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_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT);
gimp_tool_control_set_scroll_lock (tool->control, TRUE); 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"); "context/context-opacity-set");
paint_tool->pick_colors = FALSE; paint_tool->pick_colors = FALSE;

68
app/tools/gimptoolcontrol.c
View File

@ -76,10 +76,10 @@ gimp_tool_control_init (GimpToolControl *control)
control->toggle_tool_cursor = -1; control->toggle_tool_cursor = -1;
control->toggle_cursor_modifier = -1; control->toggle_cursor_modifier = -1;
control->action_value_1 = NULL; control->action_opacity = NULL;
control->action_value_2 = NULL; control->action_size = NULL;
control->action_value_3 = NULL; control->action_aspect = NULL;
control->action_value_4 = NULL; control->action_size = NULL;
control->action_object_1 = NULL; control->action_object_1 = NULL;
control->action_object_2 = NULL; control->action_object_2 = NULL;
@ -92,10 +92,10 @@ gimp_tool_control_finalize (GObject *object)
g_slist_free (control->preserve_stack); g_slist_free (control->preserve_stack);
g_free (control->action_value_1); g_free (control->action_opacity);
g_free (control->action_value_2); g_free (control->action_size);
g_free (control->action_value_3); g_free (control->action_aspect);
g_free (control->action_value_4); g_free (control->action_angle);
g_free (control->action_object_1); g_free (control->action_object_1);
g_free (control->action_object_2); g_free (control->action_object_2);
@ -504,87 +504,87 @@ gimp_tool_control_get_cursor_modifier (GimpToolControl *control)
} }
void void
gimp_tool_control_set_action_value_1 (GimpToolControl *control, gimp_tool_control_set_action_opacity (GimpToolControl *control,
const gchar *action) const gchar *action)
{ {
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control)); 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); g_free (control->action_opacity);
control->action_value_1 = g_strdup (action); control->action_opacity = g_strdup (action);
} }
} }
const gchar * 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); g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
return control->action_value_1; return control->action_opacity;
} }
void void
gimp_tool_control_set_action_value_2 (GimpToolControl *control, gimp_tool_control_set_action_size (GimpToolControl *control,
const gchar *action) const gchar *action)
{ {
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control)); 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); g_free (control->action_size);
control->action_value_2 = g_strdup (action); control->action_size = g_strdup (action);
} }
} }
const gchar * 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); g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
return control->action_value_2; return control->action_size;
} }
void void
gimp_tool_control_set_action_value_3 (GimpToolControl *control, gimp_tool_control_set_action_aspect (GimpToolControl *control,
const gchar *action) const gchar *action)
{ {
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control)); 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); g_free (control->action_aspect);
control->action_value_3 = g_strdup (action); control->action_aspect = g_strdup (action);
} }
} }
const gchar * 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); g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
return control->action_value_3; return control->action_aspect;
} }
void void
gimp_tool_control_set_action_value_4 (GimpToolControl *control, gimp_tool_control_set_action_angle (GimpToolControl *control,
const gchar *action) const gchar *action)
{ {
g_return_if_fail (GIMP_IS_TOOL_CONTROL (control)); 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); g_free (control->action_angle);
control->action_value_4 = g_strdup (action); control->action_angle = g_strdup (action);
} }
} }
const gchar * 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); g_return_val_if_fail (GIMP_IS_TOOL_CONTROL (control), NULL);
return control->action_value_4; return control->action_angle;
} }
void void

24
app/tools/gimptoolcontrol.h
View File

@ -74,10 +74,10 @@ struct _GimpToolControl
GimpToolCursorType toggle_tool_cursor; GimpToolCursorType toggle_tool_cursor;
GimpCursorModifier toggle_cursor_modifier; GimpCursorModifier toggle_cursor_modifier;
gchar *action_value_1; gchar *action_opacity;
gchar *action_value_2; gchar *action_size;
gchar *action_value_3; gchar *action_aspect;
gchar *action_value_4; gchar *action_angle;
gchar *action_object_1; gchar *action_object_1;
gchar *action_object_2; gchar *action_object_2;
}; };
@ -184,21 +184,21 @@ GimpToolCursorType
GimpCursorModifier GimpCursorModifier
gimp_tool_control_get_cursor_modifier (GimpToolControl *control); 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 *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 *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 *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 *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, void gimp_tool_control_set_action_object_1 (GimpToolControl *control,
const gchar *action); const gchar *action);

2
app/tools/gimptransformtool.c
View File

@ -225,7 +225,7 @@ gimp_transform_tool_init (GimpTransformTool *tr_tool)
{ {
GimpTool *tool = GIMP_TOOL (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"); "tools/tools-transform-preview-opacity-set");
gimp_tool_control_set_scroll_lock (tool->control, TRUE); gimp_tool_control_set_scroll_lock (tool->control, TRUE);