Merge lp:~elementary-design/pantheon-photos/update-sidebar-icons into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

Changes sidebar icons to system icons

This branch updates a few of the sidebar icons from using custom Yorba ones to using system ones:

* Folder-pictures for Library
* folder-tag for Tags
* office-calendar for events

[Tristan Petersen (tristang4)]

This is my first review, so please forgive me if I missed something.

I do not seem to be able to see the new tag icons on my machine.

I have taken screenshots of the new icons.

review: Needs Fixing

[lp:~elementary-design/pantheon-photos/update-sidebar-icons]

2506. By Danielle Foré on 2014-01-31

add folder-tag icon

[Danielle Foré (danrabbit)]

Hey Tristan, I added the folder tag icon. does it appear correctly now?

[lp:~elementary-design/pantheon-photos/update-sidebar-icons]

2507. By Danielle Foré on 2014-01-31

merge trunk

[Tristan Petersen (tristang4)]

Yes I see it now. Looks good!

On Fri, Jan 31, 2014 at 3:09 PM, Daniel Fore <email address hidden>
wrote:
> Hey Tristan, I added the folder tag icon. does it appear correctly
> now?
> --
> https://code.launchpad.net/~elementary-design/pantheon-photos/update-sidebar-icons/+merge/203179
> You are reviewing the proposed merge of
> lp:~elementary-design/pantheon-photos/update-sidebar-icons into
> lp:pantheon-photos.
>

[Tristan Petersen (tristang4)]

review: Approve

[Jim Nelson (yorba-jim)]

One problem with this branch: the Makefile needs to be updated. The removed and added icon files needs to be reflected in the ICON_FILES list. Without this change, the Makefile won't produce a complete tarball.

review: Needs Fixing

=== added file 'icons/folder-tag.svg'
--- icons/folder-tag.svg	1970-01-01 00:00:00 +0000
+++ icons/folder-tag.svg	2014-01-31 22:20:52 +0000
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="16"
+   height="16"
+   id="svg3279"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="folder-tag.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="640"
+     inkscape:window-height="480"
+     id="namedview40"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-0.98305085"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="28"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg3279" />
+  <defs
+     id="defs3281">
+    <linearGradient
+       id="linearGradient3251">
+      <stop
+         id="stop3253"
+         style="stop-color:#917f6e;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3255"
+         style="stop-color:#cbbaa9;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4222">
+      <stop
+         id="stop4224"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4226"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3243">
+      <stop
+         id="stop3245"
+         style="stop-color:#fff4e9;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3247"
+         style="stop-color:#e7d6c5;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3251"
+       id="linearGradient3026"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6666711,0,0,0.6666711,-0.66667106,0.66620135)"
+       x1="17.591623"
+       y1="7"
+       x2="17.591623"
+       y2="-0.02451775" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4222"
+       id="linearGradient3029"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82996661,0,0,0.83014725,-23.704279,-2.8028554)"
+       x1="40.006763"
+       y1="12.910877"
+       x2="40.006763"
+       y2="7.0924568" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4222"
+       id="linearGradient3032"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.63241105,0,0,0.63366331,-16.06917,-0.5594047)"
+       x1="38.382198"
+       y1="5.90625"
+       x2="38.382198"
+       y2="22.697742" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3243"
+       id="linearGradient3035"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6666711,0,0,0.6666711,-17.166785,-1.1667711)"
+       x1="39.905758"
+       y1="6.1230369"
+       x2="39.905758"
+       y2="24.0341" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3251"
+       id="linearGradient3037"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.6666711,0,0,0.6666711,-17.166785,-1.1667711)"
+       x1="32.015705"
+       y1="24.011269"
+       x2="32.015705"
+       y2="5" />
+  </defs>
+  <metadata
+     id="metadata3284">
+    <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
+     style="fill:url(#linearGradient3035);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3037);stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="path2463"
+     inkscape:connector-curvature="0"
+     d="M 6.8333755,2.4999192 0.50000006,9.0624632 6.0000368,14.5 12.500078,8.1666242 l 0,-5.666705 -5.6667025,0 z m 2.6666849,2.000014 c 0.5520026,0 1.0000066,0.448002 1.0000066,1.000006 0,0.552004 -0.448004,1.000007 -1.0000066,1.000007 -0.5520042,0 -1.0000072,-0.448003 -1.0000072,-1.000007 0,-0.552004 0.448003,-1.000006 1.0000072,-1.000006 z" />
+  <path
+     style="opacity:0.6;fill:none;stroke:url(#linearGradient3032);stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="path3265"
+     inkscape:connector-curvature="0"
+     d="m 7.3435443,3.5000004 c 0,0 -5.4055851,5.4975779 -5.4055851,5.4975779 0,0 4.1443391,4.3564347 4.1443391,4.3564347 0,0 5.3593077,-5.5623316 5.3593077,-5.5623316 0,0 0.05839,-4.291681 0.05839,-4.291681 0,0 -4.1564557,0 -4.1564557,0 z" />
+  <path
+     style="opacity:0.6;fill:none;stroke:url(#linearGradient3029);stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="path3294"
+     inkscape:connector-curvature="0"
+     d="M 9.4943871,3.5010736 C 10.750366,3.4567938 11.785978,4.7909532 11.428498,5.9971782 11.163042,7.1808175 9.7058904,7.86295 8.6294138,7.298845 7.5214098,6.8093158 7.1351849,5.250799 7.8946109,4.3042992 8.263526,3.8049752 8.8728487,3.4962646 9.4943871,3.5010736 z" />
+  <path
+     style="fill:none;stroke:url(#linearGradient3026);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     id="path3298"
+     inkscape:connector-curvature="0"
+     d="m 10.333402,4.9995634 c 0.73935,-0.391482 1.702694,-0.511416 2.617932,-0.53183 0.411434,-0.0092 0.8273,0.0746 1.231029,-0.02143 0.513831,-0.122222 0.863993,-0.498679 0.812771,-0.842839 -0.06877,-0.461979 -0.68935,-0.803021 -1.271382,-1.047072 -0.516276,-0.216476 -0.913636,-0.6022352 -1.123633,-1.0097466 -0.106098,-0.20589 0.07919,-0.4220767 0.376399,-0.4884432 0.269998,-0.060291 0.552791,-0.084123 0.827535,-0.022904 0.418164,0.093175 0.911794,0.2068481 1.106321,0.5031098" />
+</svg>

=== removed file 'icons/multiple-events.png'
Binary files icons/multiple-events.png	2010-08-19 19:15:30 +0000 and icons/multiple-events.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'icons/multiple-tags.png'
Binary files icons/multiple-tags.png	2010-08-12 22:10:12 +0000 and icons/multiple-tags.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'icons/no-event.png'
Binary files icons/no-event.png	2013-08-06 00:53:49 +0000 and icons/no-event.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'icons/one-event.png'
Binary files icons/one-event.png	2010-08-19 19:15:30 +0000 and icons/one-event.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'icons/one-tag.png'
Binary files icons/one-tag.png	2010-08-12 22:10:12 +0000 and icons/one-tag.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'icons/shotwell-street.jpg'
Binary files icons/shotwell-street.jpg	2010-05-14 22:42:13 +0000 and icons/shotwell-street.jpg	1970-01-01 00:00:00 +0000 differ
=== removed file 'icons/slideshow-extension-point.png'
Binary files icons/slideshow-extension-point.png	2011-03-12 00:35:23 +0000 and icons/slideshow-extension-point.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'src/Resources.vala'
--- src/Resources.vala	2014-01-14 01:40:26 +0000
+++ src/Resources.vala	2014-01-31 22:20:52 +0000
@@ -91,9 +91,9 @@
     
     public const string APP_ICONS[] = { ICON_APP, ICON_APP16, ICON_APP24 };
     
-    public const string ICON_ABOUT_LOGO = "shotwell-street.jpg";
+    public const string ICON_ABOUT_LOGO = "shotwell.svg";
     public const string ICON_GENERIC_PLUGIN = "generic-plugin.png";
-    public const string ICON_SLIDESHOW_EXTENSION_POINT = "slideshow-extension-point";
+    public const string ICON_SLIDESHOW_EXTENSION_POINT = "media-playback-start";
     public const string ICON_RATING_REJECTED = "rejected.svg";
     public const string ICON_RATING_ONE = "one-star.svg";
     public const string ICON_RATING_TWO = "two-stars.svg";
@@ -114,18 +114,18 @@
     public const int ICON_ZOOM_SCALE = 16;
 
     public const string ICON_CAMERAS = "camera-photo";
-    public const string ICON_EVENTS = "multiple-events";
-    public const string ICON_ONE_EVENT = "one-event";
-    public const string ICON_NO_EVENT = "no-event";
-    public const string ICON_ONE_TAG = "one-tag";
-    public const string ICON_TAGS = "multiple-tags";
+    public const string ICON_EVENTS = "office-calendar";
+    public const string ICON_ONE_EVENT = "office-calendar";
+    public const string ICON_NO_EVENT = "office-calendar";
+    public const string ICON_ONE_TAG = "folder-tag";
+    public const string ICON_TAGS = "folder-tag";
     public const string ICON_FOLDER_CLOSED = "folder";
     public const string ICON_FOLDER_OPEN = "folder-open";
     public const string ICON_FOLDER_DOCUMENTS = "folder-documents";
     public const string ICON_IMPORTING = "go-down";
     public const string ICON_LAST_IMPORT = "document-open-recent";
     public const string ICON_MISSING_FILES = "process-stop";
-    public const string ICON_PHOTOS = "shotwell-16";
+    public const string ICON_PHOTOS = "folder-pictures";
     public const string ICON_SINGLE_PHOTO = "image-x-generic";
     public const string ICON_FILTER_PHOTOS = "filter-photos";
     public const string ICON_FILTER_PHOTOS_DISABLED = "filter-photos-disabled";
@@ -1141,5 +1141,4 @@
     
     public const string ONIMAGE_FONT_COLOR = "#000000";
     public const string ONIMAGE_FONT_BACKGROUND = "rgba(255,255,255,0.5)";
-}
-
+}
\ No newline at end of file