Merge lp:~renatofilho/ubuntu-calendar-app/symbolic-icon into lp:ubuntu-calendar-app

[Renato Araujo Oliveira Filho]

Add symbolic icon to be used by messaging menu.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:832
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/839/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/881/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calendar-app-ci/839/rebuild

review: Approve (continuous-integration)

[Arthur Mello (artmello)]

lgtm

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-03-07 17:24:17 +0000
+++ CMakeLists.txt	2016-04-29 13:22:48 +0000
@@ -26,6 +26,7 @@
 set(URLS_FILE                   "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
 set(MAIN_QML                    calendar.qml)
 set(ICON_FILE                   [e-mail])
+set(SYMBOLIC_ICON_FILE		calendar-app-symbolic.svg)
 set(AUTOPILOT_DIR               calendar_app)
 set(APP_HARDCODE                calendar-app)
 set(UBUNTU_MANIFEST_PATH        "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
@@ -39,6 +40,7 @@
     set(CMAKE_INSTALL_BINDIR /)
     set(DATA_DIR /)
     set(ICON ${ICON_FILE})
+    set(SYMBOLIC_ICON ${SYMBOLIC_ICON_FILE})
     set(EXEC "qmlscene %u ${MAIN_QML}")
     set(DESKTOP_DIR ${DATA_DIR})
     set(URLS_DIR ${DATA_DIR})
@@ -47,6 +49,7 @@
     set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
     set(EXEC ${APP_HARDCODE})
     set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
+    set(SYMBOLIC_ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${SYMBOLIC_ICON_FILE})
     configure_file(${APP_HARDCODE}.in
             ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
@@ -71,7 +74,7 @@
 file(GLOB RESOURCE_FILES
      RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
      *.png *.svg)
-install(FILES ${SRC_FILES} ${RESOURCE_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
+install(FILES ${SRC_FILES} ${RESOURCE_FILES} ${ICON_FILE} ${SYMBOLIC_ICON_FILE} DESTINATION ${DATA_DIR})
 
 configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
 

=== added file 'calendar-app-symbolic.svg'
--- calendar-app-symbolic.svg	1970-01-01 00:00:00 +0000
+++ calendar-app-symbolic.svg	2016-04-29 13:22:48 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg4874" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="96" viewBox="0 0 96 96.000001" width="96" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <metadata id="metadata4879">
+  <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/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g id="layer1" transform="translate(67.857 -78.505)">
+  <rect id="rect4782" style="color:#000000;fill:none" transform="rotate(90)" height="96" width="96" y="-28.143" x="78.505"/>
+  <path id="path4179" style="color-rendering:auto;text-decoration-color:#000000;color:#000000;shape-rendering:auto;solid-color:#000000;text-decoration-line:none;fill:#808080;mix-blend-mode:normal;block-progression:tb;shape-padding:0;text-indent:0;image-rendering:auto;white-space:normal;text-decoration-style:solid;isolation:auto;text-transform:none" d="m19.977 12c-5.033 0.058-8.714-0.12-11.725 1.541-1.5055 0.831-2.6969 2.236-3.3555 3.99-0.6587 1.755-0.8965 3.839-0.8965 6.469v12h4v-12c0-2.37 0.2523-4.023 0.6426-5.062 0.3902-1.04 0.8074-1.488 1.5414-1.893 1.464-0.808 4.778-0.986 9.816-1.045h56c5.0383 0.05877 8.3519 0.23688 9.8164 1.0449 0.73364 0.40478 1.1527 0.85295 1.543 1.8926 0.391 1.039 0.641 2.692 0.641 5.062v12h4v-12c0-2.63-0.238-4.714-0.896-6.469-0.659-1.754-1.85-3.159-3.356-3.99-3.011-1.661-6.692-1.483-11.725-1.541h-0.01172-56.023zm-15.977 48v16c0 2.6304 0.23782 4.7121 0.89648 6.4668 0.65866 1.7546 1.85 3.1596 3.3555 3.9902 3.011 1.661 6.692 1.485 11.725 1.543h0.01172 56.023 0.01172c5.0328-0.0582 8.7136 0.11832 11.725-1.543 1.5055-0.83064 2.6968-2.2356 3.3555-3.9902 0.658-1.755 0.896-3.837 0.896-6.467v-16h-4v16c0 2.3696-0.25037 4.0229-0.64062 5.0625s-0.80933 1.4878-1.543 1.8926c-1.464 0.808-4.778 0.986-9.816 1.045h-55.977-0.023c-5.038-0.059-8.352-0.237-9.816-1.045-0.734-0.405-1.1512-0.853-1.5414-1.893-0.3903-1.039-0.6426-2.692-0.6426-5.062v-16z" transform="translate(-67.857 78.505)"/>
+  <path id="path4225" style="fill:#808080" d="m30.959 27.447c-1.363 0-2.631 0.169-3.805 0.51-1.173 0.341-2.233 0.758-3.179 1.25-0.947 0.492-1.76 1.022-2.442 1.59-0.681 0.53-1.192 0.983-1.533 1.361l2.611 3.748c0.265-0.227 0.645-0.548 1.137-0.965 0.492-0.454 1.097-0.871 1.816-1.25 0.72-0.416 1.533-0.775 2.442-1.078 0.908-0.303 1.912-0.455 3.01-0.455 0.908 0 1.759 0.134 2.554 0.399 0.833 0.227 1.551 0.604 2.157 1.134 0.605 0.53 1.079 1.194 1.419 1.989 0.379 0.795 0.569 1.759 0.569 2.894 0 1.06-0.209 2.064-0.625 3.01-0.379 0.946-0.909 1.875-1.59 2.783-0.643 0.871-1.401 1.76-2.271 2.668-0.833 0.871-1.722 1.76-2.668 2.668-1.136 1.136-2.29 2.308-3.463 3.52-1.174 1.211-2.234 2.498-3.18 3.861s-1.723 2.821-2.328 4.373c-0.568 1.514-0.852 3.16-0.852 4.939v0.624c0 0.227 0.019 0.454 0.057 0.681h23.846v-4.484h-18.112c0-0.644 0.247-1.401 0.739-2.272 0.53-0.87 1.172-1.778 1.929-2.724 0.757-0.947 1.552-1.856 2.385-2.727l2.272-2.271c1.135-1.136 2.27-2.29 3.406-3.463 1.135-1.211 2.158-2.422 3.066-3.633 0.909-1.249 1.628-2.499 2.158-3.748 0.568-1.287 0.852-2.612 0.852-3.975 0-3.482-1.041-6.17-3.123-8.062-2.044-1.931-5.128-2.895-9.254-2.895zm32.152 0c-1.817 0-3.463 0.303-4.939 0.908-1.476 0.568-2.745 1.344-3.805 2.329-1.022 0.984-1.817 2.138-2.385 3.462-0.567 1.287-0.851 2.65-0.851 4.088 0 4.126 1.855 7.25 5.564 9.37-0.87 0.529-1.703 1.153-2.498 1.873-0.757 0.681-1.437 1.457-2.043 2.328-0.567 0.87-1.041 1.816-1.42 2.838-0.34 0.984-0.511 2.025-0.511 3.123 0 1.135 0.208 2.347 0.625 3.634 0.416 1.249 1.117 2.403 2.101 3.463s2.289 1.949 3.916 2.668c1.666 0.682 3.729 1.022 6.19 1.022 2.119 0 3.993-0.284 5.621-0.852 1.627-0.53 2.971-1.285 4.031-2.269 1.098-1.022 1.912-2.197 2.441-3.522 0.568-1.363 0.852-2.838 0.852-4.428-0.076-4.58-2.346-7.931-6.812-10.05 0.757-0.492 1.474-1.06 2.156-1.703 0.719-0.644 1.345-1.383 1.875-2.215 0.568-0.833 1.002-1.722 1.304-2.668 0.341-0.984 0.512-2.026 0.512-3.123 0-1.136-0.227-2.309-0.681-3.52-0.417-1.211-1.118-2.309-2.102-3.293-0.946-1.022-2.175-1.854-3.69-2.498-1.514-0.643-3.331-0.965-5.451-0.965zm0 4.371c1.212 0 2.234 0.209 3.067 0.625 0.832 0.379 1.513 0.871 2.043 1.477 0.53 0.568 0.909 1.192 1.136 1.873 0.265 0.681 0.397 1.305 0.397 1.873 0 2.044-0.472 3.709-1.418 4.996-0.946 1.249-2.215 2.347-3.805 3.293-1.438-0.341-2.688-0.793-3.748-1.361-1.022-0.568-1.854-1.213-2.498-1.932-0.643-0.719-1.117-1.493-1.42-2.326s-0.453-1.667-0.453-2.5c0-0.681 0.113-1.362 0.34-2.043 0.265-0.719 0.663-1.362 1.193-1.93 0.53-0.605 1.211-1.098 2.043-1.476 0.871-0.379 1.912-0.569 3.123-0.569zm-2.215 17.489c1.515 0.34 2.858 0.756 4.032 1.248 1.211 0.454 2.233 1.021 3.066 1.703 0.871 0.681 1.534 1.476 1.988 2.385 0.455 0.908 0.68 1.968 0.68 3.179 0 0.795-0.15 1.571-0.453 2.328s-0.758 1.44-1.363 2.045c-0.606 0.568-1.401 1.04-2.385 1.418-0.946 0.379-2.063 0.569-3.35 0.569-1.438 0-2.63-0.209-3.576-0.625-0.946-0.417-1.722-0.928-2.328-1.534-0.606-0.643-1.042-1.323-1.307-2.043-0.227-0.757-0.339-1.476-0.339-2.158 0-1.93 0.452-3.595 1.361-4.996 0.946-1.4 2.271-2.573 3.974-3.519z" transform="translate(-67.857 78.505)"/>
+  <path id="path4171" style="color-rendering:auto;text-decoration-color:#000000;color:#000000;shape-rendering:auto;solid-color:#000000;text-decoration-line:none;fill:#808080;mix-blend-mode:normal;block-progression:tb;text-indent:0;image-rendering:auto;white-space:normal;text-decoration-style:solid;isolation:auto;text-transform:none" d="m-63.857 118.51v16h8v-16h-8z"/>
+  <path id="path4180" d="m16.143 118.51v16h8v-16h-8z" style="color-rendering:auto;text-decoration-color:#000000;color:#000000;shape-rendering:auto;solid-color:#000000;text-decoration-line:none;fill:#808080;mix-blend-mode:normal;block-progression:tb;text-indent:0;image-rendering:auto;white-space:normal;text-decoration-style:solid;isolation:auto;text-transform:none"/>
+ </g>
+</svg>

=== modified file 'com.ubuntu.calendar_calendar.desktop.in.in'
--- com.ubuntu.calendar_calendar.desktop.in.in	2014-10-15 17:36:51 +0000
+++ com.ubuntu.calendar_calendar.desktop.in.in	2016-04-29 13:22:48 +0000
@@ -11,3 +11,4 @@
 X-Ubuntu-Default-Department-ID=accessories
 X-Ubuntu-Splash-Show-Header=true
 X-Ubuntu-Splash-Color=#f5f5f5
+X-Ubuntu-SymbolicIcon=@SYMBOLIC_ICON@