From 0ae2422c775e7a840b4dac7cfb850319e6f509b8 Mon Sep 17 00:00:00 2001 From: klausstaedtler Date: Wed, 8 Jun 2016 20:38:08 +0200 Subject: [PATCH] icons: Bug 759904 patch: replace "edit-copy" by "gimp-clipboard" (or GIMP_STOCK_CLIPBOARD) gimp/app/actions/palettes-actions.c: { "palettes-copy-location", "edit-copy", gimp/app/actions/mypaint-brushes-actions.c: { "mypaint-brushes-copy-location", "edit-copy", gimp/app/actions/vectors-actions.c: { "vectors-copy", "edit-copy", gimp/app/actions/dynamics-actions.c: { "dynamics-copy-location", "edit-copy", gimp/app/actions/tool-presets-actions.c: { "tool-presets-copy-location", "edit-copy", gimp/app/actions/edit-actions.c: { "edit-copy", "edit-copy", gimp/app/actions/patterns-actions.c: { "patterns-copy-location", "edit-copy", gimp/app/actions/documents-actions.c: { "documents-copy-location", "edit-copy", gimp/app/actions/brushes-actions.c: { "brushes-copy-location", "edit-copy", gimp/app/actions/gradients-actions.c: { "gradients-copy-location", "edit-copy", patch: replace "edit-copy" by "gimp-duplicate" (or GIMP_STOCK_DUPLICATE) gimp/app/actions/edit-actions.c: { "edit-named-copy", "edit-copy", duplicate gimp/app/actions/text-tool-actions.c: { "text-tool-copy", "edit-copy", duplicate --- app/actions/brushes-actions.c | 2 +- app/actions/documents-actions.c | 2 +- app/actions/dynamics-actions.c | 2 +- app/actions/edit-actions.c | 4 ++-- app/actions/gradients-actions.c | 2 +- app/actions/mypaint-brushes-actions.c | 2 +- app/actions/palettes-actions.c | 2 +- app/actions/patterns-actions.c | 2 +- app/actions/text-tool-actions.c | 2 +- app/actions/tool-presets-actions.c | 2 +- app/actions/vectors-actions.c | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/actions/brushes-actions.c b/app/actions/brushes-actions.c index 4646ca3212..303094bb9a 100644 --- a/app/actions/brushes-actions.c +++ b/app/actions/brushes-actions.c @@ -61,7 +61,7 @@ static const GimpActionEntry brushes_actions[] = G_CALLBACK (data_duplicate_cmd_callback), GIMP_HELP_BRUSH_DUPLICATE }, - { "brushes-copy-location", "edit-copy", + { "brushes-copy-location", GIMP_STOCK_CLIPBOARD, NC_("brushes-action", "Copy Brush _Location"), NULL, NC_("brushes-action", "Copy brush file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), diff --git a/app/actions/documents-actions.c b/app/actions/documents-actions.c index 1a7b057efd..88daed09a3 100644 --- a/app/actions/documents-actions.c +++ b/app/actions/documents-actions.c @@ -60,7 +60,7 @@ static const GimpActionEntry documents_actions[] = G_CALLBACK (documents_file_open_dialog_cmd_callback), GIMP_HELP_DOCUMENT_OPEN }, - { "documents-copy-location", "edit-copy", + { "documents-copy-location", GIMP_STOCK_CLIPBOARD, NC_("documents-action", "Copy Image _Location"), NULL, NC_("documents-action", "Copy image location to clipboard"), G_CALLBACK (documents_copy_location_cmd_callback), diff --git a/app/actions/dynamics-actions.c b/app/actions/dynamics-actions.c index 7b4c7d2e95..4885080ce6 100644 --- a/app/actions/dynamics-actions.c +++ b/app/actions/dynamics-actions.c @@ -55,7 +55,7 @@ static const GimpActionEntry dynamics_actions[] = G_CALLBACK (data_duplicate_cmd_callback), GIMP_HELP_DYNAMICS_DUPLICATE }, - { "dynamics-copy-location", "edit-copy", + { "dynamics-copy-location", GIMP_STOCK_CLIPBOARD, NC_("dynamics-action", "Copy Dynamics _Location"), NULL, NC_("dynamics-action", "Copy dynamics file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), diff --git a/app/actions/edit-actions.c b/app/actions/edit-actions.c index 0cb6c7d56f..b3f8a76db9 100644 --- a/app/actions/edit-actions.c +++ b/app/actions/edit-actions.c @@ -114,7 +114,7 @@ static const GimpActionEntry edit_actions[] = G_CALLBACK (edit_cut_cmd_callback), GIMP_HELP_EDIT_CUT }, - { "edit-copy", "edit-copy", + { "edit-copy", GIMP_STOCK_CLIPBOARD, NC_("edit-action", "_Copy"), "C", NC_("edit-action", "Copy the selected pixels to the clipboard"), G_CALLBACK (edit_copy_cmd_callback), @@ -163,7 +163,7 @@ static const GimpActionEntry edit_actions[] = G_CALLBACK (edit_named_cut_cmd_callback), GIMP_HELP_BUFFER_CUT }, - { "edit-named-copy", "edit-copy", + { "edit-named-copy", GIMP_STOCK_DUPLICATE, NC_("edit-action", "_Copy Named..."), NULL, NC_("edit-action", "Copy the selected pixels to a named buffer"), G_CALLBACK (edit_named_copy_cmd_callback), diff --git a/app/actions/gradients-actions.c b/app/actions/gradients-actions.c index b7083274ae..8b488cbdf2 100644 --- a/app/actions/gradients-actions.c +++ b/app/actions/gradients-actions.c @@ -56,7 +56,7 @@ static const GimpActionEntry gradients_actions[] = G_CALLBACK (data_duplicate_cmd_callback), GIMP_HELP_GRADIENT_DUPLICATE }, - { "gradients-copy-location", "edit-copy", + { "gradients-copy-location", GIMP_STOCK_CLIPBOARD, NC_("gradients-action", "Copy Gradient _Location"), NULL, NC_("gradients-action", "Copy gradient file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), diff --git a/app/actions/mypaint-brushes-actions.c b/app/actions/mypaint-brushes-actions.c index f8e3b0618d..6f48b12771 100644 --- a/app/actions/mypaint-brushes-actions.c +++ b/app/actions/mypaint-brushes-actions.c @@ -55,7 +55,7 @@ static const GimpActionEntry mypaint_brushes_actions[] = G_CALLBACK (data_duplicate_cmd_callback), GIMP_HELP_MYPAINT_BRUSH_DUPLICATE }, - { "mypaint-brushes-copy-location", "edit-copy", + { "mypaint-brushes-copy-location", GIMP_STOCK_CLIPBOARD, NC_("mypaint-brushes-action", "Copy MyPaint Brush _Location"), NULL, NC_("mypaint-brushes-action", "Copy MyPaint brush file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), diff --git a/app/actions/palettes-actions.c b/app/actions/palettes-actions.c index ebc0f359f4..6be5b2cc81 100644 --- a/app/actions/palettes-actions.c +++ b/app/actions/palettes-actions.c @@ -68,7 +68,7 @@ static const GimpActionEntry palettes_actions[] = G_CALLBACK (palettes_merge_cmd_callback), GIMP_HELP_PALETTE_MERGE }, - { "palettes-copy-location", "edit-copy", + { "palettes-copy-location", GIMP_STOCK_CLIPBOARD, NC_("palettes-action", "Copy Palette _Location"), NULL, NC_("palettes-action", "Copy palette file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), diff --git a/app/actions/patterns-actions.c b/app/actions/patterns-actions.c index 4b71b10e02..a0080a5893 100644 --- a/app/actions/patterns-actions.c +++ b/app/actions/patterns-actions.c @@ -61,7 +61,7 @@ static const GimpActionEntry patterns_actions[] = G_CALLBACK (data_duplicate_cmd_callback), GIMP_HELP_PATTERN_DUPLICATE }, - { "patterns-copy-location", "edit-copy", + { "patterns-copy-location", GIMP_STOCK_CLIPBOARD, NC_("patterns-action", "Copy Pattern _Location"), NULL, NC_("patterns-action", "Copy pattern file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), diff --git a/app/actions/text-tool-actions.c b/app/actions/text-tool-actions.c index a99fd6d529..cbe8965a19 100644 --- a/app/actions/text-tool-actions.c +++ b/app/actions/text-tool-actions.c @@ -59,7 +59,7 @@ static const GimpActionEntry text_tool_actions[] = G_CALLBACK (text_tool_cut_cmd_callback), NULL }, - { "text-tool-copy", "edit-copy", + { "text-tool-copy", GIMP_STOCK_DUPLICATE, NC_("text-tool-action", "_Copy"), NULL, "C", G_CALLBACK (text_tool_copy_cmd_callback), NULL }, diff --git a/app/actions/tool-presets-actions.c b/app/actions/tool-presets-actions.c index 8417c9d141..8d2eab0a0d 100644 --- a/app/actions/tool-presets-actions.c +++ b/app/actions/tool-presets-actions.c @@ -58,7 +58,7 @@ static const GimpActionEntry tool_presets_actions[] = G_CALLBACK (data_duplicate_cmd_callback), GIMP_HELP_TOOL_PRESET_DUPLICATE }, - { "tool-presets-copy-location", "edit-copy", + { "tool-presets-copy-location", GIMP_STOCK_CLIPBOARD, NC_("tool-presets-action", "Copy Tool Preset _Location"), NULL, NC_("tool-presets-action", "Copy tool preset file location to clipboard"), G_CALLBACK (data_copy_location_cmd_callback), diff --git a/app/actions/vectors-actions.c b/app/actions/vectors-actions.c index 174083cd7e..99bbfff9c9 100644 --- a/app/actions/vectors-actions.c +++ b/app/actions/vectors-actions.c @@ -132,7 +132,7 @@ static const GimpActionEntry vectors_actions[] = G_CALLBACK (vectors_stroke_last_vals_cmd_callback), GIMP_HELP_PATH_STROKE }, - { "vectors-copy", "edit-copy", + { "vectors-copy", GIMP_STOCK_CLIPBOARD, NC_("vectors-action", "Co_py Path"), "", NULL, G_CALLBACK (vectors_copy_cmd_callback), GIMP_HELP_PATH_COPY },