app/gui/channels-menu.c app/gui/layers-menu.c removed accelerators from

2003-09-01  Michael Natterer  <mitch@gimp.org>

	* app/gui/channels-menu.c
	* app/gui/layers-menu.c
	* app/gui/vectors-menu.c: removed accelerators from popup menus.
	The HIG says nono and we will use the global <Image> accelerator
	table all over the place soon. First part of fix for bug #119878.
This commit is contained in:
Michael Natterer 2003-09-01 17:04:57 +00:00 committed by Michael Natterer
parent 2004c05d15
commit 6f1028774d
4 changed files with 37 additions and 29 deletions

View File

@ -1,3 +1,11 @@
2003-09-01 Michael Natterer <mitch@gimp.org>
* app/gui/channels-menu.c
* app/gui/layers-menu.c
* app/gui/vectors-menu.c: removed accelerators from popup menus.
The HIG says nono and we will use the global <Image> accelerator
table all over the place soon. First part of fix for bug #119878.
2003-09-01 Michael Natterer <mitch@gimp.org> 2003-09-01 Michael Natterer <mitch@gimp.org>
* plug-ins/common/edge.c (run): fixed check for the number of * plug-ins/common/edge.c (run): fixed check for the number of

View File

@ -41,27 +41,27 @@
GimpItemFactoryEntry channels_menu_entries[] = GimpItemFactoryEntry channels_menu_entries[] =
{ {
{ { N_("/_New Channel..."), "<control>N", { { N_("/_New Channel..."), "",
channels_new_cmd_callback, 0, channels_new_cmd_callback, 0,
"<StockItem>", GTK_STOCK_NEW }, "<StockItem>", GTK_STOCK_NEW },
NULL, NULL,
GIMP_HELP_CHANNEL_NEW, NULL }, GIMP_HELP_CHANNEL_NEW, NULL },
{ { N_("/_Raise Channel"), "<control>F", { { N_("/_Raise Channel"), "",
channels_raise_cmd_callback, 0, channels_raise_cmd_callback, 0,
"<StockItem>", GTK_STOCK_GO_UP }, "<StockItem>", GTK_STOCK_GO_UP },
NULL, NULL,
GIMP_HELP_CHANNEL_RAISE, NULL }, GIMP_HELP_CHANNEL_RAISE, NULL },
{ { N_("/_Lower Channel"), "<control>B", { { N_("/_Lower Channel"), "",
channels_lower_cmd_callback, 0, channels_lower_cmd_callback, 0,
"<StockItem>", GTK_STOCK_GO_DOWN }, "<StockItem>", GTK_STOCK_GO_DOWN },
NULL, NULL,
GIMP_HELP_CHANNEL_LOWER, NULL }, GIMP_HELP_CHANNEL_LOWER, NULL },
{ { N_("/D_uplicate Channel"), "<control>C", { { N_("/D_uplicate Channel"), NULL,
channels_duplicate_cmd_callback, 0, channels_duplicate_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DUPLICATE }, "<StockItem>", GIMP_STOCK_DUPLICATE },
NULL, NULL,
GIMP_HELP_CHANNEL_DUPLICATE, NULL }, GIMP_HELP_CHANNEL_DUPLICATE, NULL },
{ { N_("/_Delete Channel"), "<control>X", { { N_("/_Delete Channel"), "",
channels_delete_cmd_callback, 0, channels_delete_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE }, "<StockItem>", GTK_STOCK_DELETE },
NULL, NULL,
@ -69,7 +69,7 @@ GimpItemFactoryEntry channels_menu_entries[] =
MENU_SEPARATOR ("/---"), MENU_SEPARATOR ("/---"),
{ { N_("/Channel to Sele_ction"), "<control>S", { { N_("/Channel to Sele_ction"), NULL,
channels_to_selection_cmd_callback, GIMP_CHANNEL_OP_REPLACE, channels_to_selection_cmd_callback, GIMP_CHANNEL_OP_REPLACE,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE }, "<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,

View File

@ -41,49 +41,49 @@
GimpItemFactoryEntry layers_menu_entries[] = GimpItemFactoryEntry layers_menu_entries[] =
{ {
{ { N_("/_New Layer..."), "<control>N", { { N_("/_New Layer..."), "",
layers_new_cmd_callback, 0, layers_new_cmd_callback, 0,
"<StockItem>", GTK_STOCK_NEW }, "<StockItem>", GTK_STOCK_NEW },
NULL, NULL,
GIMP_HELP_LAYER_NEW, NULL }, GIMP_HELP_LAYER_NEW, NULL },
{ { N_("/_Raise Layer"), "<control>F", { { N_("/_Raise Layer"), "",
layers_raise_cmd_callback, 0, layers_raise_cmd_callback, 0,
"<StockItem>", GTK_STOCK_GO_UP }, "<StockItem>", GTK_STOCK_GO_UP },
NULL, NULL,
GIMP_HELP_LAYER_RAISE, NULL }, GIMP_HELP_LAYER_RAISE, NULL },
{ { N_("/Layer to _Top"), "<control><shift>F", { { N_("/Layer to _Top"), "",
layers_raise_to_top_cmd_callback, 0, layers_raise_to_top_cmd_callback, 0,
"<StockItem>", GTK_STOCK_GOTO_TOP }, "<StockItem>", GTK_STOCK_GOTO_TOP },
NULL, NULL,
GIMP_HELP_LAYER_RAISE_TO_TOP, NULL }, GIMP_HELP_LAYER_RAISE_TO_TOP, NULL },
{ { N_("/_Lower Layer"), "<control>B", { { N_("/_Lower Layer"), "",
layers_lower_cmd_callback, 0, layers_lower_cmd_callback, 0,
"<StockItem>", GTK_STOCK_GO_DOWN }, "<StockItem>", GTK_STOCK_GO_DOWN },
NULL, NULL,
GIMP_HELP_LAYER_LOWER, NULL }, GIMP_HELP_LAYER_LOWER, NULL },
{ { N_("/Layer to _Bottom"), "<control><shift>B", { { N_("/Layer to _Bottom"), "",
layers_lower_to_bottom_cmd_callback, 0, layers_lower_to_bottom_cmd_callback, 0,
"<StockItem>", GTK_STOCK_GOTO_BOTTOM }, "<StockItem>", GTK_STOCK_GOTO_BOTTOM },
NULL, NULL,
GIMP_HELP_LAYER_LOWER_TO_BOTTOM, NULL }, GIMP_HELP_LAYER_LOWER_TO_BOTTOM, NULL },
{ { N_("/D_uplicate Layer"), "<control>C", { { N_("/D_uplicate Layer"), NULL,
layers_duplicate_cmd_callback, 0, layers_duplicate_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DUPLICATE }, "<StockItem>", GIMP_STOCK_DUPLICATE },
NULL, NULL,
GIMP_HELP_LAYER_DUPLICATE, NULL }, GIMP_HELP_LAYER_DUPLICATE, NULL },
{ { N_("/_Anchor Layer"), "<control>H", { { N_("/_Anchor Layer"), NULL,
layers_anchor_cmd_callback, 0, layers_anchor_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_ANCHOR }, "<StockItem>", GIMP_STOCK_ANCHOR },
NULL, NULL,
GIMP_HELP_LAYER_ANCHOR, NULL }, GIMP_HELP_LAYER_ANCHOR, NULL },
{ { N_("/Merge Do_wn"), "<control><shift>M", { { N_("/Merge Do_wn"), NULL,
layers_merge_down_cmd_callback, 0, layers_merge_down_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_MERGE_DOWN }, "<StockItem>", GIMP_STOCK_MERGE_DOWN },
NULL, NULL,
GIMP_HELP_LAYER_MERGE_DOWN, NULL }, GIMP_HELP_LAYER_MERGE_DOWN, NULL },
{ { N_("/_Delete Layer"), "<control>X", { { N_("/_Delete Layer"), "",
layers_delete_cmd_callback, 0, layers_delete_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE }, "<StockItem>", GTK_STOCK_DELETE },
NULL, NULL,
@ -91,7 +91,7 @@ GimpItemFactoryEntry layers_menu_entries[] =
MENU_SEPARATOR ("/---"), MENU_SEPARATOR ("/---"),
{ { N_("/Layer B_oundary Size..."), "<control>R", { { N_("/Layer B_oundary Size..."), NULL,
layers_resize_cmd_callback, 0, layers_resize_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE }, "<StockItem>", GIMP_STOCK_RESIZE },
NULL, NULL,
@ -101,7 +101,7 @@ GimpItemFactoryEntry layers_menu_entries[] =
"<StockItem>", GIMP_STOCK_LAYER_TO_IMAGESIZE }, "<StockItem>", GIMP_STOCK_LAYER_TO_IMAGESIZE },
NULL, NULL,
GIMP_HELP_LAYER_RESIZE_TO_IMAGE, NULL }, GIMP_HELP_LAYER_RESIZE_TO_IMAGE, NULL },
{ { N_("/_Scale Layer..."), "<control>S", { { N_("/_Scale Layer..."), NULL,
layers_scale_cmd_callback, 0, layers_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SCALE }, "<StockItem>", GIMP_STOCK_SCALE },
NULL, NULL,

View File

@ -41,27 +41,27 @@
GimpItemFactoryEntry vectors_menu_entries[] = GimpItemFactoryEntry vectors_menu_entries[] =
{ {
{ { N_("/_New Path..."), "<control>N", { { N_("/_New Path..."), "",
vectors_new_cmd_callback, 0, vectors_new_cmd_callback, 0,
"<StockItem>", GTK_STOCK_NEW }, "<StockItem>", GTK_STOCK_NEW },
NULL, NULL,
GIMP_HELP_PATH_NEW, NULL }, GIMP_HELP_PATH_NEW, NULL },
{ { N_("/_Raise Path"), "<control>F", { { N_("/_Raise Path"), "",
vectors_raise_cmd_callback, 0, vectors_raise_cmd_callback, 0,
"<StockItem>", GTK_STOCK_GO_UP }, "<StockItem>", GTK_STOCK_GO_UP },
NULL, NULL,
GIMP_HELP_PATH_RAISE, NULL }, GIMP_HELP_PATH_RAISE, NULL },
{ { N_("/_Lower Path"), "<control>B", { { N_("/_Lower Path"), "",
vectors_lower_cmd_callback, 0, vectors_lower_cmd_callback, 0,
"<StockItem>", GTK_STOCK_GO_DOWN }, "<StockItem>", GTK_STOCK_GO_DOWN },
NULL, NULL,
GIMP_HELP_PATH_LOWER, NULL }, GIMP_HELP_PATH_LOWER, NULL },
{ { N_("/D_uplicate Path"), "<control>U", { { N_("/D_uplicate Path"), NULL,
vectors_duplicate_cmd_callback, 0, vectors_duplicate_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DUPLICATE }, "<StockItem>", GIMP_STOCK_DUPLICATE },
NULL, NULL,
GIMP_HELP_PATH_DUPLICATE, NULL }, GIMP_HELP_PATH_DUPLICATE, NULL },
{ { N_("/_Delete Path"), "<control>X", { { N_("/_Delete Path"), "",
vectors_delete_cmd_callback, 0, vectors_delete_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE }, "<StockItem>", GTK_STOCK_DELETE },
NULL, NULL,
@ -69,7 +69,7 @@ GimpItemFactoryEntry vectors_menu_entries[] =
MENU_SEPARATOR ("/---"), MENU_SEPARATOR ("/---"),
{ { N_("/Path to Sele_ction"), "<control>S", { { N_("/Path to Sele_ction"), NULL,
vectors_to_selection_cmd_callback, GIMP_CHANNEL_OP_REPLACE, vectors_to_selection_cmd_callback, GIMP_CHANNEL_OP_REPLACE,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE }, "<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL, NULL,
@ -90,12 +90,12 @@ GimpItemFactoryEntry vectors_menu_entries[] =
NULL, NULL,
GIMP_HELP_PATH_SELECTION_INTERSECT, NULL }, GIMP_HELP_PATH_SELECTION_INTERSECT, NULL },
{ { N_("/Selecti_on to Path"), "<control>P", { { N_("/Selecti_on to Path"), NULL,
vectors_selection_to_vectors_cmd_callback, 0, vectors_selection_to_vectors_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_TO_PATH }, "<StockItem>", GIMP_STOCK_SELECTION_TO_PATH },
NULL, NULL,
GIMP_HELP_SELECTION_TO_PATH, NULL }, GIMP_HELP_SELECTION_TO_PATH, NULL },
{ { N_("/Stro_ke Path"), "<control>T", { { N_("/Stro_ke Path"), NULL,
vectors_stroke_cmd_callback, 0, vectors_stroke_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_PATH_STROKE }, "<StockItem>", GIMP_STOCK_PATH_STROKE },
NULL, NULL,
@ -103,23 +103,23 @@ GimpItemFactoryEntry vectors_menu_entries[] =
MENU_SEPARATOR ("/---"), MENU_SEPARATOR ("/---"),
{ { N_("/Co_py Path"), "<control>C", { { N_("/Co_py Path"), "",
vectors_copy_cmd_callback, 0, vectors_copy_cmd_callback, 0,
"<StockItem>", GTK_STOCK_COPY }, "<StockItem>", GTK_STOCK_COPY },
NULL, NULL,
GIMP_HELP_PATH_COPY, NULL }, GIMP_HELP_PATH_COPY, NULL },
{ { N_("/Paste Pat_h"), "<control>V", { { N_("/Paste Pat_h"), "",
vectors_paste_cmd_callback, 0, vectors_paste_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PASTE }, "<StockItem>", GTK_STOCK_PASTE },
NULL, NULL,
GIMP_HELP_PATH_PASTE, NULL }, GIMP_HELP_PATH_PASTE, NULL },
{ { N_("/I_mport Path..."), "<control>I", { { N_("/I_mport Path..."), "",
vectors_import_cmd_callback, 0, vectors_import_cmd_callback, 0,
"<StockItem>", GTK_STOCK_OPEN }, "<StockItem>", GTK_STOCK_OPEN },
NULL, NULL,
GIMP_HELP_PATH_IMPORT, NULL }, GIMP_HELP_PATH_IMPORT, NULL },
{ { N_("/E_xport Path..."), "<control>E", { { N_("/E_xport Path..."), "",
vectors_export_cmd_callback, 0, vectors_export_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SAVE }, "<StockItem>", GTK_STOCK_SAVE },
NULL, NULL,