icons: Bug 759904

add
gimp-buffer

remove
gimp/libgimpwidgets/gimpicons.h:#define GIMP_STOCK_BUFFER                   GTK_STOCK_PASTE

patch
gimpicons.c
gimpicons.h
This commit is contained in:
klausstaedtler 2016-06-09 20:03:37 +02:00 committed by Jehan
parent f87a8d27dd
commit cb7d93d556
9 changed files with 376 additions and 28 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 575 B

After

Width:  |  Height:  |  Size: 537 B

View File

@ -0,0 +1,180 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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:xlink="http://www.w3.org/1999/xlink"
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 16 16"
id="svg30571"
version="1.1"
inkscape:version="0.92pre1 unknown"
sodipodi:docname="gimp-buffer.svg">
<defs
id="defs30573">
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient2259"
id="linearGradient2265"
x1="26.076092"
y1="26.696676"
x2="30.811172"
y2="42.007351"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.38145664,0,0,0.32789635,-1.1641847,1037.0763)" />
<linearGradient
inkscape:collect="always"
id="linearGradient2259">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop2261" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop2263" />
</linearGradient>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="8.6640625"
inkscape:cx="25.774572"
inkscape:cy="4.7097324"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
units="px"
inkscape:snap-page="true"
inkscape:snap-bbox="true"
inkscape:bbox-paths="true"
inkscape:bbox-nodes="true"
inkscape:snap-bbox-edge-midpoints="true"
inkscape:snap-bbox-midpoints="true"
inkscape:object-paths="true"
inkscape:snap-intersection-paths="true"
inkscape:object-nodes="true"
inkscape:snap-smooth-nodes="true"
inkscape:snap-midpoints="true"
inkscape:snap-object-midpoints="true"
inkscape:snap-center="true"
inkscape:snap-text-baseline="true"
showborder="false"
inkscape:window-width="1346"
inkscape:window-height="1016"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="0"
inkscape:snap-global="false">
<inkscape:grid
type="xygrid"
id="grid4287" />
</sodipodi:namedview>
<metadata
id="metadata30576">
<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:creator>
<cc:Agent>
<dc:title>Klaus Staedtler</dc:title>
</cc:Agent>
</dc:creator>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1036.3622)">
<g
id="g4309">
<g
transform="matrix(1.0000009,0,0,0.9999115,-6.2077402e-6,1036.3636)"
inkscape:export-ydpi="269.99994"
inkscape:export-xdpi="269.99994"
id="gimp-layer"
style="display:inline">
<rect
style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.41550624;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
id="rect4002"
width="15.584494"
height="15.584494"
x="0.20775312"
y="0.20775324" />
</g>
<g
transform="matrix(0.75005604,0,0,0.7499038,1.3070022e-4,263.19186)"
id="g4294">
<rect
style="opacity:1;fill:#c68827;fill-opacity:1;fill-rule:evenodd;stroke:#714c16;stroke-width:0.37281546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect12368"
width="15.626003"
height="14.251704"
x="0.1869981"
y="1037.9244"
rx="0.55559194"
ry="0.48191613" />
<rect
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#c68827;stroke-width:0.37281546;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect15974"
width="14.845407"
height="13.573779"
x="0.5773012"
y="1038.2476"
rx="0.19166328"
ry="0.16624732" />
</g>
<g
transform="matrix(0.79332188,0,0,0.79902198,4.7078987,206.3004)"
id="g4287">
<rect
style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.36486655;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect12413"
width="12.200349"
height="12.150646"
x="1.8111547"
y="1039.0302"
rx="0.22330375"
ry="0.19133064" />
<rect
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2265);stroke-width:0.35366419;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect15244"
width="11.067639"
height="11.161843"
x="2.4661918"
y="1039.5247"
rx="0"
ry="0" />
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.48863639;fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.37281564;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
d="m 13.805469,1049.0604 0.01769,2.0554 -3.06094,-0.3135 z"
id="path2212"
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0" />
<path
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:#868a84;stroke-width:0.37281564;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none"
d="m 10.432595,1050.9752 c 0.716995,0.058 3.385084,-1.1072 3.581677,-2.5024 -1.479809,0.1704 -1.727259,0.05 -3.371997,0.105 0,0 0.115565,2.2238 -0.20968,2.3974 z"
id="path2210"
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0" />
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

@ -39,15 +39,6 @@
id="stop5152"
stop-color="#ececec" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient14484"
id="linearGradient14490"
x1="6.1071744"
y1="10.45129"
x2="33.857143"
y2="37.87986"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient14484">
<stop
@ -170,9 +161,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="26.807756"
inkscape:zoom="16"
inkscape:cx="6.7667315"
inkscape:cy="5.2174907"
inkscape:cy="-0.63379216"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
@ -192,11 +183,11 @@
inkscape:snap-center="true"
inkscape:snap-text-baseline="true"
showborder="false"
inkscape:window-width="1920"
inkscape:window-width="1860"
inkscape:window-height="1016"
inkscape:window-x="0"
inkscape:window-x="50"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:window-maximized="0"
inkscape:snap-global="false">
<inkscape:grid
type="xygrid"
@ -210,7 +201,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
<dc:creator>
<cc:Agent>
<dc:title>Klaus Staedtler</dc:title>
@ -240,7 +231,7 @@
</g>
<g
id="g3216"
transform="matrix(0.40030051,0,0,0.34721775,-1.6000704,1036.3619)">
transform="matrix(0.39963131,0,0,0.34748431,-1.5840215,1036.3623)">
<rect
ry="1.3879364"
rx="1.3879371"
@ -249,7 +240,7 @@
height="41.045437"
width="39.035683"
id="rect12368"
style="opacity:1;fill:url(#linearGradient14490);fill-opacity:1;fill-rule:evenodd;stroke:#714c16;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
style="opacity:1;fill:#c68827;fill-opacity:1;fill-rule:evenodd;stroke:#714c16;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<rect
ry="0.55103934"
rx="0.55784029"
@ -286,15 +277,6 @@
width="37.085655"
id="rect15974"
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#c68827;stroke-width:0.99999976;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
<rect
style="opacity:0.10795456;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect2208"
width="18.947376"
height="7"
x="14.791488"
y="4.4722719"
rx="1.3879377"
ry="1.3879364" />
<rect
style="opacity:1;fill:url(#linearGradient15240);fill-opacity:1;fill-rule:evenodd;stroke:#5c5c5c;stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
id="rect2285"

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 381 B

View File

@ -0,0 +1,183 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
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:xlink="http://www.w3.org/1999/xlink"
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-buffer.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="namedview1510"
showgrid="true"
inkscape:zoom="41.7193"
inkscape:cx="7.1711387"
inkscape:cy="6.9192738"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg7384">
<inkscape:grid
type="xygrid"
id="grid4289" />
</sodipodi:namedview>
<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 &quot;Art Libre&quot; icon set. Extended and adopted for GIMP</dc:description>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs7386">
<linearGradient
osb:paint="solid"
id="linearGradient8074">
<stop
id="stop8072"
offset="0"
style="stop-color:#be00be;stop-opacity:1;" />
</linearGradient>
<linearGradient
osb:paint="solid"
id="linearGradient7561">
<stop
id="stop7558"
offset="0"
style="stop-color:#a5a5a5;stop-opacity:1;" />
</linearGradient>
<linearGradient
osb:paint="solid"
id="linearGradient7548">
<stop
id="stop7546"
offset="0"
style="stop-color:#ebebeb;stop-opacity:1;" />
</linearGradient>
<linearGradient
osb:paint="solid"
id="linearGradient7542">
<stop
id="stop7538"
offset="0"
style="stop-color:#c9c9c9;stop-opacity:1;" />
</linearGradient>
<linearGradient
gradientTransform="matrix(0,-735328.32,170712.69,0,2464326300,577972450)"
osb:paint="solid"
id="linearGradient19282">
<stop
id="stop19284"
offset="0"
style="stop-color:#b4b4b4;stop-opacity:1;" />
</linearGradient>
<linearGradient
gradientTransform="matrix(0.34682586,0,0,0.30620888,-113.35187,142.03851)"
osb:paint="solid"
id="linearGradient19282-4">
<stop
id="stop19284-0"
offset="0"
style="stop-color:#bebebe;stop-opacity:1;" />
</linearGradient>
<linearGradient
gradientTransform="matrix(1.2206042,0,0,1.1428571,862.29897,-213.68329)"
gradientUnits="userSpaceOnUse"
y2="411.5"
x2="-187"
y1="411.5"
x1="-200"
id="linearGradient10150"
xlink:href="#linearGradient19282-4" />
<linearGradient
gradientTransform="matrix(1.4285714,0,0,-1.1252397,666.64823,468.06733)"
gradientUnits="userSpaceOnUse"
y2="629"
x2="51.000198"
y1="629"
x1="44.000198"
id="linearGradient10152"
xlink:href="#linearGradient19282-4" />
<linearGradient
gradientTransform="matrix(0.39999896,0,0,1.1666667,189.9138,-472.63501)"
gradientUnits="userSpaceOnUse"
y2="622.5"
x2="50.000198"
y1="622.5"
x1="45.000198"
id="linearGradient10154"
xlink:href="#linearGradient19282-4" />
<linearGradient
gradientTransform="translate(465.45237,-401.97289)"
gradientUnits="userSpaceOnUse"
y2="622.03961"
x2="57.000198"
y1="622.03961"
x1="51.093372"
id="linearGradient10156"
xlink:href="#linearGradient19282-4" />
<linearGradient
gradientTransform="matrix(-1,0,0,1,-693.34788,-184.97289)"
gradientUnits="userSpaceOnUse"
y2="411.5"
x2="-187"
y1="411.5"
x1="-200"
id="linearGradient10150-2"
xlink:href="#linearGradient19282-4" />
</defs>
<rect
style="fill:none;stroke:none;stroke-width:0.99989343"
id="rect14038"
width="15.996591"
height="16"
x="-6.357422e-07"
y="0"
rx="0" />
<path
sodipodi:nodetypes="cccccc"
style="fill:url(#linearGradient10152);fill-opacity:1;stroke:none;stroke-width:1.26786649"
d="m 4,9.0000005 v -9.00191944 h 9.002 l 3,3.00064164 v 6.0012778 z"
id="path6973"
inkscape:connector-curvature="0" />
<g
id="g4255"
transform="matrix(0.7500019,0,0,0.7500019,0,3.9999693)">
<path
id="path6977"
d="M 0.74984016,4.093323e-5 C 0.04436767,0.01067945 0.00476799,0.66670591 0.00476799,0.66670591 0,1.8085296 0,-0.79665032 0,1.3333709 V 15.392856 c 0,0.335772 0.28983247,0.607143 0.64844598,0.607143 h 0.1287356 14.44222742 0.128736 c 0.358613,0 0.648446,-0.271371 0.648446,-0.607143 -7.66e-4,-2.464279 0.0034,-7.3928353 0.0034,-7.3928353 H 14.66663 v 6.2499783 c -0.0033,0.335757 -0.309212,0.416671 -0.667826,0.416671 H 1.9977858 c -0.3586136,0 -0.6611383,-0.08091 -0.6644558,-0.416671 V 2.0000359 C 1.3725418,1.6996105 1.5525829,1.2343302 1.8690502,1.3333709 H 3.9991474 V 4.093323e-5 Z"
style="fill:url(#linearGradient10150);fill-opacity:1;stroke:none;stroke-width:1.18109107"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cczssccsccccssccsccc" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 6.1 KiB

View File

@ -1,5 +1,6 @@
scalable_images = \
scalable/gimp-anchor.svg \
scalable/gimp-buffer.svg \
scalable/gimp-cancel.svg \
scalable/gimp-cap-butt.svg \
scalable/gimp-cap-round.svg \
@ -442,6 +443,7 @@ icons12_images = \
icons16_images = \
16/gimp-anchor.png \
16/gimp-buffer.png \
16/gimp-cancel.png \
16/gimp-cap-butt.png \
16/gimp-cap-round.png \

View File

@ -160,7 +160,8 @@ static const GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_PRINT_RESOLUTION, NULL, 0, 0, LIBGIMP_DOMAIN },
{ 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_CONVERT_RGB, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_CONVERT_GRAYSCALE, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_CONVERT_INDEXED, NULL, 0, 0, LIBGIMP_DOMAIN },

View File

@ -131,6 +131,7 @@ G_BEGIN_DECLS
#define GIMP_STOCK_PRINT_RESOLUTION "gimp-print-resolution"
#define GIMP_STOCK_FONT "gimp-font"
#define GIMP_STOCK_PATTERN "gimp-pattern"
#define GIMP_STOCK_BUFFER "gimp-buffer"
#define GIMP_STOCK_TEXT_DIR_LTR "gimp-text-dir-ltr"
#define GIMP_STOCK_TEXT_DIR_RTL "gimp-text-dir-rtl"
@ -319,7 +320,6 @@ G_BEGIN_DECLS
/* missing icons: */
#define GIMP_STOCK_BRUSH GIMP_STOCK_TOOL_PAINTBRUSH
#define GIMP_STOCK_BUFFER GTK_STOCK_PASTE
#define GIMP_STOCK_DETACH GTK_STOCK_CONVERT
#define GIMP_STOCK_GRADIENT GIMP_STOCK_TOOL_BLEND
#define GIMP_STOCK_MYPAINT_BRUSH GIMP_STOCK_TOOL_MYPAINT_BRUSH