GNOME.org
 

[gimp/icons-wip] icons: Bug 759904

commit d55fafd1d9a0c5ae77af2506a65ebaebdd050167
Author: klausstaedtler <staedtler-przyborski web de>
Date:   Tue Jun 21 18:39:46 2016 +0200

    icons: Bug 759904
    
    patch: replace "gtk-edit" by "gimp-edit" (or GIMP_STOCK_EDIT)
    
    gimp/app/actions/tool-options-actions.c:  { "tool-options-edit-preset-menu", "gtk-edit",
    gimp/app/actions/templates-commands.c:                                             "gtk-edit",
    gimp/app/actions/channels-actions.c:  { "channels-edit-attributes", "gtk-edit",
    gimp/app/actions/palettes-actions.c:  { "palettes-edit", "gtk-edit",
    gimp/app/actions/mypaint-brushes-actions.c:  { "mypaint-brushes-edit", "gtk-edit",
    gimp/app/actions/text-editor-actions.c:  { "text-editor-toolbar", "gtk-edit",
    gimp/app/actions/vectors-actions.c:  { "vectors-edit-attributes", "gtk-edit",
    gimp/gimp/app/actions/templates-actions.c:  { "templates-edit", "gtk-edit",
    gimp/app/actions/dynamics-actions.c:  { "dynamics-edit", "gtk-edit",
    gimp/gimp/app/actions/channels-commands.c:                                        "gtk-edit",
    gimp/app/actions/tool-presets-actions.c:  { "tool-presets-edit", "gtk-edit",
    gimp/app/actions/patterns-actions.c:  { "patterns-edit", "gtk-edit",
    gimp/app/actions/palette-editor-actions.c:  { "palette-editor-edit-color", "gtk-edit",
    gimp/app/actions/layers-actions.c:  { "layers-edit-attributes", "gtk-edit",
    gimp/app/actions/layers-actions.c:  { "layers-mask-edit", "gtk-edit",
    gimp/app/actions/colormap-actions.c:  { "colormap-edit-color", "gtk-edit",
    gimp/app/actions/vectors-commands.c:                                        "gtk-edit",
    gimp/app/actions/brushes-actions.c:  { "brushes-edit", "gtk-edit",
    gimp/app/actions/layers-commands.c:                                     "gtk-edit",
    gimp/app/actions/actions.c:  { "edit", N_("Edit"), "gtk-edit",
    gimp/app/actions/actions.c:  { "text-tool", N_("Text Tool"), "gtk-edit",
    gimp/app/actions/actions.c:  { "text-editor", N_("Text Editor"), "gtk-edit",
    gimp/app/actions/gradients-actions.c:  { "gradients-edit", "gtk-edit",
    gimp/app/widgets/gimpcontrollereditor.c:                                  "gtk-edit",
    gimp/app/widgets/gimpsettingsbox.c:                                   "gtk-edit",

 app/actions/actions.c                 |    6 +++---
 app/actions/brushes-actions.c         |    2 +-
 app/actions/channels-actions.c        |    2 +-
 app/actions/channels-commands.c       |    2 +-
 app/actions/colormap-actions.c        |    2 +-
 app/actions/dynamics-actions.c        |    2 +-
 app/actions/gradients-actions.c       |    2 +-
 app/actions/layers-actions.c          |    4 ++--
 app/actions/layers-commands.c         |    2 +-
 app/actions/mypaint-brushes-actions.c |    2 +-
 app/actions/palette-editor-actions.c  |    2 +-
 app/actions/patterns-actions.c        |    2 +-
 app/actions/templates-actions.c       |    2 +-
 app/actions/templates-commands.c      |    2 +-
 app/actions/text-editor-actions.c     |    2 +-
 app/actions/tool-options-actions.c    |    2 +-
 app/actions/tool-presets-actions.c    |    2 +-
 app/actions/vectors-actions.c         |    2 +-
 app/actions/vectors-commands.c        |    2 +-
 app/widgets/gimpcontrollereditor.c    |    2 +-
 app/widgets/gimpsettingsbox.c         |    2 +-
 21 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/app/actions/actions.c b/app/actions/actions.c
index 4c6c1f2..d7cabc0 100644
--- a/app/actions/actions.c
+++ b/app/actions/actions.c
@@ -152,7 +152,7 @@ static const GimpActionFactoryEntry action_groups[] =
   { "dynamics-editor", N_("Paint Dynamics Editor"), GIMP_STOCK_DYNAMICS,
     dynamics_editor_actions_setup,
     dynamics_editor_actions_update },
-  { "edit", N_("Edit"), "gtk-edit",
+  { "edit", N_("Edit"), GIMP_STOCK_EDIT,
     edit_actions_setup,
     edit_actions_update },
   { "error-console", N_("Error Console"), GIMP_STOCK_WARNING,
@@ -218,10 +218,10 @@ static const GimpActionFactoryEntry action_groups[] =
   { "templates", N_("Templates"), GIMP_STOCK_TEMPLATE,
     templates_actions_setup,
     templates_actions_update },
-  { "text-tool", N_("Text Tool"), "gtk-edit",
+  { "text-tool", N_("Text Tool"), GIMP_STOCK_EDIT,
     text_tool_actions_setup,
     text_tool_actions_update },
-  { "text-editor", N_("Text Editor"), "gtk-edit",
+  { "text-editor", N_("Text Editor"), GIMP_STOCK_EDIT,
     text_editor_actions_setup,
     text_editor_actions_update },
   { "tool-options", N_("Tool Options"), GIMP_STOCK_TOOL_OPTIONS,
diff --git a/app/actions/brushes-actions.c b/app/actions/brushes-actions.c
index 78816bd..752e3b9 100644
--- a/app/actions/brushes-actions.c
+++ b/app/actions/brushes-actions.c
@@ -88,7 +88,7 @@ static const GimpActionEntry brushes_actions[] =
 
 static const GimpStringActionEntry brushes_edit_actions[] =
 {
-  { "brushes-edit", "gtk-edit",
+  { "brushes-edit", GIMP_STOCK_EDIT,
     NC_("brushes-action", "_Edit Brush..."), NULL,
     NC_("brushes-action", "Edit this brush"),
     "gimp-brush-editor",
diff --git a/app/actions/channels-actions.c b/app/actions/channels-actions.c
index 573f8b5..0274b16 100644
--- a/app/actions/channels-actions.c
+++ b/app/actions/channels-actions.c
@@ -44,7 +44,7 @@ static const GimpActionEntry channels_actions[] =
     NC_("channels-action", "Channels Menu"), NULL, NULL, NULL,
     GIMP_HELP_CHANNEL_DIALOG },
 
-  { "channels-edit-attributes", "gtk-edit",
+  { "channels-edit-attributes", GIMP_STOCK_EDIT,
     NC_("channels-action", "_Edit Channel Attributes..."), NULL,
     NC_("channels-action", "Edit the channel's name, color and opacity"),
     G_CALLBACK (channels_edit_attributes_cmd_callback),
diff --git a/app/actions/channels-commands.c b/app/actions/channels-commands.c
index 9b977d2..12fbe90 100644
--- a/app/actions/channels-commands.c
+++ b/app/actions/channels-commands.c
@@ -85,7 +85,7 @@ channels_edit_attributes_cmd_callback (GtkAction *action,
                                         gimp_object_get_name (channel),
                                         _("Channel Attributes"),
                                         "gimp-channel-edit",
-                                        "gtk-edit",
+                                        GIMP_STOCK_EDIT,
                                         _("Edit Channel Attributes"),
                                         GIMP_HELP_CHANNEL_EDIT,
                                         _("Edit Channel Color"),
diff --git a/app/actions/colormap-actions.c b/app/actions/colormap-actions.c
index 5e1f860..f95fd58 100644
--- a/app/actions/colormap-actions.c
+++ b/app/actions/colormap-actions.c
@@ -45,7 +45,7 @@ static const GimpActionEntry colormap_actions[] =
     NC_("colormap-action", "Colormap Menu"), NULL, NULL, NULL,
     GIMP_HELP_INDEXED_PALETTE_DIALOG },
 
-  { "colormap-edit-color", "gtk-edit",
+  { "colormap-edit-color", GIMP_STOCK_EDIT,
     NC_("colormap-action", "_Edit Color..."), NULL,
     NC_("colormap-action", "Edit this color"),
     G_CALLBACK (colormap_edit_color_cmd_callback),
diff --git a/app/actions/dynamics-actions.c b/app/actions/dynamics-actions.c
index 4885080..1c13c2b 100644
--- a/app/actions/dynamics-actions.c
+++ b/app/actions/dynamics-actions.c
@@ -82,7 +82,7 @@ static const GimpActionEntry dynamics_actions[] =
 
 static const GimpStringActionEntry dynamics_edit_actions[] =
 {
-  { "dynamics-edit", "gtk-edit",
+  { "dynamics-edit", GIMP_STOCK_EDIT,
     NC_("dynamics-action", "_Edit Dynamics..."), NULL,
     NC_("dynamics-action", "Edit dynamics"),
     "gimp-dynamics-editor",
diff --git a/app/actions/gradients-actions.c b/app/actions/gradients-actions.c
index 8b488cb..7532558 100644
--- a/app/actions/gradients-actions.c
+++ b/app/actions/gradients-actions.c
@@ -89,7 +89,7 @@ static const GimpActionEntry gradients_actions[] =
 
 static const GimpStringActionEntry gradients_edit_actions[] =
 {
-  { "gradients-edit", "gtk-edit",
+  { "gradients-edit", GIMP_STOCK_EDIT,
     NC_("gradients-action", "_Edit Gradient..."), NULL,
     NC_("gradients-action", "Edit gradient"),
     "gimp-gradient-editor",
diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c
index 11f3f84..8f7f619 100644
--- a/app/actions/layers-actions.c
+++ b/app/actions/layers-actions.c
@@ -72,7 +72,7 @@ static const GimpActionEntry layers_actions[] =
     G_CALLBACK (layers_text_tool_cmd_callback),
     GIMP_HELP_TOOL_TEXT },
 
-  { "layers-edit-attributes", "gtk-edit",
+  { "layers-edit-attributes", GIMP_STOCK_EDIT,
     NC_("layers-action", "_Edit Layer Attributes..."), NULL,
     NC_("layers-action", "Edit the layer's name"),
     G_CALLBACK (layers_edit_attributes_cmd_callback),
@@ -248,7 +248,7 @@ static const GimpToggleActionEntry layers_toggle_actions[] =
     FALSE,
     GIMP_HELP_LAYER_LOCK_ALPHA },
 
-  { "layers-mask-edit", "gtk-edit",
+  { "layers-mask-edit", GIMP_STOCK_EDIT,
     NC_("layers-action", "_Edit Layer Mask"), NULL,
     NC_("layers-action", "Work on the layer mask"),
     G_CALLBACK (layers_mask_edit_cmd_callback),
diff --git a/app/actions/layers-commands.c b/app/actions/layers-commands.c
index e90723a..fed0b03 100644
--- a/app/actions/layers-commands.c
+++ b/app/actions/layers-commands.c
@@ -211,7 +211,7 @@ layers_edit_attributes_cmd_callback (GtkAction *action,
                                      layer_fill_type,
                                      _("Layer Attributes"),
                                      "gimp-layer-edit",
-                                     "gtk-edit",
+                                     GIMP_STOCK_EDIT,
                                      _("Edit Layer Attributes"),
                                      GIMP_HELP_LAYER_EDIT);
 
diff --git a/app/actions/mypaint-brushes-actions.c b/app/actions/mypaint-brushes-actions.c
index 6f48b12..d550274 100644
--- a/app/actions/mypaint-brushes-actions.c
+++ b/app/actions/mypaint-brushes-actions.c
@@ -82,7 +82,7 @@ static const GimpActionEntry mypaint_brushes_actions[] =
 
 static const GimpStringActionEntry mypaint_brushes_edit_actions[] =
 {
-  { "mypaint-brushes-edit", "gtk-edit",
+  { "mypaint-brushes-edit", GIMP_STOCK_EDIT,
     NC_("mypaint-brushes-action", "_Edit MyPaint Brush..."), NULL,
     NC_("mypaint-brushes-action", "Edit MyPaint brush"),
     "gimp-mybrush-editor",
diff --git a/app/actions/palette-editor-actions.c b/app/actions/palette-editor-actions.c
index 4ded581..fbc2cd1 100644
--- a/app/actions/palette-editor-actions.c
+++ b/app/actions/palette-editor-actions.c
@@ -44,7 +44,7 @@ static const GimpActionEntry palette_editor_actions[] =
     NC_("palette-editor-action", "Palette Editor Menu"), NULL, NULL, NULL,
     GIMP_HELP_PALETTE_EDITOR_DIALOG },
 
-  { "palette-editor-edit-color", "gtk-edit",
+  { "palette-editor-edit-color", GIMP_STOCK_EDIT,
     NC_("palette-editor-action", "_Edit Color..."), NULL,
     NC_("palette-editor-action", "Edit this entry"),
     G_CALLBACK (palette_editor_edit_color_cmd_callback),
diff --git a/app/actions/patterns-actions.c b/app/actions/patterns-actions.c
index c0fdf97..a9f327a 100644
--- a/app/actions/patterns-actions.c
+++ b/app/actions/patterns-actions.c
@@ -88,7 +88,7 @@ static const GimpActionEntry patterns_actions[] =
 
 static const GimpStringActionEntry patterns_edit_actions[] =
 {
-  { "patterns-edit", "gtk-edit",
+  { "patterns-edit", GIMP_STOCK_EDIT,
     NC_("patterns-action", "_Edit Pattern..."), NULL,
     NC_("patterns-action", "Edit pattern"),
     "gimp-pattern-editor",
diff --git a/app/actions/templates-actions.c b/app/actions/templates-actions.c
index 88449b5..016badc 100644
--- a/app/actions/templates-actions.c
+++ b/app/actions/templates-actions.c
@@ -60,7 +60,7 @@ static const GimpActionEntry templates_actions[] =
     G_CALLBACK (templates_duplicate_cmd_callback),
     GIMP_HELP_TEMPLATE_DUPLICATE },
 
-  { "templates-edit", "gtk-edit",
+  { "templates-edit", GIMP_STOCK_EDIT,
     NC_("templates-action", "_Edit Template..."), NULL,
     NC_("templates-action", "Edit this template"),
     G_CALLBACK (templates_edit_cmd_callback),
diff --git a/app/actions/templates-commands.c b/app/actions/templates-commands.c
index d4a0dd5..1c43799 100644
--- a/app/actions/templates-commands.c
+++ b/app/actions/templates-commands.c
@@ -182,7 +182,7 @@ templates_edit_cmd_callback (GtkAction *action,
                                              GTK_WIDGET (editor),
                                              _("Edit Template"),
                                              "gimp-template-edit",
-                                             "gtk-edit",
+                                             GIMP_STOCK_EDIT,
                                              _("Edit Template"),
                                              GIMP_HELP_TEMPLATE_EDIT);
 
diff --git a/app/actions/text-editor-actions.c b/app/actions/text-editor-actions.c
index ad325e3..fa5a7f7 100644
--- a/app/actions/text-editor-actions.c
+++ b/app/actions/text-editor-actions.c
@@ -36,7 +36,7 @@
 
 static const GimpActionEntry text_editor_actions[] =
 {
-  { "text-editor-toolbar", "gtk-edit",
+  { "text-editor-toolbar", GIMP_STOCK_EDIT,
     "Text Editor Toolbar", NULL, NULL, NULL,
     GIMP_HELP_TEXT_EDITOR_DIALOG },
 
diff --git a/app/actions/tool-options-actions.c b/app/actions/tool-options-actions.c
index f251f55..5c9b7bd 100644
--- a/app/actions/tool-options-actions.c
+++ b/app/actions/tool-options-actions.c
@@ -65,7 +65,7 @@ static const GimpActionEntry tool_options_actions[] =
     NC_("tool-options-action", "_Restore Tool Preset"), "", NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_RESTORE },
 
-  { "tool-options-edit-preset-menu", "gtk-edit",
+  { "tool-options-edit-preset-menu", GIMP_STOCK_EDIT,
     NC_("tool-options-action", "E_dit Tool Preset"), NULL, NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_EDIT },
 
diff --git a/app/actions/tool-presets-actions.c b/app/actions/tool-presets-actions.c
index 8d2eab0..27a8783 100644
--- a/app/actions/tool-presets-actions.c
+++ b/app/actions/tool-presets-actions.c
@@ -91,7 +91,7 @@ static const GimpActionEntry tool_presets_actions[] =
 
 static const GimpStringActionEntry tool_presets_edit_actions[] =
 {
-  { "tool-presets-edit", "gtk-edit",
+  { "tool-presets-edit", GIMP_STOCK_EDIT,
     NC_("tool-presets-action", "_Edit Tool Preset..."), NULL,
     NC_("tool-presets-action", "Edit this tool preset"),
     "gimp-tool-preset-editor",
diff --git a/app/actions/vectors-actions.c b/app/actions/vectors-actions.c
index 50ed4db..40419d3 100644
--- a/app/actions/vectors-actions.c
+++ b/app/actions/vectors-actions.c
@@ -49,7 +49,7 @@ static const GimpActionEntry vectors_actions[] =
     G_CALLBACK (vectors_vectors_tool_cmd_callback),
     GIMP_HELP_TOOL_VECTORS },
 
-  { "vectors-edit-attributes", "gtk-edit",
+  { "vectors-edit-attributes", GIMP_STOCK_EDIT,
     NC_("vectors-action", "_Edit Path Attributes..."), NULL,
     NC_("vectors-action", "Edit path attributes"),
     G_CALLBACK (vectors_edit_attributes_cmd_callback),
diff --git a/app/actions/vectors-commands.c b/app/actions/vectors-commands.c
index 7e010a3..1733ae6 100644
--- a/app/actions/vectors-commands.c
+++ b/app/actions/vectors-commands.c
@@ -138,7 +138,7 @@ vectors_edit_attributes_cmd_callback (GtkAction *action,
                                         gimp_object_get_name (vectors),
                                         _("Path Attributes"),
                                         "gimp-vectors-edit",
-                                        "gtk-edit",
+                                        GIMP_STOCK_EDIT,
                                         _("Edit Path Attributes"),
                                         GIMP_HELP_PATH_EDIT);
 
diff --git a/app/widgets/gimpcontrollereditor.c b/app/widgets/gimpcontrollereditor.c
index dd1e3ab..8ac9797 100644
--- a/app/widgets/gimpcontrollereditor.c
+++ b/app/widgets/gimpcontrollereditor.c
@@ -656,7 +656,7 @@ gimp_controller_editor_edit_clicked (GtkWidget            *button,
         gimp_viewable_dialog_new (GIMP_VIEWABLE (editor->info), editor->context,
                                   _("Select Controller Event Action"),
                                   "gimp-controller-action-dialog",
-                                  "gtk-edit",
+                                  GIMP_STOCK_EDIT,
                                   title,
                                   gtk_widget_get_toplevel (GTK_WIDGET (editor)),
                                   gimp_standard_help_func,
diff --git a/app/widgets/gimpsettingsbox.c b/app/widgets/gimpsettingsbox.c
index d64a172..e9d42a4 100644
--- a/app/widgets/gimpsettingsbox.c
+++ b/app/widgets/gimpsettingsbox.c
@@ -328,7 +328,7 @@ gimp_settings_box_constructed (GObject *object)
   gimp_settings_box_menu_item_add (box, NULL, NULL, NULL);
 
   gimp_settings_box_menu_item_add (box,
-                                   "gtk-edit",
+                                   GIMP_STOCK_EDIT,
                                    _("_Manage Settings..."),
                                    G_CALLBACK (gimp_settings_box_manage_activate));
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]