[shotwell/wip/phako/dark: 20/24] Replace straighten icon

[Jens Georg <jensgeorg src gnome org>]

commit aa6c522a5fbc7454a40372fb2e69f7bea1c5a1a5
Author: Jens Georg <mail jensge org>
Date:   Sat Apr 21 14:21:22 2018 +0200

    Replace straighten icon

 icons/straighten-symbolic.svg    |  175 ++++++
 icons/straighten.svg             | 1238 --------------------------------------
 org.gnome.Shotwell.gresource.xml |    2 +-
 src/PhotoPage.vala               |    2 +-
 src/Resources.vala               |    2 +-
 5 files changed, 178 insertions(+), 1241 deletions(-)
---
diff --git a/icons/straighten-symbolic.svg b/icons/straighten-symbolic.svg
new file mode 100644
index 0000000..256b23c
--- /dev/null
+++ b/icons/straighten-symbolic.svg
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   sodipodi:docname="straighten-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="15.999869"
+   id="svg7384"
+   version="1.1"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"
+   viewBox="0 0 16.000132 15.999869"
+   width="16.000132">
+  <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="2.2755558"
+     inkscape:cy="4.9276266"
+     inkscape:document-rotation="0"
+     inkscape:document-units="px"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:lockguides="false"
+     inkscape:measure-end="0,0"
+     inkscape:measure-start="-190.687,-191.14"
+     inkscape:object-nodes="true"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="false"
+     showgrid="true"
+     showguides="true"
+     inkscape:snap-bbox="false"
+     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="1016"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1920"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="33.61845">
+    <inkscape:grid
+       dotted="false"
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="5.0000628"
+       originy="709.99992"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <linearGradient
+       gradientTransform="matrix(-2.7365795,0.28202934,-0.18908311,-0.99988321,239.54008,-879.45557)"
+       id="linearGradient19282"
+       osb:paint="solid">
+      <stop
+         id="stop19284"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-236.00014,-927.00006)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     style="display:inline"
+     transform="translate(-236.00014,-927.00006)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-236.00014,-927.00006)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     style="display:inline"
+     transform="translate(-236.00014,-927.00006)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-236.00014,-927.00006)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-236.00014,-927.00006)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-236.00014,-927.00006)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-236.00014,-927.00006)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-236.00014,-927.00006)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 237.0002,933 v 7.98726 h 14 V 933 Z m 2,2 h 10 v 3.98726 h -10 z"
+       id="path11087"
+       sodipodi:nodetypes="cccccccccc"
+       
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 240.0002,935.00001 v 2.47593 h 1.50567 v -2.47593 z"
+       id="path11182"
+       
style="fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36527359px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 246.49453,935.00001 v 2.47593 h 1.50567 v -2.47593 z"
+       id="path11182-3"
+       
style="display:inline;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36527359px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 243.24737,935.00001 v 2.47593 h 1.50567 v -2.47593 z"
+       id="path11182-6"
+       
style="display:inline;fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.36527359px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
 />
+  </g>
+</svg>
diff --git a/org.gnome.Shotwell.gresource.xml b/org.gnome.Shotwell.gresource.xml
index a28ae96..22b8750 100644
--- a/org.gnome.Shotwell.gresource.xml
+++ b/org.gnome.Shotwell.gresource.xml
@@ -64,7 +64,7 @@
       <file>icons/shotwell-street.jpg</file>
       <file>icons/slideshow-extension-point.png</file>
       <file>icons/sprocket.png</file>
-      <file>icons/straighten.svg</file>
+      <file>icons/straighten-symbolic.svg</file>
       <file>misc/org.gnome.Shotwell.css</file>
   </gresource>
 </gresources>
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index 492a3e6..20977bc 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -455,7 +455,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
 
         // straightening tool
         straighten_button = new Gtk.ToggleToolButton ();
-        straighten_button.set_icon_name("straighten");
+        straighten_button.set_icon_name(Resources.STRAIGHTEN);
         straighten_button.set_label(Resources.STRAIGHTEN_LABEL);
         straighten_button.set_tooltip_text(Resources.STRAIGHTEN_TOOLTIP);
         straighten_button.toggled.connect(on_straighten_toggled);
diff --git a/src/Resources.vala b/src/Resources.vala
index f8b997f..f754f79 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -70,7 +70,7 @@ 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 STRAIGHTEN = "shotwell-straighten";
+    public const string STRAIGHTEN = "straighten-symbolic";
     public const string ADJUST = "image-adjust-color-symbolic";
     public const string IMPORT = "import";
     public const string IMPORT_ALL = "import-all";