Merge lp:~renatofilho/messaging-app/fix-1368337 into lp:messaging-app

[Renato Araujo Oliveira Filho]

Changed swipe list item to not activate on mouse release.
Changed actions order on Message delegate.

Depends on: https://code.launchpad.net/~renatofilho/address-book-app/fix-1368337/+merge/234884

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:241
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/464/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4878
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3570
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/258
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4631
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6130
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6130/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13289
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/2959
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3879
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/3879/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Bill Filler (bfiller)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/<package-name>) on device or emulator?
yes

Did CI run pass? If not, please explain why.
yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
yes

review: Approve

=== modified file 'src/qml/MessageDelegateFactory.qml'
--- src/qml/MessageDelegateFactory.qml	2014-08-28 21:54:12 +0000
+++ src/qml/MessageDelegateFactory.qml	2014-09-16 20:22:31 +0000
@@ -36,7 +36,6 @@
     signal copyMessage()
     signal showMessageDetails()
 
-    triggerActionOnMouseRelease: true
     width: messageList.width
     leftSideAction: Action {
         iconName: "delete"

=== modified file 'src/qml/MessagesListView.qml'
--- src/qml/MessagesListView.qml	2014-09-09 23:11:20 +0000
+++ src/qml/MessagesListView.qml	2014-09-16 20:22:31 +0000
@@ -60,20 +60,6 @@
     currentIndex: 0
     _availableActions: [
         Action {
-            id: reloadAction
-
-            iconName: "reload"
-            text: i18n.tr("Retry")
-            onTriggered: value.resendMessage()
-        },
-        Action {
-            id: copyAction
-
-            iconName: "edit-copy"
-            text: i18n.tr("Copy")
-            onTriggered: value.copyMessage()
-        },
-        Action {
             id: infoAction
 
             iconName: "info"
@@ -89,6 +75,20 @@
                                    "participants": messages.participants}
                 messageInfoDialog.showMessageInfo(messageInfo)
             }
+        },
+        Action {
+            id: reloadAction
+
+            iconName: "reload"
+            text: i18n.tr("Retry")
+            onTriggered: value.resendMessage()
+        },
+        Action {
+            id: copyAction
+
+            iconName: "edit-copy"
+            text: i18n.tr("Copy")
+            onTriggered: value.copyMessage()
         }
     ]