removed action "select-by-color".

2004-05-05  Michael Natterer  <mitch@gimp.org>

	* app/actions/select-actions.c: removed action "select-by-color".

	* app/tools/gimpbycolorselecttool.c: add the shortcut here.

	* app/actions/tools-actions.c: added alternative tool actions for
	"by-color-select" and "rotate" which are identical to the ones
	generated from the GimpToolInfo except for their label. Make sure
	they have the same accelerators as the generated ones.

	* menus/image-menu.xml.in: use the alternative actions for
	"<Image>/Select/By Color" and
	"<Layer>/Transform/Arbitrary Rotation...".
This commit is contained in:
Michael Natterer
2004-05-05 01:17:23 +00:00
committed by Michael Natterer
parent ebbc8e13db
commit 6bed69024f
5 changed files with 46 additions and 19 deletions

View File

@ -1,3 +1,18 @@
2004-05-05 Michael Natterer <mitch@gimp.org>
* app/actions/select-actions.c: removed action "select-by-color".
* app/tools/gimpbycolorselecttool.c: add the shortcut here.
* app/actions/tools-actions.c: added alternative tool actions for
"by-color-select" and "rotate" which are identical to the ones
generated from the GimpToolInfo except for their label. Make sure
they have the same accelerators as the generated ones.
* menus/image-menu.xml.in: use the alternative actions for
"<Image>/Select/By Color" and
"<Layer>/Transform/Arbitrary Rotation...".
2004-05-05 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimphelpui.c: documentation.

View File

@ -34,7 +34,6 @@
#include "actions.h"
#include "select-actions.h"
#include "select-commands.h"
#include "tools-commands.h"
#include "vectors-commands.h"
#include "gimp-intl.h"
@ -106,14 +105,6 @@ static GimpActionEntry select_actions[] =
GIMP_HELP_SELECTION_TO_PATH }
};
static GimpStringActionEntry select_tool_actions[] =
{
{ "select-by-color", GIMP_STOCK_TOOL_BY_COLOR_SELECT,
N_("_By Color"), "<shift>O", NULL,
"gimp-by-color-select-tool",
GIMP_HELP_TOOL_BY_COLOR_SELECT }
};
void
select_actions_setup (GimpActionGroup *group)
@ -121,11 +112,6 @@ select_actions_setup (GimpActionGroup *group)
gimp_action_group_add_actions (group,
select_actions,
G_N_ELEMENTS (select_actions));
gimp_action_group_add_string_actions (group,
select_tool_actions,
G_N_ELEMENTS (select_tool_actions),
G_CALLBACK (tools_select_cmd_callback));
}
void
@ -158,8 +144,6 @@ select_actions_update (GimpActionGroup *group,
SET_SENSITIVE ("select-from-vectors", lp && vectors);
SET_SENSITIVE ("select-float", lp && sel);
SET_SENSITIVE ("select-by-color", lp);
SET_SENSITIVE ("select-feather", lp && sel);
SET_SENSITIVE ("select-sharpen", lp && sel);
SET_SENSITIVE ("select-shrink", lp && sel);

View File

@ -58,16 +58,43 @@ static GimpActionEntry tools_actions[] =
GIMP_HELP_TOOLBOX_SWAP_COLORS }
};
static GimpStringActionEntry tools_alternative_actions[] =
{
{ "tools-by-color-select-short", GIMP_STOCK_TOOL_BY_COLOR_SELECT,
N_("_By Color"), NULL, NULL,
"gimp-by-color-select-tool",
GIMP_HELP_TOOL_BY_COLOR_SELECT },
{ "tools-rotate-arbitrary", GIMP_STOCK_TOOL_ROTATE,
N_("_Arbitrary Rotation..."), NULL, NULL,
"gimp-rotate-tool",
GIMP_HELP_TOOL_ROTATE }
};
void
tools_actions_setup (GimpActionGroup *group)
{
GList *list;
GtkAction *action;
GList *list;
gimp_action_group_add_actions (group,
tools_actions,
G_N_ELEMENTS (tools_actions));
gimp_action_group_add_string_actions (group,
tools_alternative_actions,
G_N_ELEMENTS (tools_alternative_actions),
G_CALLBACK (tools_select_cmd_callback));
action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
"tools-by-color-select-short");
gtk_action_set_accel_path (action, "<Actions>/tools/tools-by-color-select");
action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
"tools-rotate-arbitrary");
gtk_action_set_accel_path (action, "<Actions>/tools/tools-rotate");
for (list = GIMP_LIST (group->gimp->tool_info_list)->list;
list;
list = g_list_next (list))

View File

@ -81,7 +81,7 @@ gimp_by_color_select_tool_register (GimpToolRegisterCallback callback,
"gimp-by-color-select-tool",
_("Select By Color"),
_("Select regions by color"),
N_("_By Color Select"), NULL,
N_("_By Color Select"), "<shift>O",
NULL, GIMP_HELP_TOOL_BY_COLOR_SELECT,
GIMP_STOCK_TOOL_BY_COLOR_SELECT,
data);

View File

@ -64,7 +64,7 @@
<menuitem action="select-invert" />
<menuitem action="select-from-vectors" />
<menuitem action="select-float" />
<menuitem action="select-by-color" />
<menuitem action="tools-by-color-select-short" />
<separator />
<menuitem action="select-feather" />
<menuitem action="select-sharpen" />
@ -209,6 +209,7 @@
<menuitem action="drawable-rotate-90" />
<menuitem action="drawable-rotate-270" />
<menuitem action="drawable-rotate-180" />
<menuitem action="tools-rotate-arbitrary" />
<separator />
<menuitem action="drawable-offset" />
</menu>