[shotwell] Replace zoom icons With symbolic version

From: Jens Georg <jensgeorg src gnome org>
To: commits-list gnome org
Cc:
Subject: [shotwell] Replace zoom icons With symbolic version
Date: Sun, 29 Apr 2018 14:35:37 +0000 (UTC)
commit 6b772d30d430c996b20507b3259b39ee64ccb4c1
Author: Jens Georg <mail jensge org>
Date:   Thu Apr 12 20:25:01 2018 +0200

    Replace zoom icons With symbolic version

 icons/image-zoom-in-symbolic.svg  |   35 +++++++++++++++++++++++++++++++++++
 icons/image-zoom-out-symbolic.svg |   35 +++++++++++++++++++++++++++++++++++
 icons/zoom-in.png                 |  Bin 1458 -> 0 bytes
 icons/zoom-out.png                |  Bin 1245 -> 0 bytes
 org.gnome.Shotwell.gresource.xml  |    4 ++--
 src/MediaPage.vala                |    6 ++----
 src/PhotoPage.vala                |    6 ++----
 src/Resources.vala                |    2 --
 8 files changed, 76 insertions(+), 12 deletions(-)
---
diff --git a/icons/image-zoom-in-symbolic.svg b/icons/image-zoom-in-symbolic.svg
new file mode 100644
index 0000000..420c0ac
--- /dev/null
+++ b/icons/image-zoom-in-symbolic.svg
@@ -0,0 +1,35 @@
+<?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-zoom-in-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='17' id='svg7384' 
xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' 
xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' 
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' viewBox='0 0 16.999994 17' width='16.999994' 
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='true' inkscape:bbox-paths='true' bordercolor='#666666' 
borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='-17.922906' inkscape:cy='3.5402671' 
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='1163' inkscape:window-maximized='1' 
inkscape:window-width='1920' inkscape:window-x='1920' inkscape:window-y='0' inkscape:zoom='20.475676'>
+    <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='140.99992' 
originy='690.00001' 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(-100.00027,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' 
transform='translate(-100.00027,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' 
transform='translate(-100.00027,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' 
transform='translate(-100.00027,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' 
transform='translate(-100.00027,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' 
transform='translate(-100.00027,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' 
transform='translate(-100.00027,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' 
transform='translate(-100.00027,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' 
transform='translate(-100.00027,-906.00001)'>
+    <path inkscape:connector-curvature='0' d='m 100,906 0,0.94531 0,16.05469 17,0 0,-17 -17,0 z m 
1.88867,1.88867 13.22266,0 0,13.22266 -13.22266,0 0,-13.22266 z' id='rect8856-7-5-5' 
style='color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;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:1.8888886;stroke-linecap:butt;stroke-linejoin:mite
 
r;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 inkscape:connector-curvature='0' d='m 103.30949,920.60554 -0.0865,-3.97401 c 0,0 2.97715,-0.9975 
3.51819,-1.64141 0.74838,-0.89063 -1.47964,-2.30546 -1.40727,-3.60286 0.0724,-1.29741 0.91392,-2.39103 
3.16637,-2.46646 2.25245,0.0754 3.03428,1.31122 3.16636,2.67972 0.13214,1.3685 -1.91672,2.7833 
-1.40727,3.3896 1.0189,1.21261 3.51819,1.64141 3.51819,1.64141 l -0.0865,3.97401 c -3.46068,-0.0632 
-6.92092,-0.0288 -10.38164,0 z' id='path6675-6' sodipodi:nodetypes='ccsscsscccc' 
style='fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1'/>
+  </g>
+</svg>
diff --git a/icons/image-zoom-out-symbolic.svg b/icons/image-zoom-out-symbolic.svg
new file mode 100644
index 0000000..8cdc35d
--- /dev/null
+++ b/icons/image-zoom-out-symbolic.svg
@@ -0,0 +1,35 @@
+<?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-zoom-out-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='17' id='svg7384' 
xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' 
xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' 
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' viewBox='0 0 16.999994 17' width='16.999994' 
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='true' inkscape:bbox-paths='true' bordercolor='#666666' 
borderopacity='1' inkscape:current-layer='layer12' inkscape:cx='2.0771624' inkscape:cy='3.5402671' 
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='1163' inkscape:window-maximized='1' 
inkscape:window-width='1920' inkscape:window-x='1920' inkscape:window-y='0' inkscape:zoom='20.475676'>
+    <inkscape:grid dotted='false' empspacing='2' enabled='true' id='grid4866' originx='160.99999' 
originy='690.00001' 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(-80.000204,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline' 
transform='translate(-80.000204,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='layer11' inkscape:label='apps' 
transform='translate(-80.000204,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='layer13' inkscape:label='places' style='display:inline' 
transform='translate(-80.000204,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' 
transform='translate(-80.000204,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' 
transform='translate(-80.000204,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' 
transform='translate(-80.000204,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline' 
transform='translate(-80.000204,-906.00001)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' 
transform='translate(-80.000204,-906.00001)'>
+    <path inkscape:connector-curvature='0' d='m 80,906 0,0.94531 0,16.05469 17,0 0,-17 -17,0 z m 
1.888672,1.88867 13.222656,0 0,13.22266 -13.222656,0 0,-13.22266 z' id='rect8856-7-5' 
style='color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;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:1.8888886;stroke-linecap:butt;stroke-linejoin:mite
 
r;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 inkscape:connector-curvature='0' d='m 85.565782,920.60554 -0.0489,-2.24656 c 0,0 1.683015,-0.5639 
1.98888,-0.92791 0.423066,-0.50349 -0.836461,-1.30331 -0.795552,-2.03675 0.04091,-0.73344 0.516652,-1.35168 
1.789992,-1.39432 1.27334,0.0426 1.715317,0.74125 1.789992,1.51488 0.07467,0.77363 -1.083552,1.57344 
-0.795552,1.91619 0.575999,0.6855 1.98888,0.92791 1.98888,0.92791 l -0.0489,2.24656 c -1.95637,-0.0357 
-3.91249,-0.0163 -5.86888,0 z' id='path6675' sodipodi:nodetypes='ccsscsscccc' 
style='fill:#bebebe;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;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 c9d3d0a..c4fb86c 100644
--- a/org.gnome.Shotwell.gresource.xml
+++ b/org.gnome.Shotwell.gresource.xml
@@ -51,6 +51,8 @@
       <file>icons/four-stars.svg</file>
       <file>icons/generic-plugin.png</file>
       <file>icons/image-adjust.svg</file>
+      <file>icons/image-zoom-in-symbolic.svg</file>
+      <file>icons/image-zoom-out-symbolic.svg</file>
       <file>icons/import-all.png</file>
       <file>icons/import.svg</file>
       <file>icons/make-primary.svg</file>
@@ -78,8 +80,6 @@
       <file>icons/three-stars.svg</file>
       <file>icons/two-stars.svg</file>
       <file>icons/videos-page.png</file>
-      <file>icons/zoom-in.png</file>
-      <file>icons/zoom-out.png</file>
       <file>misc/org.gnome.Shotwell.css</file>
   </gresource>
 </gresources>
diff --git a/src/MediaPage.vala b/src/MediaPage.vala
index eeb79e6..7241c9a 100644
--- a/src/MediaPage.vala
+++ b/src/MediaPage.vala
@@ -135,8 +135,7 @@ public abstract class MediaPage : CheckerboardPage {
         public ZoomSliderAssembly() {
             Gtk.Box zoom_group = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
 
-            Gtk.Image zoom_out = new Gtk.Image.from_pixbuf(Resources.load_icon(
-                Resources.ICON_ZOOM_OUT, Resources.ICON_ZOOM_SCALE));
+            Gtk.Image zoom_out = new Gtk.Image.from_icon_name("image-zoom-out-symbolic", 
Gtk.IconSize.SMALL_TOOLBAR);
             Gtk.EventBox zoom_out_box = new Gtk.EventBox();
             zoom_out_box.set_above_child(true);
             zoom_out_box.set_visible_window(false);
@@ -159,8 +158,7 @@ public abstract class MediaPage : CheckerboardPage {
 
             zoom_group.pack_start(slider, false, false, 0);
 
-            Gtk.Image zoom_in = new Gtk.Image.from_pixbuf(Resources.load_icon(
-                Resources.ICON_ZOOM_IN, Resources.ICON_ZOOM_SCALE));
+            Gtk.Image zoom_in = new Gtk.Image.from_icon_name("image-zoom-in-symbolic", 
Gtk.IconSize.SMALL_TOOLBAR);
             Gtk.EventBox zoom_in_box = new Gtk.EventBox();
             zoom_in_box.set_above_child(true);
             zoom_in_box.set_visible_window(false);
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index e82efde..e15cd7e 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -496,8 +496,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
         
         Gtk.Box zoom_group = new Gtk.Box(Gtk.Orientation.HORIZONTAL, 0);
         
-        Gtk.Image zoom_out = new Gtk.Image.from_pixbuf(Resources.load_icon(Resources.ICON_ZOOM_OUT,
-            Resources.ICON_ZOOM_SCALE));
+        Gtk.Image zoom_out = new Gtk.Image.from_icon_name("image-zoom-out-symbolic", 
Gtk.IconSize.SMALL_TOOLBAR);
         Gtk.EventBox zoom_out_box = new Gtk.EventBox();
         zoom_out_box.set_above_child(true);
         zoom_out_box.set_visible_window(false);
@@ -518,8 +517,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
 
         zoom_group.pack_start(zoom_slider, false, false, 0);
         
-        Gtk.Image zoom_in = new Gtk.Image.from_pixbuf(Resources.load_icon(Resources.ICON_ZOOM_IN,
-            Resources.ICON_ZOOM_SCALE));
+        Gtk.Image zoom_in = new Gtk.Image.from_icon_name("image-zoom-in-symbolic", 
Gtk.IconSize.SMALL_TOOLBAR);
         Gtk.EventBox zoom_in_box = new Gtk.EventBox();
         zoom_in_box.set_above_child(true);
         zoom_in_box.set_visible_window(false);
diff --git a/src/Resources.vala b/src/Resources.vala
index 06af400..50c101b 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -100,8 +100,6 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const int ICON_FILTER_REJECTED_OR_BETTER_FIXED_SIZE = 32;
     public const string ICON_FILTER_UNRATED_OR_BETTER = "shotwell-16.png";
     public const int ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE = 16;
-    public const string ICON_ZOOM_IN = "zoom-in.png";
-    public const string ICON_ZOOM_OUT = "zoom-out.png";
     public const int ICON_ZOOM_SCALE = 16;
 
     public const string ICON_CAMERAS = "camera-photo";
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]