diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c index db5982ff83..d9e1bac259 100644 --- a/app/actions/layers-actions.c +++ b/app/actions/layers-actions.c @@ -52,8 +52,6 @@ static const GimpActionEntry layers_actions[] = NC_("layers-action", "_Layer") }, { "layers-stack-menu", NULL, NC_("layers-action", "Stac_k") }, - { "layers-text-to-selection-menu", GIMP_STOCK_TOOL_TEXT, - NC_("layers-action", "Te_xt to Selection") }, { "layers-mask-menu", NULL, NC_("layers-action", "_Mask") }, { "layers-transparency-menu", NULL, @@ -337,36 +335,6 @@ static const GimpEnumActionEntry layers_alpha_to_selection_actions[] = GIMP_HELP_LAYER_ALPHA_SELECTION_INTERSECT } }; -static const GimpEnumActionEntry layers_text_to_selection_actions[] = -{ - { "layers-text-selection-replace", GIMP_STOCK_SELECTION_REPLACE, - NC_("layers-action", "_Text to Selection"), NULL, - NC_("layers-action", "Replace the selection with the text layer's outline"), - GIMP_CHANNEL_OP_REPLACE, FALSE, - GIMP_HELP_LAYER_TEXT_SELECTION_REPLACE }, - - { "layers-text-selection-add", GIMP_STOCK_SELECTION_ADD, - NC_("layers-action", "A_dd to Selection"), NULL, - NC_("layers-action", - "Add the text layer's outline to the current selection"), - GIMP_CHANNEL_OP_ADD, FALSE, - GIMP_HELP_LAYER_TEXT_SELECTION_ADD }, - - { "layers-text-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT, - NC_("layers-action", "_Subtract from Selection"), NULL, - NC_("layers-action", - "Subtract the text layer's outline from the current selection"), - GIMP_CHANNEL_OP_SUBTRACT, FALSE, - GIMP_HELP_LAYER_TEXT_SELECTION_SUBTRACT }, - - { "layers-text-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT, - NC_("layers-action", "_Intersect with Selection"), NULL, - NC_("layers-action", - "Intersect the text layer's outline with the current selection"), - GIMP_CHANNEL_OP_INTERSECT, FALSE, - GIMP_HELP_LAYER_TEXT_SELECTION_INTERSECT } -}; - static const GimpEnumActionEntry layers_select_actions[] = { { "layers-select-top", NULL, @@ -473,11 +441,6 @@ layers_actions_setup (GimpActionGroup *group) G_N_ELEMENTS (layers_alpha_to_selection_actions), G_CALLBACK (layers_alpha_to_selection_cmd_callback)); - gimp_action_group_add_enum_actions (group, "layers-action", - layers_text_to_selection_actions, - G_N_ELEMENTS (layers_alpha_to_selection_actions), - G_CALLBACK (layers_alpha_to_selection_cmd_callback)); - gimp_action_group_add_enum_actions (group, "layers-action", layers_select_actions, G_N_ELEMENTS (layers_select_actions), @@ -619,10 +582,6 @@ layers_actions_update (GimpActionGroup *group, SET_VISIBLE ("layers-text-discard", text_layer && !ac); SET_VISIBLE ("layers-text-to-vectors", text_layer && !ac); SET_VISIBLE ("layers-text-along-vectors", text_layer && !ac); - SET_VISIBLE ("layers-text-selection-replace", text_layer && !ac); - SET_VISIBLE ("layers-text-selection-add", text_layer && !ac); - SET_VISIBLE ("layers-text-selection-subtract", text_layer && !ac); - SET_VISIBLE ("layers-text-selection-intersect", text_layer && !ac); SET_SENSITIVE ("layers-resize", writable && !ac); SET_SENSITIVE ("layers-resize-to-image", writable && !ac); diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h index e8054dd5b4..bd1c4dd632 100644 --- a/app/widgets/gimphelp-ids.h +++ b/app/widgets/gimphelp-ids.h @@ -149,10 +149,6 @@ #define GIMP_HELP_LAYER_TEXT_DISCARD "gimp-layer-text-discard" #define GIMP_HELP_LAYER_TEXT_TO_PATH "gimp-layer-text-to-path" #define GIMP_HELP_LAYER_TEXT_ALONG_PATH "gimp-layer-text-along-path" -#define GIMP_HELP_LAYER_TEXT_SELECTION_REPLACE "gimp-layer-text-selection-replace" -#define GIMP_HELP_LAYER_TEXT_SELECTION_ADD "gimp-layer-text-selection-add" -#define GIMP_HELP_LAYER_TEXT_SELECTION_SUBTRACT "gimp-layer-text-selection-subtract" -#define GIMP_HELP_LAYER_TEXT_SELECTION_INTERSECT "gimp-layer-text-selection-intersect" #define GIMP_HELP_LAYER_PREVIOUS "gimp-layer-previous" #define GIMP_HELP_LAYER_NEXT "gimp-layer-next" #define GIMP_HELP_LAYER_TOP "gimp-layer-top" diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in index 1db2ff262f..5f5dbc3a03 100644 --- a/menus/image-menu.xml.in +++ b/menus/image-menu.xml.in @@ -381,12 +381,6 @@ - - - - - - diff --git a/menus/layers-menu.xml b/menus/layers-menu.xml index 6bf50b7ed3..194b04ad8f 100644 --- a/menus/layers-menu.xml +++ b/menus/layers-menu.xml @@ -24,7 +24,6 @@ -