[gimp] icons, app, libgimpwidgets: replace GIMP_STOCK_EDIT with GTK_STOCK_EDIT.



commit c6f1761af7eee7ac298f7bb165aa4bd83d8becc1
Author: Jehan <jehan girinstud io>
Date:   Mon Sep 5 02:51:25 2016 +0200

    icons, app, libgimpwidgets: replace GIMP_STOCK_EDIT with GTK_STOCK_EDIT.

 app/widgets/gimpviewablebox.c                      |    2 +-
 icons/Color/16/{gimp-edit.png => gtk-edit.png}     |  Bin 596 -> 596 bytes
 icons/Color/color-scalable.svg                     |    2 +-
 .../Color/scalable/{gimp-edit.svg => gtk-edit.svg} |    0
 icons/Legacy/16/{gimp-edit.png => gtk-edit.png}    |  Bin 526 -> 526 bytes
 icons/Legacy/Makefile.am                           |    3 ++-
 icons/Symbolic/16/{gimp-edit.png => gtk-edit.png}  |  Bin 342 -> 342 bytes
 .../scalable/{gimp-edit.svg => gtk-edit.svg}       |    0
 icons/Symbolic/symbolic-scalable.svg               |    4 ++--
 icons/icon-list.mk                                 |    4 ++--
 libgimpwidgets/gimpicons.c                         |    1 -
 libgimpwidgets/gimpicons.h                         |    1 -
 12 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/app/widgets/gimpviewablebox.c b/app/widgets/gimpviewablebox.c
index c79d78d..05e8abb 100644
--- a/app/widgets/gimpviewablebox.c
+++ b/app/widgets/gimpviewablebox.c
@@ -655,7 +655,7 @@ gimp_viewable_box_new (GimpContainer *container,
       gtk_box_pack_end (GTK_BOX (entry_hbox), edit_button, FALSE, FALSE, 0);
       gtk_widget_show (edit_button);
 
-      image = gtk_image_new_from_icon_name (GIMP_STOCK_EDIT,
+      image = gtk_image_new_from_icon_name (GTK_STOCK_EDIT,
                                             GTK_ICON_SIZE_BUTTON);
       gtk_misc_set_alignment (GTK_MISC (image), 0.5, 1.0);
       gtk_container_add (GTK_CONTAINER (edit_button), image);
diff --git a/icons/Color/color-scalable.svg b/icons/Color/color-scalable.svg
index 8f3d89c..ae69235 100644
--- a/icons/Color/color-scalable.svg
+++ b/icons/Color/color-scalable.svg
@@ -35825,7 +35825,7 @@
     </g>
     <g
        transform="translate(90.856833,-1064.1307)"
-       id="gimp-edit">
+       id="gtk-edit">
       <g
          id="g4514">
         <g
diff --git a/icons/Color/scalable/gimp-edit.svg b/icons/Color/scalable/gtk-edit.svg
similarity index 100%
rename from icons/Color/scalable/gimp-edit.svg
rename to icons/Color/scalable/gtk-edit.svg
diff --git a/icons/Legacy/Makefile.am b/icons/Legacy/Makefile.am
index 4d7c750..c50aca3 100644
--- a/icons/Legacy/Makefile.am
+++ b/icons/Legacy/Makefile.am
@@ -38,6 +38,8 @@ icons12_DATA = \
        12/gimp-zoom-follow-window.png
 
 icons16_DATA = \
+       16/gtk-edit.png                                         \
+                                                                               \
        16/gimp-anchor.png                              \
        16/gimp-cap-butt.png                            \
        16/gimp-cap-round.png                           \
@@ -74,7 +76,6 @@ icons16_DATA = \
        16/gimp-display-filter.png                      \
        16/gimp-duplicate.png                           \
        16/gimp-dynamics.png                            \
-       16/gimp-edit.png                                \
        16/gimp-flip-horizontal.png                     \
        16/gimp-flip-vertical.png                       \
        16/gimp-floating-selection.png                  \
diff --git a/icons/Symbolic/scalable/gimp-edit.svg b/icons/Symbolic/scalable/gtk-edit.svg
similarity index 100%
rename from icons/Symbolic/scalable/gimp-edit.svg
rename to icons/Symbolic/scalable/gtk-edit.svg
diff --git a/icons/Symbolic/symbolic-scalable.svg b/icons/Symbolic/symbolic-scalable.svg
index 8e4397f..4481657 100644
--- a/icons/Symbolic/symbolic-scalable.svg
+++ b/icons/Symbolic/symbolic-scalable.svg
@@ -26228,8 +26228,8 @@
     <g
        transform="translate(-96.0906,-437.50285)"
        style="display:inline"
-       id="gimp-edit"
-       inkscape:label="gimp-edit">
+       id="gtk-edit"
+       inkscape:label="gtk-edit">
       <rect
          transform="translate(241.0002,217)"
          y="182"
diff --git a/icons/icon-list.mk b/icons/icon-list.mk
index 2498f1f..958e624 100644
--- a/icons/icon-list.mk
+++ b/icons/icon-list.mk
@@ -44,6 +44,7 @@ scalable_images = \
        scalable/zoom-out.svg                                           \
                                                                                                \
        scalable/gtk-cancel.svg                                         \
+       scalable/gtk-edit.svg                                           \
        scalable/gtk-justify-fill.svg                           \
        scalable/gtk-justify-center.svg                         \
        scalable/gtk-justify-left.svg                           \
@@ -101,7 +102,6 @@ scalable_images = \
        scalable/gimp-display-filter.svg                \
        scalable/gimp-duplicate.svg                     \
        scalable/gimp-dynamics.svg                      \
-       scalable/gimp-edit.svg                          \
        scalable/gimp-error.svg                         \
        scalable/gimp-file-manager.svg                  \
        scalable/gimp-flip-horizontal.svg               \
@@ -530,6 +530,7 @@ icons16_images = \
        16/zoom-out.png                                                         \
                                                                                                \
        16/gtk-cancel.png                                                       \
+       16/gtk-edit.png                                                         \
        16/gtk-no.png                                                           \
        16/gtk-ok.png                                                           \
        16/gtk-select-color.png                                         \
@@ -578,7 +579,6 @@ icons16_images = \
        16/gimp-display-filter.png                                      \
        16/gimp-duplicate.png                                           \
        16/gimp-dynamics.png                                            \
-       16/gimp-edit.png                                                        \
        16/gimp-error.png                                                       \
        16/gimp-file-manager.png                                        \
        16/gimp-flip-horizontal.png                                     \
diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c
index f04b124..c715403 100644
--- a/libgimpwidgets/gimpicons.c
+++ b/libgimpwidgets/gimpicons.c
@@ -61,7 +61,6 @@ static const GtkStockItem gimp_stock_items[] =
   { GIMP_STOCK_ANCHOR,         N_("Anchor"),          0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_CENTER,         N_("C_enter"),         0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_DUPLICATE,      N_("_Duplicate"),      0, 0, LIBGIMP_DOMAIN },
-  { GIMP_STOCK_EDIT,           N_("_Edit"),           0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_LINKED,         N_("Linked"),          0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_PASTE_AS_NEW,   N_("Paste as New"),    0, 0, LIBGIMP_DOMAIN },
   { GIMP_STOCK_PASTE_INTO,     N_("Paste Into"),      0, 0, LIBGIMP_DOMAIN },
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index 468e419..add5adf 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -36,7 +36,6 @@ G_BEGIN_DECLS
 #define GIMP_STOCK_ANCHOR                   "gimp-anchor"
 #define GIMP_STOCK_CENTER                   "gimp-center"
 #define GIMP_STOCK_DUPLICATE                "gimp-duplicate"
-#define GIMP_STOCK_EDIT                     "gimp-edit"
 #define GIMP_STOCK_LINKED                   "gimp-linked"
 #define GIMP_STOCK_PASTE_AS_NEW             "gimp-paste-as-new"
 #define GIMP_STOCK_PASTE_INTO               "gimp-paste-into"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]