[shotwell] Replace event merge icon with symbolic version

[Jens Georg <jensgeorg src gnome org>]

commit d79d5bb4854872b7cbbab3ba185b1b2b8888067a
Author: Jens Georg <mail jensge org>
Date:   Thu Apr 12 22:50:19 2018 +0200

    Replace event merge icon with symbolic version

 icons/events-merge-symbolic.svg     |  122 +++++++++++++++++++++++++++++++++++
 icons/merge.svg                     |   33 ---------
 org.gnome.Shotwell.gresource.xml    |    2 +-
 src/Resources.vala                  |    1 -
 src/events/EventsDirectoryPage.vala |    2 +-
 5 files changed, 124 insertions(+), 36 deletions(-)
---
diff --git a/icons/events-merge-symbolic.svg b/icons/events-merge-symbolic.svg
new file mode 100644
index 0000000..2a524a9
--- /dev/null
+++ b/icons/events-merge-symbolic.svg
@@ -0,0 +1,122 @@
+<?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="events-merge-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="true"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer12"
+     inkscape:cx="2.3631576"
+     inkscape:cy="7.2318144"
+     inkscape:document-rotation="0"
+     inkscape:document-units="px"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     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="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="1016"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1920"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="31.245283">
+    <inkscape:grid
+       dotted="false"
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="119.99994"
+       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="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-121.00027,-927.00006)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 130.03251,932.96738 c 0,2.08652 2.85441,6.30403 5.03022,6.30403 v 1.98043 c -3.31454,0 
-7.09456,-5.10379 -7.09456,-8.28446"
+       id="path23"
+       style="fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:0.87341374;stroke-opacity:1" />
+    <path
+       transform="matrix(0.89172448,0,0,0.85547901,115.77205,924.17648)"
+       style="fill:#bebebe;fill-opacity:1;stroke:none;stroke-opacity:1"
+       d="M 9.824,10.42 H 19.977 L 14.901,5.344 Z"
+       id="polygon25" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 127.96817,932.96738 c 0,2.08652 -2.85441,6.30403 -5.03022,6.30403 v 1.98043 c 3.31543,0 
7.09545,-5.10379 7.09545,-8.28446"
+       id="path27"
+       style="fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:0.87341374;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/org.gnome.Shotwell.gresource.xml b/org.gnome.Shotwell.gresource.xml
index ad9bb50..c030792 100644
--- a/org.gnome.Shotwell.gresource.xml
+++ b/org.gnome.Shotwell.gresource.xml
@@ -35,6 +35,7 @@
       <file>icons/about-braunschweig.jpg</file>
       <file>icons/all-rejected.png</file>
       <file>icons/crop-pivot-reticle.png</file>
+      <file>icons/events-merge-symbolic.svg</file>
       <file>icons/faces-tool.png</file>
       <file>icons/filter-flagged-disabled.png</file>
       <file>icons/filter-flagged.png</file>
@@ -58,7 +59,6 @@
       <file>icons/import.svg</file>
       <file>icons/make-primary.svg</file>
       <file>icons/many-faces.png</file>
-      <file>icons/merge.svg</file>
       <file>icons/multiple-events.png</file>
       <file>icons/multiple-tags.png</file>
       <file>icons/no-event.png</file>
diff --git a/src/Resources.vala b/src/Resources.vala
index ecaae57..666bc8e 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -78,7 +78,6 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string ENHANCE = "image-auto-adjust-symbolic";
     public const string CROP_PIVOT_RETICLE = "shotwell-crop-pivot-reticle";
     public const string PUBLISH = "send-to-symbolic";
-    public const string MERGE = "shotwell-merge-events";
     
     public const string GO_NEXT = "go-next-symbolic";
     public const string GO_PREVIOUS = "go-previous-symbolic";
diff --git a/src/events/EventsDirectoryPage.vala b/src/events/EventsDirectoryPage.vala
index 241abfe..2384a2b 100644
--- a/src/events/EventsDirectoryPage.vala
+++ b/src/events/EventsDirectoryPage.vala
@@ -66,7 +66,7 @@ public abstract class EventsDirectoryPage : CheckerboardPage {
         merge_button.set_action_name("win.Merge");
         merge_button.is_important = true;
         merge_button.set_tooltip_text (Resources.MERGE_TOOLTIP);
-        merge_button.set_icon_name ("merge");
+        merge_button.set_icon_name ("events-merge-symbolic");
         
         toolbar.insert(merge_button, -1);
     }