[gimp/icons-wip] icons: Bug 759904
- From: Klaus Staedtler <klausstaedtler src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/icons-wip] icons: Bug 759904
- Date: Fri, 1 Jul 2016 15:33:54 +0000 (UTC)
commit 7458d0d029830aca1213e0100c557b2544c0c137
Author: klausstaedtler <staedtler-przyborski web de>
Date: Fri Jul 1 17:33:29 2016 +0200
icons: Bug 759904
add:
gimp-palette
patch:
replace "gtk-convert" by "gimp-palette"
gimp/app/actions/palettes-actions.c: { "palettes-import", "gtk-convert",
gimp/app/dialogs/palette-import-dialog.c: gtk_image_new_from_icon_name
("gtk-convert",
app/actions/palettes-actions.c | 2 +-
app/dialogs/palette-import-dialog.c | 2 +-
icons/Color/16/gimp-palette.png | Bin 0 -> 430 bytes
icons/Color/scalable/gimp-palette.svg | 141 ++++++++++++++++++++++++++++++
icons/Symbolic/16/gimp-palette.png | Bin 0 -> 738 bytes
icons/Symbolic/scalable/gimp-palette.svg | 93 ++++++++++++++++++++
icons/icon-list.mk | 2 +
libgimpwidgets/gimpicons.c | 1 +
libgimpwidgets/gimpicons.h | 1 +
9 files changed, 240 insertions(+), 2 deletions(-)
---
diff --git a/app/actions/palettes-actions.c b/app/actions/palettes-actions.c
index ffecc59..81240e4 100644
--- a/app/actions/palettes-actions.c
+++ b/app/actions/palettes-actions.c
@@ -50,7 +50,7 @@ static const GimpActionEntry palettes_actions[] =
G_CALLBACK (data_new_cmd_callback),
GIMP_HELP_PALETTE_NEW },
- { "palettes-import", "gtk-convert",
+ { "palettes-import", GIMP_STOCK_PALETTE,
NC_("palettes-action", "_Import Palette..."), NULL,
NC_("palettes-action", "Import palette"),
G_CALLBACK (palettes_import_cmd_callback),
diff --git a/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c
index 8618bec..8f0e980 100644
--- a/app/dialogs/palette-import-dialog.c
+++ b/app/dialogs/palette-import-dialog.c
@@ -163,7 +163,7 @@ palette_import_dialog_new (GimpContext *context)
button = gtk_dialog_add_button (GTK_DIALOG (dialog->dialog),
_("_Import"), GTK_RESPONSE_OK);
gtk_button_set_image (GTK_BUTTON (button),
- gtk_image_new_from_icon_name ("gtk-convert",
+ gtk_image_new_from_icon_name (GIMP_STOCK_PALETTE,
GTK_ICON_SIZE_BUTTON));
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog->dialog),
diff --git a/icons/Color/16/gimp-palette.png b/icons/Color/16/gimp-palette.png
new file mode 100644
index 0000000..1945c61
Binary files /dev/null and b/icons/Color/16/gimp-palette.png differ
diff --git a/icons/Color/scalable/gimp-palette.svg b/icons/Color/scalable/gimp-palette.svg
new file mode 100644
index 0000000..9f700a9
--- /dev/null
+++ b/icons/Color/scalable/gimp-palette.svg
@@ -0,0 +1,141 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="16"
+ height="16"
+ viewBox="0 0 7.3333333 7.3333333"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.92pre1 unknown"
+ sodipodi:docname="gimp-palette.svg">
+ <metadata
+ id="metadata91">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1016"
+ id="namedview89"
+ showgrid="false"
+ showguides="false"
+ inkscape:zoom="37.788593"
+ inkscape:cx="8.3188148"
+ inkscape:cy="7.4736612"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" />
+ <defs
+ id="defs4" />
+ <g
+ id="g4249">
+ <rect
+ y="0.22916664"
+ x="0.22916666"
+ height="6.875"
+ width="6.875"
+ id="rect5336-8-7-6-18"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.45833331;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ <rect
+ y="0.68749988"
+ x="0.6875"
+ height="6.4166665"
+ width="6.4166665"
+ id="rect5336-8-7-6-18-3"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.45833331;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ <rect
+ clip-path="none"
+ y="0.68749988"
+ x="0.6875"
+ height="1.375"
+ width="1.375"
+ id="rect4213-32-5-4-7-1-8"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#edd400;fill-opacity:1;fill-rule:nonzero;stroke:#ffea3d;stroke-width:0.45833334;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ <rect
+ clip-path="none"
+ y="0.68749988"
+ x="2.9791667"
+ height="1.375"
+ width="1.375"
+ id="rect4213-32-5-4-6-3-6-0"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#eeeeec;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.45833334;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ <rect
+ clip-path="none"
+ y="0.68749988"
+ x="5.2708335"
+ height="1.375"
+ width="1.375"
+ id="rect4213-32-5-4-1-2-3-7"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ef2929;fill-opacity:1;fill-rule:nonzero;stroke:#f14c4c;stroke-width:0.45833334;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ <rect
+ clip-path="none"
+ y="2.9791667"
+ x="0.6875"
+ height="1.375"
+ width="1.375"
+ id="rect4213-32-5-4-9-9-9-2"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#fcaf3e;fill-opacity:1;fill-rule:nonzero;stroke:#fdcc84;stroke-width:0.45833334;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ <rect
+ clip-path="none"
+ y="2.9791667"
+ x="2.9791667"
+ height="1.375"
+ width="1.375"
+ id="rect4213-32-5-4-6-9-6-8-1"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#e65289;fill-opacity:1;fill-rule:nonzero;stroke:#eb75a1;stroke-width:0.45833334;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ <rect
+ clip-path="none"
+ y="2.9791667"
+ x="5.2708335"
+ height="1.375"
+ width="1.375"
+ id="rect4213-32-5-4-1-0-2-3-3"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#537db2;stroke-width:0.45833334;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ <rect
+ clip-path="none"
+ y="5.2708335"
+ x="0.6875"
+ height="1.375"
+ width="1.375"
+ id="rect4213-32-5-4-3-8-5-7"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#babdb6;fill-opacity:1;fill-rule:nonzero;stroke:#d3d6d1;stroke-width:0.45833334;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ <rect
+ clip-path="none"
+ y="5.2708335"
+ x="2.9791667"
+ height="1.375"
+ width="1.375"
+ id="rect4213-32-5-4-6-7-7-0-9"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#c17d11;fill-opacity:1;fill-rule:nonzero;stroke:#e59414;stroke-width:0.45833334;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ <rect
+ clip-path="none"
+ y="5.2708335"
+ x="5.2708335"
+ height="1.375"
+ width="1.375"
+ id="rect4213-32-5-4-1-4-4-7-3"
+
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#73d216;fill-opacity:1;fill-rule:nonzero;stroke:#85f319;stroke-width:0.45833334;stroke-opacity:1;marker:none;enable-background:accumulate"
/>
+ </g>
+</svg>
diff --git a/icons/Symbolic/16/gimp-palette.png b/icons/Symbolic/16/gimp-palette.png
new file mode 100644
index 0000000..1f24d1e
Binary files /dev/null and b/icons/Symbolic/16/gimp-palette.png differ
diff --git a/icons/Symbolic/scalable/gimp-palette.svg b/icons/Symbolic/scalable/gimp-palette.svg
new file mode 100644
index 0000000..e70504e
--- /dev/null
+++ b/icons/Symbolic/scalable/gimp-palette.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://creativecommons.org/ns#";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ viewBox="0 0 16.000001 16"
+ id="svg7384"
+ height="16"
+ width="16.000002"
+ version="1.1"
+ inkscape:version="0.92pre1 unknown"
+ sodipodi:docname="gimp-palette.svg">
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1920"
+ inkscape:window-height="1016"
+ id="namedview1508"
+ showgrid="false"
+ inkscape:zoom="14.75"
+ inkscape:cx="3.051093"
+ inkscape:cy="9.1864407"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg7384" />
+ <metadata
+ id="metadata90">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ <dc:title></dc:title>
+ <dc:contributor>
+ <cc:Agent>
+ <dc:title>Barbara Muraus, Jakub Steiner, Klaus Staedtler</dc:title>
+ </cc:Agent>
+ </dc:contributor>
+ <dc:description>Images originally created as the "Art Libre" icon set. Extended and
adopted for GIMP</dc:description>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs7386" />
+ <g
+ id="g4273">
+ <rect
+ y="0"
+ x="0"
+ height="16"
+ width="16"
+ id="rect4265"
+
style="opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:0.73017961;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke
fill markers" />
+ <g
+ transform="translate(56.000005,-915.36409)"
+ id="g19418">
+ <path
+ style="fill:#bebebe;fill-opacity:1;stroke:none"
+ d="m -48.10807,916.36217 c -2.10985,0.0296 -4.94513,0.80221 -4.89737,3.28068 0.0499,2.58608
2.91741,1.66126 3.15054,2.71829 0.0353,-0.045 0.0883,-0.0821 0.12477,-0.12498 0.19744,-0.2135
0.39517,-0.38769 0.59267,-0.59365 0.31248,-0.35256 0.63627,-0.67899 0.967,-1.03107 1.10674,-1.17814
1.15415,-1.24979 3.79604,-3.24945 -1.03459,-0.62096 -2.25793,-0.96565 -3.29695,-0.99982 -0.1332,-0.005
-0.29604,-0.002 -0.4367,0 z m -1.9028,1.53098 c 0.82692,0 1.49728,0.67146 1.49728,1.49975 0,0.82829
-0.67036,1.49974 -1.49728,1.49974 -0.82693,0 -1.49728,-0.67145 -1.49728,-1.49974 0,-0.82829 0.67035,-1.49975
1.49728,-1.49975 z m 7.26873,0.66156 c -1.41828,2.23337 -2.36679,3.55601 -3.36956,4.58755 -0.63925,0.65758
-1.1631,1.31156 -1.62205,1.78094 -0.83899,0.89023 -1.93776,1.94077 -3.15054,3.09322 0.0633,1.46884
0.81094,2.74635 3.24412,3.2182 3.89808,0.75593 8.02683,-1.82423 7.61118,-7.06129 -0.17842,-2.24796
-1.4052,-4.28134 -2.71315,-5.61862 z m 0.34245,3.80643 c 0.5488,0 0.99819,0.4
4764 0.99819,0.99983 0,0.55218 -0.44939,0.99983 -0.99819,0.99983 -0.54879,0 -0.99818,-0.44765
-0.99818,-0.99983 0,-0.55219 0.44939,-0.99983 0.99818,-0.99983 z m -0.62386,2.99949 c 0.54879,0
0.99818,0.44764 0.99818,0.99983 0,0.55218 -0.44939,0.99982 -0.99818,0.99982 -0.5488,0 -0.99819,-0.44764
-0.99819,-0.99982 0,-0.55219 0.44939,-0.99983 0.99819,-0.99983 z m -4.99094,1.99965 c 0.54879,0
0.99818,0.44765 0.99818,0.99983 0,0.55219 -0.44939,0.99983 -0.99818,0.99983 -0.5488,0 -0.99819,-0.44764
-0.99819,-0.99983 0,-0.55218 0.44939,-0.99983 0.99819,-0.99983 z m 2.99456,0 c 0.5488,0 0.99819,0.44765
0.99819,0.99983 0,0.55219 -0.44939,0.99983 -0.99819,0.99983 -0.5488,0 -0.99819,-0.44764 -0.99819,-0.99983
0,-0.55218 0.44939,-0.99983 0.99819,-0.99983 z"
+ id="path9234"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="cccccccccssssscsccsscssssssssssssssssssss" />
+ <g
+ id="g9272-3"
+ transform="matrix(0.49887914,0,0,0.53785861,-41.78195,915.02923)"
+ style="fill:#bebebe;fill-opacity:1;stroke:none">
+ <path
+ inkscape:connector-curvature="0"
+ d="m -28.5,27.5711 c 3.111145,0.0011 2.79359,-3.323359 4.304166,-4.248979 1.750479,-1.072622
3.284496,0.256475 3.590759,1.350292 0.386445,1.380184 -0.234224,3.032938 -2.265024,3.503889
-2.151559,0.498954 -5.335338,0.513772 -5.629901,-0.605202 z"
+ id="path9274-5"
+ sodipodi:nodetypes="csssc"
+ style="fill:#bebebe;fill-opacity:1;stroke:none" />
+ </g>
+ <path
+ style="fill:#bebebe;fill-opacity:1;stroke:none"
+ d="m -41.96298,916.36217 c -1.79965,1.2988 -4.20634,3.30184 -6.11488,5.3335 -0.17324,0.18442
-0.34065,0.36235 -0.50432,0.54703 -0.10346,0.10788 -0.21177,0.19588 -0.3152,0.30771 -0.0653,0.0767
-0.12585,0.16279 -0.18912,0.23932 -1.87306,2.07016 -3.71972,4.68066 -4.91712,6.6327 2.97729,-2.29737
4.91603,-4.16475 6.1464,-5.47026 0.2404,-0.24587 0.52929,-0.56636 0.85103,-0.92311 1.20361,-1.33456
2.92519,-3.43748 5.04321,-6.66689 z"
+ id="path9264-2"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+</svg>
diff --git a/icons/icon-list.mk b/icons/icon-list.mk
index efec881..76ecb93 100644
--- a/icons/icon-list.mk
+++ b/icons/icon-list.mk
@@ -145,6 +145,7 @@ scalable_images = \
scalable/gimp-no.svg \
scalable/gimp-okay.svg \
scalable/gimp-open.svg \
+ scalable/gimp-palette.svg \
scalable/gimp-paste.svg \
scalable/gimp-paste-as-new.svg \
scalable/gimp-paste-into.svg \
@@ -609,6 +610,7 @@ icons16_images = \
16/gimp-no.png \
16/gimp-okay.png \
16/gimp-open.png \
+ 16/gimp-palette.png \
16/gimp-paste.png \
16/gimp-paste-as-new.png \
16/gimp-paste-into.png \
diff --git a/libgimpwidgets/gimpicons.c b/libgimpwidgets/gimpicons.c
index 8e07918..7a6ecb2 100644
--- a/libgimpwidgets/gimpicons.c
+++ b/libgimpwidgets/gimpicons.c
@@ -184,6 +184,7 @@ static const GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_FONT, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_PATTERN, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_BUFFER, NULL, 0, 0, LIBGIMP_DOMAIN },
+ { GIMP_STOCK_PALETTE, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_CONVERT_RGB, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_CONVERT_GRAYSCALE, NULL, 0, 0, LIBGIMP_DOMAIN },
diff --git a/libgimpwidgets/gimpicons.h b/libgimpwidgets/gimpicons.h
index f28c937..7f34bd6 100644
--- a/libgimpwidgets/gimpicons.h
+++ b/libgimpwidgets/gimpicons.h
@@ -157,6 +157,7 @@ G_BEGIN_DECLS
#define GIMP_STOCK_FONT "gimp-font"
#define GIMP_STOCK_PATTERN "gimp-pattern"
#define GIMP_STOCK_BUFFER "gimp-buffer"
+#define GIMP_STOCK_PALETTE "gimp-palette"
#define GIMP_STOCK_MEDIA_PLAYBACK_PAUSE, "gimp-media-playback-pause"
#define GIMP_STOCK_MEDIA_PLAYBACK_START, "gimp-media-playback-start"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
