Merge lp:~elementary-apps/pantheon-mail/themed-icons into lp:~elementary-apps/pantheon-mail/trunk

[Danielle Foré]

Use theme icons instead of custom icons for composer detach and clear formatting

Drops some custom icons for ones that Sam just added to the theme

[Cody Garver (codygarver)]

Please squish this into one commit using `bzr uncommit` and `bzr push --overwrite`

review: Needs Fixing

[lp:~elementary-apps/pantheon-mail/themed-icons]

1872. By Danielle Foré on 2015-11-20

use sam's new icons

[Cody Garver (codygarver)]

Please `bzr merge lp:pantheon-mail` and resolve conflicts

review: Needs Fixing

=== modified file 'COPYING.icons'
--- COPYING.icons	2014-10-28 20:20:00 +0000
+++ COPYING.icons	2015-11-20 02:35:04 +0000
@@ -1,56 +1,8 @@
 The following works are licensed under a Creative Commons Attribution 3.0 Unported License.
 For more information, see: http://creativecommons.org/licenses/by/3.0/
 
-star-symbolic.svg
-unstarred-symbolic.svg
-    Star designed by SuperAtic LABS from The Noun Project
-    http://thenounproject.com/noun/star/#icon-No15362
-    http://thenounproject.com/noun/star/#icon-No15361
-
-mail-reply-sender-symbolic.svg
-mail-reply-all-symbolic.svg (derivative)
-mail-forward-symbolic.svg (derivative)
-    Back designed by Anisha Varghese from The Noun Project
-    http://thenounproject.com/noun/back/#icon-No14792
-
-marker-symbolic.svg
-    Marker designed by factor[e] design initiative from The Noun Project
-    http://thenounproject.com/noun/marker/#icon-No18908
-
-mail-inbox-symbolic.svg
-mail-outbox-symbolic.svg (derivative)
-    Inbox designed by Edward Boatman from The Noun Project
-    http://thenounproject.com/noun/inbox/#icon-No406
-
-text-x-generic-symbolic.svg
-    Document designed by Edward Boatman from The Noun Project
-    http://thenounproject.com/noun/document/#icon-No453
-
-mail-spam-symbolic.svg
-    Pig designed by aLf from The Noun Project
-    http://thenounproject.com/noun/pig/#icon-No5271
-
-close-symbolic.svg
-    Close designed by Icomatic from The Noun Project
-    http://thenounproject.com/noun/close/#icon-No18932
-
 mail-archive-symbolic.svg
 format-text-remove-symbolic.svg
 mail-sent-symbolic.svg
     Designed for Geary by Sam Hewitt, 2013
 
-
-The following work is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
-For more information, see: http://creativecommons.org/licenses/by-sa/3.0/
-
-detach-symbolic.svg
-    Modified from view-restore-symbolic by the GNOME Project
-    https://git.gnome.org/browse/adwaita-icon-theme/plain/Adwaita/scalable/actions/view-restore-symbolic.svg
-
-
-The following work is public domain.
-
-tag-symbolic.svg
-    Tag designed by Ian Hamilton, 2012
-    http://thenounproject.com/noun/tag/#icon-No4018
-

=== modified file 'icons/CMakeLists.txt'
--- icons/CMakeLists.txt	2015-11-19 04:16:27 +0000
+++ icons/CMakeLists.txt	2015-11-20 02:35:04 +0000
@@ -2,8 +2,8 @@
 
 set(ICON_FILES
     mail-archive-symbolic.svg
-    detach-symbolic.svg
-    format-text-remove-symbolic.svg
+    window-pop-out-symbolic.svg
+    format-text-clear-formatting-symbolic.svg
 )
 
 install(FILES ${ICON_FILES} DESTINATION ${ICONS_DEST})

=== renamed file 'icons/format-text-remove-symbolic.svg' => 'icons/format-text-clear-formatting-symbolic.svg'
=== renamed file 'icons/detach-symbolic.svg' => 'icons/window-pop-out-symbolic.svg'
--- icons/detach-symbolic.svg	2014-07-19 21:17:23 +0000
+++ icons/window-pop-out-symbolic.svg	2015-11-20 02:35:04 +0000
@@ -1,20 +1,45 @@
 <?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   id="svg7384"
    version="1.1"
-   width="16.084999"
-   height="16.024"
-   id="svg7384">
-  <title
-     id="title9167">Gnome Symbolic Icon Theme</title>
-  <defs
-     id="defs17" />
+   width="16"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="window-pop-out-symbolic.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1223"
+     inkscape:window-height="676"
+     id="namedview18"
+     showgrid="false"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true"
+     showborder="false"
+     inkscape:zoom="1"
+     inkscape:cx="7.2050821"
+     inkscape:cy="6.1177714"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg7384">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4152" />
+  </sodipodi:namedview>
   <metadata
      id="metadata90">
     <rdf:RDF>
@@ -23,66 +48,69 @@
         <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>
+        <dc:title>elementary Symbolic Icon Theme</dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <g
-     transform="translate(-60.952,-646.98)"
-     id="layer12">
-    <path
-       d="M 61.906,653 A 1.0001,1.0001 0 0 0 61,654 v 8 a 1.0001,1.0001 0 0 0 1,1 h 8 a 1.0001,1.0001 0 0 0 1,-1 v -8 a 1.0001,1.0001 0 0 0 -1,-1 h -8 a 1.0001,1.0001 0 0 0 -0.09375,0 z M 63,655 h 6 v 6 h -6 v -6 z"
-       id="rect13039"
-       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe;enable-background:new" />
-    <path
-       d="M 61.906,655 A 1.0011039,1.0011039 0 1 0 62,657 h 8 a 1.0001,1.0001 0 1 0 0,-2 h -8 a 1.0001,1.0001 0 0 0 -0.09375,0 z"
-       id="path13041"
-       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe;fill-rule:evenodd;enable-background:new" />
-    <path
-       d="m 76.23537,652.9981 a 1.0001,1.0001 0 0 0 0.781,-1 v -4 a 1.0001,1.0001 0 0 0 -1,-1 h -4 a 1.0001,1.0001 0 1 0 0,2 h 3 v 3 a 1.0001,1.0001 0 0 0 1.2188,1 z"
-       id="path12113-8"
-       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe;enable-background:new" />
-    <path
-       d="m 72.14137,652.9981 a 1.0001,1.0001 0 0 0 0.59375,-0.28125 l 4,-4 a 1.0165,1.0165 0 1 0 -1.4375,-1.4375 l -4,4 a 1.0001,1.0001 0 0 0 0.843,1.72 z"
-       id="path12147-8"
-       style="text-indent:0;text-transform:none;block-progression:tb;color:#000000;fill:#bebebe;enable-background:new" />
-    <rect
-       width="1"
-       height="1"
-       x="-77.016373"
-       y="-647.99811"
-       transform="scale(-1,-1)"
-       id="rect12919-5"
-       style="color:#000000;fill:#bdbdbd;enable-background:new" />
-    <rect
-       width="1"
-       height="1"
-       x="-72.016373"
-       y="-647.99811"
-       transform="scale(-1,-1)"
-       id="rect4479-2-9-9-0-8-6"
-       style="color:#000000;fill:#bebebe" />
-    <rect
-       width="1"
-       height="1"
-       x="-77.016373"
-       y="-652.99811"
-       transform="scale(-1,-1)"
-       id="rect4479-2-9-9-0-8-6-6"
-       style="color:#000000;fill:#bebebe" />
-    <rect
-       width="1"
-       height="1"
-       x="70"
-       y="662"
-       id="rect4479-2-9-9-0-8-6-9"
-       style="color:#000000;fill:#bebebe" />
-    <rect
-       width="1"
-       height="1"
-       x="61"
-       y="662"
-       id="rect4479-2-9-9-0-8-6-4"
-       style="color:#000000;fill:#bebebe" />
+  <title
+     id="title9167">elementary Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter7554">
+      <feBlend
+         id="feBlend7556"
+         in2="BackgroundImage"
+         mode="darken" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       id="filter7554-7">
+      <feBlend
+         id="feBlend7556-6"
+         in2="BackgroundImage"
+         mode="darken" />
+    </filter>
+  </defs>
+  <g
+     id="layer9"
+     label="status"
+     style="display:inline"
+     transform="translate(-313.0004,-188)" />
+  <g
+     id="layer10"
+     style="display:inline"
+     transform="translate(-313.0004,-188)" />
+  <g
+     id="layer13"
+     style="display:inline"
+     transform="translate(-313.0004,-188)" />
+  <g
+     id="layer14"
+     transform="translate(-313.0004,-188)" />
+  <g
+     id="layer15"
+     style="display:inline"
+     transform="translate(-313.0004,-188)" />
+  <g
+     id="g71291"
+     style="display:inline"
+     transform="translate(-313.0004,-188)" />
+  <path
+     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:new"
+     d="m 9,6.9492188 -6.9316406,0.068359 c -0.5821714,0.00575 -0.8085249,0.330049 -0.9101563,0.6132813 -0.00708,0.01534 -0.00933,0.031215 -0.015625,0.046875 -0.05643,0.1813792 -0.074238,0.3398437 -0.074219,0.3398437 l 0,3.0000002 0,3 c 5e-5,0.52358 0.47642,0.99995 1,1 l 3,0 2,0 L 9,14.949219 c 0.52358,-5e-5 0.99995,-0.47642 1,-1 l 0,-3 0,-3.0000002 c 2e-5,0 -0.017788,-0.1677309 -0.080078,-0.3574219 -0.0035,-0.00831 -0.00411,-0.017175 -0.00781,-0.025391 C 9.8114124,7.2823091 9.5851615,6.9434423 9,6.9492188 Z M 2,9 9,9 9,13.974609 9,14 4.9042969,14 2.0683594,14.017578 2.0683594,14 2,14 2,9 Z"
+     id="rect6099-9"
+     inkscape:connector-curvature="0" />
+  <g
+     id="layer12"
+     style="display:inline"
+     transform="translate(-312.0004,-188)">
+    <path
+       d="m 322.0004,188.99996 2.25,2.22322 -1.71428,1.71428 c -0.0129,0.0129 -0.0147,0.0134 -0.0268,0.0268 -0.38059,0.42057 -0.37876,1.06767 0.0268,1.47321 0.40534,0.40535 1.05262,0.43359 1.47321,0.0536 l 0.21429,-0.21428 1.55357,-1.52679 2.22321,2.25 0,-6 z"
+       id="path3288-51-5"
+       style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccscccccccc" />
   </g>
 </svg>

=== modified file 'ui/composer.glade'
--- ui/composer.glade	2015-11-19 00:06:07 +0000
+++ ui/composer.glade	2015-11-20 02:35:04 +0000
@@ -91,7 +91,7 @@
     <child>
       <object class="GtkAction" id="removeformat">
         <property name="tooltip" translatable="yes">Remove formatting (Ctrl+Space)</property>
-        <property name="icon_name">format-text-remove-symbolic</property>
+        <property name="icon_name">format-text-clear-formatting-symbolic</property>
       </object>
       <accelerator key="space" modifiers="GDK_CONTROL_MASK"/>
     </child>
@@ -209,7 +209,7 @@
         <property name="label" translatable="yes">Detach</property>
         <property name="short_label" translatable="yes">Detach</property>
         <property name="tooltip" translatable="yes">Detach (Ctrl+D)</property>
-        <property name="icon_name">detach-symbolic</property>
+        <property name="icon_name">window-pop-out-symbolic</property>
       </object>
       <accelerator key="d" modifiers="GDK_CONTROL_MASK"/>
     </child>