Merge lp:~boiko/messaging-app/new_send_icon into lp:messaging-app

[Gustavo Pichorim Boiko]

Update the send icon per design request.

Update the send icon per design request.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:401
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/604/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3410
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/117
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2845
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3407
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3407/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21784

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/604/rebuild

review: Needs Fixing (continuous-integration)

[lp:~boiko/messaging-app/new_send_icon]

402. By Gustavo Pichorim Boiko on 2015-07-10

Fix autopilot test.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:402
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/605/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3413
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/118
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2847
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3410
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3410/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21790

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/605/rebuild

review: Needs Fixing (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good.

review: Approve

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2015-07-07 19:08:55 +0000
+++ src/qml/Messages.qml	2015-07-10 18:18:22 +0000
@@ -977,19 +977,16 @@
             }
         }
 
-        Button {
+        Icon {
             id: sendButton
             objectName: "sendButton"
-            anchors.bottomMargin: units.gu(1)
-            anchors.bottom: parent.bottom
+            anchors.verticalCenter: textEntry.verticalCenter
             anchors.right: parent.right
             anchors.rightMargin: units.gu(2)
-            text: i18n.tr("Send")
-            color: enabled ? "#38b44a" : "#b2b2b2"
-            width: units.gu(7)
-            height: units.gu(4)
-            font.pixelSize: FontUtils.sizeToPixels("small")
-            activeFocusOnPress: false
+            color: "gray"
+            source: Qt.resolvedUrl("./assets/send.svg")
+            width: units.gu(3)
+            height: units.gu(3)
             enabled: {
                if (participants.length > 0 || multiRecipient.recipientCount > 0 || multiRecipient.searchString !== "") {
                     if (textEntry.text != "" || textEntry.inputMethodComposing || attachments.count > 0) {
@@ -998,40 +995,44 @@
                 }
                 return false
             }
-            onClicked: {
-                // make sure we flush everything we have prepared in the OSK preedit
-                Qt.inputMethod.commit();
-                if (textEntry.text == "" && attachments.count == 0) {
-                    return
-                }
-                // refresh the recipient list
-                multiRecipient.focus = false
-                // dont change the participants list
-                if (participants.length == 0) {
-                    participants = multiRecipient.recipients
-                }
-
-                var newAttachments = []
-                for (var i = 0; i < attachments.count; i++) {
-                    var attachment = []
-                    var item = attachments.get(i)
-                    // we dont include smil files. they will be auto generated
-                    if (item.contentType.toLowerCase() === "application/smil") {
-                        continue
-                    }
-                    attachment.push(item.name)
-                    attachment.push(item.contentType)
-                    attachment.push(item.filePath)
-                    newAttachments.push(attachment)
-                }
-
-                // if sendMessage succeeds it means the message was either sent or
-                // injected into the history service so the user can retry later
-                if (sendMessage(textEntry.text, participants, newAttachments)) {
-                    textEntry.text = ""
-                    attachments.clear()
-                }
-                updateFilters()
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    // make sure we flush everything we have prepared in the OSK preedit
+                    Qt.inputMethod.commit();
+                    if (textEntry.text == "" && attachments.count == 0) {
+                        return
+                    }
+                    // refresh the recipient list
+                    multiRecipient.focus = false
+                    // dont change the participants list
+                    if (participants.length == 0) {
+                        participants = multiRecipient.recipients
+                    }
+
+                    var newAttachments = []
+                    for (var i = 0; i < attachments.count; i++) {
+                        var attachment = []
+                        var item = attachments.get(i)
+                        // we dont include smil files. they will be auto generated
+                        if (item.contentType.toLowerCase() === "application/smil") {
+                            continue
+                        }
+                        attachment.push(item.name)
+                        attachment.push(item.contentType)
+                        attachment.push(item.filePath)
+                        newAttachments.push(attachment)
+                    }
+
+                    // if sendMessage succeeds it means the message was either sent or
+                    // injected into the history service so the user can retry later
+                    if (sendMessage(textEntry.text, participants, newAttachments)) {
+                        textEntry.text = ""
+                        attachments.clear()
+                    }
+                    updateFilters()
+                }
             }
         }
     }

=== added file 'src/qml/assets/send.svg'
--- src/qml/assets/send.svg	1970-01-01 00:00:00 +0000
+++ src/qml/assets/send.svg	2015-07-10 18:18:22 +0000
@@ -0,0 +1,141 @@
+<?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"
+   sodipodi:docname="send03.svg"
+   viewBox="0 0 90 90.000001"
+   inkscape:version="0.91pre2 r"
+   version="1.1"
+   id="svg4874"
+   height="90"
+   width="90">
+  <defs
+     id="defs4876" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.7646075"
+     inkscape:cx="36.169945"
+     inkscape:cy="29.343689"
+     inkscape:document-units="px"
+     inkscape:current-layer="g4228"
+     showgrid="false"
+     showborder="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="true"
+     inkscape:bbox-nodes="true"
+     inkscape:snap-bbox-edge-midpoints="true"
+     inkscape:snap-bbox-midpoints="true"
+     inkscape:object-paths="true"
+     inkscape:snap-intersection-paths="true"
+     inkscape:object-nodes="true"
+     inkscape:snap-smooth-nodes="true"
+     inkscape:snap-midpoints="true"
+     inkscape:snap-object-midpoints="true"
+     inkscape:snap-center="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-global="false">
+    <inkscape:grid
+       type="xygrid"
+       id="grid5451"
+       empspacing="6" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="6,77"
+       id="guide4063" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="3,78"
+       id="guide4065" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="55,84"
+       id="guide4067" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="53,87"
+       id="guide4069" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,3"
+       id="guide4071" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="20,6"
+       id="guide4073" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="87,7"
+       id="guide4075" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="84,7"
+       id="guide4077" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="58,81"
+       id="guide4074" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="9,74"
+       id="guide4076" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="21,9"
+       id="guide4078" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="81,4"
+       id="guide4080" />
+  </sodipodi:namedview>
+  <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(67.857146,-84.50504)">
+    <g
+       id="g4228">
+      <path
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
+         d="m 22.141874,98.953286 c -46.314226,10.949064 -89.986326,29.484374 -89.986326,29.484374 l 21.896484,9.80468 5.980469,21.61329 0.07031,-27.22071 57.591797,-30.53125 -48.572266,37.7461 -8.943359,20.18554 13.365235,-13.0625 22.53125,10.08985 c 0,0 16.771102,-28.17523 26.066406,-58.109374 z"
+         id="path4152"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccccccc" />
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:4;marker:none;enable-background:accumulate"
+         id="rect2986-6"
+         width="90"
+         height="90"
+         x="-67.857147"
+         y="84.505051" />
+    </g>
+  </g>
+</svg>

=== modified file 'tests/autopilot/messaging_app/emulators.py'
--- tests/autopilot/messaging_app/emulators.py	2015-06-01 20:15:03 +0000
+++ tests/autopilot/messaging_app/emulators.py	2015-07-10 18:18:22 +0000
@@ -125,7 +125,7 @@
     def get_send_button(self):
         """Return Button with text Send"""
 
-        return self.get_messages_page().select_single('Button',
+        return self.get_messages_page().select_single('Icon11',
                                                       objectName='sendButton')
 
     def get_toolbar_back_button(self):