GNOME.org
 

[gimp/icons-wip] icons: Bug 759904

commit 56bff97ed0ef5041cd7716fe6b8f28ab84768ea8
Author: klausstaedtler <staedtler-przyborski web de>
Date:   Tue Jun 21 20:42:14 2016 +0200

    icons: Bug 759904
    
    patch: replace "edit-delete" by "gimp-delete" (or GIMP_STOCK_DELETE)
    
    gimp/plug-ins/ifs-compose/ifs-compose.c:    { "delete", "edit-delete",
    gimp/app/actions/buffers-actions.c:  { "buffers-delete", "edit-delete",
    gimp/app/actions/tool-options-actions.c:  { "tool-options-delete-preset-menu", "edit-delete",
    gimp/app/actions/templates-commands.c:        gimp_message_dialog_new (_("Delete Template"), 
"edit-delete",
    gimp/app/actions/channels-actions.c:  { "channels-delete", "edit-delete",
    gimp/app/actions/palettes-actions.c:  { "palettes-delete", "edit-delete",
    gimp/app/actions/mypaint-brushes-actions.c:  { "mypaint-brushes-delete", "edit-delete",
    gimp/app/actions/vectors-actions.c:  { "vectors-delete", "edit-delete",
    gimp/app/actions/templates-actions.c:  { "templates-delete", "edit-delete",
    gimp/app/actions/dynamics-actions.c:  { "dynamics-delete", "edit-delete",
    gimp/app/actions/tool-presets-actions.c:  { "tool-presets-delete", "edit-delete",
    gimp/app/actions/patterns-actions.c:  { "patterns-delete", "edit-delete",
    gimp/app/actions/palette-editor-actions.c:  { "palette-editor-delete-color", "edit-delete",
    gimp/app/actions/layers-actions.c:  { "layers-delete", "edit-delete",
    gimp/app/actions/layers-actions.c:  { "layers-mask-delete", "edit-delete",
    gimp/app/actions/brushes-actions.c:  { "brushes-delete", "edit-delete",
    gimp/app/actions/images-actions.c:  { "images-delete", "edit-delete",
    gimp/app/actions/gradient-editor-actions.c:  { "gradient-editor-delete", "edit-delete",
    gimp/app/actions/text-tool-actions.c:  { "text-tool-delete", "edit-delete",
    gimp/app/actions/gradients-actions.c:  { "gradients-delete", "edit-delete",
    gimp/app/widgets/gimpdeviceeditor.c:                            "edit-delete",
    gimp/app/widgets/gimptooloptionseditor.c:    gimp_editor_add_button (GIMP_EDITOR (editor), "edit-delete",
    gimp/app/widgets/gimpsettingseditor.c:                            "edit-delete",
    gimp/app/dialogs/data-delete-dialog.c:  dialog = gimp_message_dialog_new (_("Delete Object"), 
"edit-delete",
    gimp/app/dialogs/quit-dialog.c:      icon = gtk_image_new_from_icon_name ("edit-delete",

 app/actions/brushes-actions.c         |    2 +-
 app/actions/buffers-actions.c         |    2 +-
 app/actions/channels-actions.c        |    2 +-
 app/actions/dynamics-actions.c        |    2 +-
 app/actions/gradient-editor-actions.c |    2 +-
 app/actions/gradients-actions.c       |    2 +-
 app/actions/images-actions.c          |    2 +-
 app/actions/layers-actions.c          |    4 ++--
 app/actions/mypaint-brushes-actions.c |    2 +-
 app/actions/palette-editor-actions.c  |    2 +-
 app/actions/palettes-actions.c        |    2 +-
 app/actions/patterns-actions.c        |    2 +-
 app/actions/templates-actions.c       |    2 +-
 app/actions/templates-commands.c      |    2 +-
 app/actions/text-tool-actions.c       |    2 +-
 app/actions/tool-options-actions.c    |    2 +-
 app/actions/tool-presets-actions.c    |    2 +-
 app/actions/vectors-actions.c         |    2 +-
 app/dialogs/data-delete-dialog.c      |    2 +-
 app/dialogs/quit-dialog.c             |    2 +-
 app/widgets/gimpdeviceeditor.c        |    2 +-
 app/widgets/gimpsettingseditor.c      |    2 +-
 app/widgets/gimptooloptionseditor.c   |    2 +-
 plug-ins/ifs-compose/ifs-compose.c    |    2 +-
 24 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/app/actions/brushes-actions.c b/app/actions/brushes-actions.c
index 752e3b9..99166f8 100644
--- a/app/actions/brushes-actions.c
+++ b/app/actions/brushes-actions.c
@@ -73,7 +73,7 @@ static const GimpActionEntry brushes_actions[] =
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_BRUSH_SHOW_IN_FILE_MANAGER },
 
-  { "brushes-delete", "edit-delete",
+  { "brushes-delete", GIMP_STOCK_DELETE,
     NC_("brushes-action", "_Delete Brush"), NULL,
     NC_("brushes-action", "Delete this brush"),
     G_CALLBACK (data_delete_cmd_callback),
diff --git a/app/actions/buffers-actions.c b/app/actions/buffers-actions.c
index 0b39ffd..4a841e9 100644
--- a/app/actions/buffers-actions.c
+++ b/app/actions/buffers-actions.c
@@ -60,7 +60,7 @@ static const GimpActionEntry buffers_actions[] =
     G_CALLBACK (buffers_paste_as_new_cmd_callback),
     GIMP_HELP_BUFFER_PASTE_AS_NEW },
 
-  { "buffers-delete", "edit-delete",
+  { "buffers-delete", GIMP_STOCK_DELETE,
     NC_("buffers-action", "_Delete Buffer"), NULL,
     NC_("buffers-action", "Delete the selected buffer"),
     G_CALLBACK (buffers_delete_cmd_callback),
diff --git a/app/actions/channels-actions.c b/app/actions/channels-actions.c
index 0274b16..5f8fe74 100644
--- a/app/actions/channels-actions.c
+++ b/app/actions/channels-actions.c
@@ -69,7 +69,7 @@ static const GimpActionEntry channels_actions[] =
     G_CALLBACK (channels_duplicate_cmd_callback),
     GIMP_HELP_CHANNEL_DUPLICATE },
 
-  { "channels-delete", "edit-delete",
+  { "channels-delete", GIMP_STOCK_DELETE,
     NC_("channels-action", "_Delete Channel"), NULL,
     NC_("channels-action", "Delete this channel"),
     G_CALLBACK (channels_delete_cmd_callback),
diff --git a/app/actions/dynamics-actions.c b/app/actions/dynamics-actions.c
index 1c13c2b..252c00c 100644
--- a/app/actions/dynamics-actions.c
+++ b/app/actions/dynamics-actions.c
@@ -67,7 +67,7 @@ static const GimpActionEntry dynamics_actions[] =
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_DYNAMICS_SHOW_IN_FILE_MANAGER },
 
-  { "dynamics-delete", "edit-delete",
+  { "dynamics-delete", GIMP_STOCK_DELETE,
     NC_("dynamics-action", "_Delete Dynamics"), NULL,
     NC_("dynamics-action", "Delete this dynamics"),
     G_CALLBACK (data_delete_cmd_callback),
diff --git a/app/actions/gradient-editor-actions.c b/app/actions/gradient-editor-actions.c
index 50b173d..eb52d24 100644
--- a/app/actions/gradient-editor-actions.c
+++ b/app/actions/gradient-editor-actions.c
@@ -93,7 +93,7 @@ static const GimpActionEntry gradient_editor_actions[] =
     G_CALLBACK (gradient_editor_split_uniformly_cmd_callback),
     GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM },
 
-  { "gradient-editor-delete", "edit-delete",
+  { "gradient-editor-delete", GIMP_STOCK_DELETE,
     "delete", "", NULL,
     G_CALLBACK (gradient_editor_delete_cmd_callback),
     GIMP_HELP_GRADIENT_EDITOR_DELETE },
diff --git a/app/actions/gradients-actions.c b/app/actions/gradients-actions.c
index 7532558..86f35ce 100644
--- a/app/actions/gradients-actions.c
+++ b/app/actions/gradients-actions.c
@@ -74,7 +74,7 @@ static const GimpActionEntry gradients_actions[] =
     G_CALLBACK (gradients_save_as_pov_ray_cmd_callback),
     GIMP_HELP_GRADIENT_SAVE_AS_POV },
 
-  { "gradients-delete", "edit-delete",
+  { "gradients-delete", GIMP_STOCK_DELETE,
     NC_("gradients-action", "_Delete Gradient"), NULL,
     NC_("gradients-action", "Delete this gradient"),
     G_CALLBACK (data_delete_cmd_callback),
diff --git a/app/actions/images-actions.c b/app/actions/images-actions.c
index 4e02a9b..486ef4b 100644
--- a/app/actions/images-actions.c
+++ b/app/actions/images-actions.c
@@ -55,7 +55,7 @@ static const GimpActionEntry images_actions[] =
     G_CALLBACK (images_new_view_cmd_callback),
     NULL },
 
-  { "images-delete", "edit-delete",
+  { "images-delete", GIMP_STOCK_DELETE,
     NC_("images-action", "_Delete Image"), NULL,
     NC_("images-action", "Delete this image"),
     G_CALLBACK (images_delete_image_cmd_callback),
diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c
index 8f7f619..6c777fb 100644
--- a/app/actions/layers-actions.c
+++ b/app/actions/layers-actions.c
@@ -110,7 +110,7 @@ static const GimpActionEntry layers_actions[] =
     G_CALLBACK (layers_duplicate_cmd_callback),
     GIMP_HELP_LAYER_DUPLICATE },
 
-  { "layers-delete", "edit-delete",
+  { "layers-delete", GIMP_STOCK_DELETE,
     NC_("layers-action", "_Delete Layer"), NULL,
     NC_("layers-action", "Delete this layer"),
     G_CALLBACK (layers_delete_cmd_callback),
@@ -277,7 +277,7 @@ static const GimpEnumActionEntry layers_mask_apply_actions[] =
     GIMP_MASK_APPLY, FALSE,
     GIMP_HELP_LAYER_MASK_APPLY },
 
-  { "layers-mask-delete", "edit-delete",
+  { "layers-mask-delete", GIMP_STOCK_DELETE,
     NC_("layers-action", "Delete Layer Mas_k"), NULL,
     NC_("layers-action", "Remove the layer mask and its effect"),
     GIMP_MASK_DISCARD, FALSE,
diff --git a/app/actions/mypaint-brushes-actions.c b/app/actions/mypaint-brushes-actions.c
index d550274..0627e59 100644
--- a/app/actions/mypaint-brushes-actions.c
+++ b/app/actions/mypaint-brushes-actions.c
@@ -67,7 +67,7 @@ static const GimpActionEntry mypaint_brushes_actions[] =
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_MYPAINT_BRUSH_SHOW_IN_FILE_MANAGER },
 
-  { "mypaint-brushes-delete", "edit-delete",
+  { "mypaint-brushes-delete", GIMP_STOCK_DELETE,
     NC_("mypaint-brushes-action", "_Delete MyPaint Brush"), NULL,
     NC_("mypaint-brushes-action", "Delete this MyPaint brush"),
     G_CALLBACK (data_delete_cmd_callback),
diff --git a/app/actions/palette-editor-actions.c b/app/actions/palette-editor-actions.c
index fbc2cd1..18b1e52 100644
--- a/app/actions/palette-editor-actions.c
+++ b/app/actions/palette-editor-actions.c
@@ -50,7 +50,7 @@ static const GimpActionEntry palette_editor_actions[] =
     G_CALLBACK (palette_editor_edit_color_cmd_callback),
     GIMP_HELP_PALETTE_EDITOR_EDIT },
 
-  { "palette-editor-delete-color", "edit-delete",
+  { "palette-editor-delete-color", GIMP_STOCK_DELETE,
     NC_("palette-editor-action", "_Delete Color"), NULL,
     NC_("palette-editor-action", "Delete this entry"),
     G_CALLBACK (palette_editor_delete_color_cmd_callback),
diff --git a/app/actions/palettes-actions.c b/app/actions/palettes-actions.c
index 6be5b2c..e7820c5 100644
--- a/app/actions/palettes-actions.c
+++ b/app/actions/palettes-actions.c
@@ -80,7 +80,7 @@ static const GimpActionEntry palettes_actions[] =
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_PALETTE_SHOW_IN_FILE_MANAGER },
 
-  { "palettes-delete", "edit-delete",
+  { "palettes-delete", GIMP_STOCK_DELETE,
     NC_("palettes-action", "_Delete Palette"), NULL,
     NC_("palettes-action", "Delete this palette"),
     G_CALLBACK (data_delete_cmd_callback),
diff --git a/app/actions/patterns-actions.c b/app/actions/patterns-actions.c
index a9f327a..92aca91 100644
--- a/app/actions/patterns-actions.c
+++ b/app/actions/patterns-actions.c
@@ -73,7 +73,7 @@ static const GimpActionEntry patterns_actions[] =
     G_CALLBACK (data_show_in_file_manager_cmd_callback),
     GIMP_HELP_PATTERN_SHOW_IN_FILE_MANAGER },
 
-  { "patterns-delete", "edit-delete",
+  { "patterns-delete", GIMP_STOCK_DELETE,
     NC_("patterns-action", "_Delete Pattern"), NULL,
     NC_("patterns-action", "Delete this pattern"),
     G_CALLBACK (data_delete_cmd_callback),
diff --git a/app/actions/templates-actions.c b/app/actions/templates-actions.c
index 016badc..548f1c4 100644
--- a/app/actions/templates-actions.c
+++ b/app/actions/templates-actions.c
@@ -66,7 +66,7 @@ static const GimpActionEntry templates_actions[] =
     G_CALLBACK (templates_edit_cmd_callback),
     GIMP_HELP_TEMPLATE_EDIT },
 
-  { "templates-delete", "edit-delete",
+  { "templates-delete", GIMP_STOCK_DELETE,
     NC_("templates-action", "_Delete Template"), NULL,
     NC_("templates-action", "Delete this template"),
     G_CALLBACK (templates_delete_cmd_callback),
diff --git a/app/actions/templates-commands.c b/app/actions/templates-commands.c
index 1c43799..327c13d 100644
--- a/app/actions/templates-commands.c
+++ b/app/actions/templates-commands.c
@@ -218,7 +218,7 @@ templates_delete_cmd_callback (GtkAction *action,
       delete_data->template  = template;
 
       dialog =
-        gimp_message_dialog_new (_("Delete Template"), "edit-delete",
+        gimp_message_dialog_new (_("Delete Template"), GIMP_STOCK_DELETE,
                                  GTK_WIDGET (editor), 0,
                                  gimp_standard_help_func, NULL,
 
diff --git a/app/actions/text-tool-actions.c b/app/actions/text-tool-actions.c
index 12e6eaa..6957e87 100644
--- a/app/actions/text-tool-actions.c
+++ b/app/actions/text-tool-actions.c
@@ -69,7 +69,7 @@ static const GimpActionEntry text_tool_actions[] =
     G_CALLBACK (text_tool_paste_cmd_callback),
     NULL },
 
-  { "text-tool-delete", "edit-delete",
+  { "text-tool-delete", GIMP_STOCK_DELETE,
     NC_("text-tool-action", "_Delete"), NULL, NULL,
     G_CALLBACK (text_tool_delete_cmd_callback),
     NULL },
diff --git a/app/actions/tool-options-actions.c b/app/actions/tool-options-actions.c
index 5c9b7bd..5fcb377 100644
--- a/app/actions/tool-options-actions.c
+++ b/app/actions/tool-options-actions.c
@@ -69,7 +69,7 @@ static const GimpActionEntry tool_options_actions[] =
     NC_("tool-options-action", "E_dit Tool Preset"), NULL, NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_EDIT },
 
-  { "tool-options-delete-preset-menu", "edit-delete",
+  { "tool-options-delete-preset-menu", GIMP_STOCK_DELETE,
     NC_("tool-options-action", "_Delete Tool Preset"), "", NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_DELETE },
 
diff --git a/app/actions/tool-presets-actions.c b/app/actions/tool-presets-actions.c
index 27a8783..5741c2d 100644
--- a/app/actions/tool-presets-actions.c
+++ b/app/actions/tool-presets-actions.c
@@ -76,7 +76,7 @@ static const GimpActionEntry tool_presets_actions[] =
     G_CALLBACK (tool_presets_restore_cmd_callback),
     GIMP_HELP_TOOL_PRESET_RESTORE },
 
-  { "tool-presets-delete", "edit-delete",
+  { "tool-presets-delete", GIMP_STOCK_DELETE,
     NC_("tool-presets-action", "_Delete Tool Preset"), NULL,
     NC_("tool-presets-action", "Delete this tool preset"),
     G_CALLBACK (data_delete_cmd_callback),
diff --git a/app/actions/vectors-actions.c b/app/actions/vectors-actions.c
index 40419d3..54c13cf 100644
--- a/app/actions/vectors-actions.c
+++ b/app/actions/vectors-actions.c
@@ -73,7 +73,7 @@ static const GimpActionEntry vectors_actions[] =
     G_CALLBACK (vectors_duplicate_cmd_callback),
     GIMP_HELP_PATH_DUPLICATE },
 
-  { "vectors-delete", "edit-delete",
+  { "vectors-delete", GIMP_STOCK_DELETE,
     NC_("vectors-action", "_Delete Path"), NULL,
     NC_("vectors-action", "Delete this path"),
     G_CALLBACK (vectors_delete_cmd_callback),
diff --git a/app/dialogs/data-delete-dialog.c b/app/dialogs/data-delete-dialog.c
index 555f035..858a0ba 100644
--- a/app/dialogs/data-delete-dialog.c
+++ b/app/dialogs/data-delete-dialog.c
@@ -79,7 +79,7 @@ data_delete_dialog_new (GimpDataFactory *factory,
   delete_data->context = context;
   delete_data->parent  = parent;
 
-  dialog = gimp_message_dialog_new (_("Delete Object"), "edit-delete",
+  dialog = gimp_message_dialog_new (_("Delete Object"), GIMP_STOCK_DELETE,
                                     gtk_widget_get_toplevel (parent), 0,
                                     gimp_standard_help_func, NULL,
 
diff --git a/app/dialogs/quit-dialog.c b/app/dialogs/quit-dialog.c
index 46f6f0e..fde66b9 100644
--- a/app/dialogs/quit-dialog.c
+++ b/app/dialogs/quit-dialog.c
@@ -335,7 +335,7 @@ quit_close_all_dialog_container_changed (GimpContainer  *images,
 
       gtk_widget_show (dialog->lost_label);
 
-      icon = gtk_image_new_from_icon_name ("edit-delete",
+      icon = gtk_image_new_from_icon_name (GIMP_STOCK_DELETE,
                                            GTK_ICON_SIZE_BUTTON);
       g_object_set (dialog->ok_button,
                     "label",     _("_Discard Changes"),
diff --git a/app/widgets/gimpdeviceeditor.c b/app/widgets/gimpdeviceeditor.c
index 5e31327..ace5129 100644
--- a/app/widgets/gimpdeviceeditor.c
+++ b/app/widgets/gimpdeviceeditor.c
@@ -162,7 +162,7 @@ gimp_device_editor_init (GimpDeviceEditor *editor)
 
   private->delete_button =
     gimp_editor_add_button (GIMP_EDITOR (private->treeview),
-                            "edit-delete",
+                            GIMP_STOCK_DELETE,
                             _("Delete the selected device"),
                             NULL,
                             G_CALLBACK (gimp_device_editor_delete_clicked),
diff --git a/app/widgets/gimpsettingseditor.c b/app/widgets/gimpsettingseditor.c
index 6893796..82bf76b 100644
--- a/app/widgets/gimpsettingseditor.c
+++ b/app/widgets/gimpsettingseditor.c
@@ -208,7 +208,7 @@ gimp_settings_editor_constructed (GObject *object)
 
   private->delete_button =
     gimp_editor_add_button (GIMP_EDITOR (tree_view),
-                            "edit-delete",
+                            GIMP_STOCK_DELETE,
                             _("Delete the selected settings"),
                             NULL,
                             G_CALLBACK (gimp_settings_editor_delete_clicked),
diff --git a/app/widgets/gimptooloptionseditor.c b/app/widgets/gimptooloptionseditor.c
index 803b662..bfa61ac 100644
--- a/app/widgets/gimptooloptionseditor.c
+++ b/app/widgets/gimptooloptionseditor.c
@@ -214,7 +214,7 @@ gimp_tool_options_editor_constructed (GObject *object)
                             editor);
 
   editor->p->delete_button =
-    gimp_editor_add_button (GIMP_EDITOR (editor), "edit-delete",
+    gimp_editor_add_button (GIMP_EDITOR (editor), GIMP_STOCK_DELETE,
                             _("Delete Tool Preset..."),
                             GIMP_HELP_TOOL_OPTIONS_DELETE,
                             G_CALLBACK (gimp_tool_options_editor_delete_clicked),
diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c
index c5547bc..c63f12a 100644
--- a/plug-ins/ifs-compose/ifs-compose.c
+++ b/plug-ins/ifs-compose/ifs-compose.c
@@ -1027,7 +1027,7 @@ design_op_menu_create (GtkWidget *window)
       NULL, "<control>N", NULL,
       G_CALLBACK (ifs_compose_new_callback) },
 
-    { "delete", "edit-delete",
+    { "delete", GIMP_STOCK_DELETE,
       NULL, "<control>D", NULL,
       G_CALLBACK (ifs_compose_delete_callback) },
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]