Merge lp:~elementary-apps/pantheon-photos/drag-nub-svg into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

Replace the drag nub png with an svg

[lp:~elementary-apps/pantheon-photos/drag-nub-svg]

3113. By Danielle Foré on 2017-01-15

replace drag nub with an svg

[Felipe Escoto (philip.scott)]

review: Approve (nice nub)

=== added file 'data/icons/drag-nub.svg'
--- data/icons/drag-nub.svg	1970-01-01 00:00:00 +0000
+++ data/icons/drag-nub.svg	2017-01-15 01:53:28 +0000
@@ -0,0 +1,116 @@
+<?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:xlink="http://www.w3.org/1999/xlink"
+   id="svg2"
+   height="16"
+   width="16"
+   version="1.2">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient9854">
+      <stop
+         id="stop9856"
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1;" />
+      <stop
+         id="stop9858"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient9660">
+      <stop
+         id="stop9662"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop9664"
+         style="stop-color:#ffffff;stop-opacity:0.23529412"
+         offset="0.24401553" />
+      <stop
+         id="stop9666"
+         style="stop-color:#ffffff;stop-opacity:0.15686275"
+         offset="0.8847664" />
+      <stop
+         id="stop9668"
+         style="stop-color:#ffffff;stop-opacity:0.39215687"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3600-6">
+      <stop
+         offset="0"
+         style="stop-color:#f4f4f4;stop-opacity:1"
+         id="stop3602-1" />
+      <stop
+         offset="1"
+         style="stop-color:#dbdbdb;stop-opacity:1"
+         id="stop3604-5" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0,1.0000057,-1,0,305.7906,-94.000614)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient9660"
+       id="linearGradient10008"
+       y2="297.79059"
+       x2="107.99319"
+       y1="297.79059"
+       x1="99.374321" />
+    <linearGradient
+       x1="25.132275"
+       y1="27.384912"
+       x2="25.132275"
+       y2="49.265606"
+       id="linearGradient3016"
+       xlink:href="#linearGradient3600-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45714178,0,0,0.43456667,-3.0483772,-6.1484631)" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="6.8329687"
+       x2="8"
+       y1="15"
+       x1="8"
+       id="linearGradient9860"
+       xlink:href="#linearGradient9854" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <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>
+  <path
+     id="rect9685"
+     d="M 2,7.046875 2,12.5 C 2,13.331 2.669,14 3.5,14 l 9,0 C 13.331,14 14,13.331 14,12.5 L 14,7.109375 8,1.1503067 Z"
+     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:url(#linearGradient3016);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+  <path
+     id="rect6132-8-2-8-0-0-0-4-6-9-7-9-6"
+     d="M 13.5,7.3457031 8,1.8164062 2.5,7.28125 2.5,12.5 c 0,0.554004 0.446,1 1,1 l 9,0 c 0.554,0 1,-0.445996 1,-1 z"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;stroke:url(#linearGradient10008);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
+  <path
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.25;fill:none;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+     id="rect6132-8-2-8-0-0-0-50-8-6-0-7-1-5-8-0-6-4"
+     d="M 14.500117,6.8839269 8,0.5 1.500348,6.8180788 l 0,5.6819152 c 0,1.107997 0.8853039,2.000012 1.9933039,2.000012 l 9.0162311,0 c 1.108,0 1.990234,-0.826167 1.990234,-1.934164 z" />
+  <rect
+     ry="3"
+     rx="3"
+     y="0.49999917"
+     x="0.5"
+     height="15"
+     width="15"
+     id="rect9850"
+     style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.05;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:url(#linearGradient9860);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+</svg>

=== removed file 'data/icons/drag_nub.png'
Binary files data/icons/drag_nub.png	2009-08-25 02:04:18 +0000 and data/icons/drag_nub.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/icons/icons.gresource.xml'
--- data/icons/icons.gresource.xml	2017-01-08 16:54:49 +0000
+++ data/icons/icons.gresource.xml	2017-01-15 01:53:28 +0000
@@ -2,7 +2,7 @@
 <gresources>
   <gresource prefix="/org/pantheon/photos/icons">
     <file alias="aperture-symbolic.svg" compressed="true" preprocess="xml-stripblanks">aperture-symbolic.svg</file>
-    <file alias="drag_nub.png" compressed="true">drag_nub.png</file>
+    <file alias="drag-nub.svg" compressed="true"  preprocess="xml-stripblanks">drag-nub.svg</file>
     <file alias="edit-flag.svg" compressed="true" preprocess="xml-stripblanks">edit-flag.svg</file>
     <file alias="exposure-bias-symbolic.svg" compressed="true" preprocess="xml-stripblanks">exposure-bias-symbolic.svg</file>
     <file alias="exposure-symbolic.svg" compressed="true" preprocess="xml-stripblanks">exposure-symbolic.svg</file>

=== modified file 'src/CustomComponents.vala'
--- src/CustomComponents.vala	2017-01-12 18:13:48 +0000
+++ src/CustomComponents.vala	2017-01-15 01:53:28 +0000
@@ -54,7 +54,7 @@
     private Gdk.Pixbuf? get_drag_nub_pixbuf () {
         if (drag_nub_pixbuf == null) {
             try {
-                drag_nub_pixbuf = new Gdk.Pixbuf.from_resource ("/org/pantheon/photos/icons/drag_nub.png");  
+                drag_nub_pixbuf = new Gdk.Pixbuf.from_resource ("/org/pantheon/photos/icons/drag-nub.svg");  
             } catch (Error err) {
                 error ("Can't load drag nub image: %s", err.message);
             }