commit d1440759b98094c4d83cdf86d66e8cd54e160a35
Author: Jens Georg <mail jensge org>
Date: Thu Apr 12 20:53:11 2018 +0200
Replace crop icon with symbolic version
icons/crop.svg | 57 --------------------------------------
icons/image-crop-symbolic.svg | 32 +++++++++++++++++++++
org.gnome.Shotwell.gresource.xml | 2 +-
src/PhotoPage.vala | 2 +-
src/Resources.vala | 1 -
5 files changed, 34 insertions(+), 60 deletions(-)
---
diff --git a/icons/image-crop-symbolic.svg b/icons/image-crop-symbolic.svg
new file mode 100644
index 0000000..b44eebb
--- /dev/null
+++ b/icons/image-crop-symbolic.svg
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/'
sodipodi:docname='image-crop-symbolic.svg'
inkscape:export-filename='/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png'
inkscape:export-xdpi='90' inkscape:export-ydpi='90' height='16' id='svg7384'
xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape'
xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'
xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' xmlns:svg='http://www.w3.org/2000/svg'
version='1.1' inkscape:version='0.91 r13725' width='16.000013' xmlns='http://www.w3.org/2000/svg'>
+ <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>Gnome Symbolic Icon Theme</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview inkscape:bbox-nodes='false' inkscape:bbox-paths='false' bordercolor='#666666'
borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='75.03303' inkscape:cy='7.80353'
gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88'
inkscape:object-nodes='true' inkscape:object-paths='false' objecttolerance='10' pagecolor='#3a3b39'
inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true'
inkscape:snap-bbox='true' inkscape:snap-bbox-midpoints='false' inkscape:snap-global='true'
inkscape:snap-grids='true' inkscape:snap-nodes='true' inkscape:snap-others='false'
inkscape:snap-to-guides='true' inkscape:window-height='1402' inkscape:window-maximized='1'
inkscape:window-width='2560' inkscape:window-x='2560' inkscape:window-y='0' inkscape:zoom='8'>
+ <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='-139.984'
originy='569.98573' snapvisiblegridlinesonly='true' spacingx='1px' spacingy='1px' type='xygrid'
visible='true'/>
+ </sodipodi:namedview>
+ <title id='title9167'>Gnome Symbolic Icon Theme</title>
+ <defs id='defs7386'/>
+ <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline'
transform='translate(-380.9842,-786.98573)'/>
+ <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline'
transform='translate(-380.9842,-786.98573)'/>
+ <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps'
transform='translate(-380.9842,-786.98573)'/>
+ <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline'
transform='translate(-380.9842,-786.98573)'/>
+ <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes'
transform='translate(-380.9842,-786.98573)'/>
+ <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline'
transform='translate(-380.9842,-786.98573)'/>
+ <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline'
transform='translate(-380.9842,-786.98573)'/>
+ <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline'
transform='translate(-380.9842,-786.98573)'/>
+ <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline'
transform='translate(-380.9842,-786.98573)'>
+
+ <path inkscape:connector-curvature='0' d='m 382.9842,787.98573 0,3 -2,0 0,2 2,0 0,6 0,2 8,0 0,2 2,0 0,-2
3,0 0,-2 -11,0 0,-7 0,-2 0,-2 z' id='rect44617' sodipodi:nodetypes='cccccccccccccccccc'
style='color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34179375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new'/>
+ <path inkscape:connector-curvature='0' d='m 386.9842,790.98573 0,2 4,0 0,5 2,0 0,-7 z' id='rect44625'
sodipodi:nodetypes='ccccccc'
style='color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.34179375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new'/>
+ </g>
+</svg>
diff --git a/org.gnome.Shotwell.gresource.xml b/org.gnome.Shotwell.gresource.xml
index c4fb86c..009bd78 100644
--- a/org.gnome.Shotwell.gresource.xml
+++ b/org.gnome.Shotwell.gresource.xml
@@ -35,7 +35,6 @@
<file>icons/about-braunschweig.jpg</file>
<file>icons/all-rejected.png</file>
<file>icons/crop-pivot-reticle.png</file>
- <file>icons/crop.svg</file>
<file>icons/faces-tool.png</file>
<file>icons/filter-flagged-disabled.png</file>
<file>icons/filter-flagged.png</file>
@@ -51,6 +50,7 @@
<file>icons/four-stars.svg</file>
<file>icons/generic-plugin.png</file>
<file>icons/image-adjust.svg</file>
+ <file>icons/image-crop-symbolic.svg</file>
<file>icons/image-zoom-in-symbolic.svg</file>
<file>icons/image-zoom-out-symbolic.svg</file>
<file>icons/import-all.png</file>
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index dd35c80..61ca948 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -446,7 +446,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
// crop tool
crop_button = new Gtk.ToggleToolButton ();
- crop_button.set_icon_name("crop");
+ crop_button.set_icon_name("image-crop-symbolic");
crop_button.set_label(Resources.CROP_LABEL);
crop_button.set_tooltip_text(Resources.CROP_TOOLTIP);
crop_button.toggled.connect(on_crop_toggled);
diff --git a/src/Resources.vala b/src/Resources.vala
index d258e1d..b6814e6 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -70,7 +70,6 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string COUNTERCLOCKWISE = "object-rotate-left-symbolic";
public const string HFLIP = "object-flip-horizontal-symbolic";
public const string VFLIP = "object-flip-vertical-symbolic";
- public const string CROP = "shotwell-crop";
public const string STRAIGHTEN = "shotwell-straighten";
public const string REDEYE = "shotwell-redeye";
public const string ADJUST = "image-adjust";