Merge lp:~kalikiana/ubuntu-ui-toolkit/feedback into lp:ubuntu-ui-toolkit

[Cris Dywan]

Add haptic feedback to AbstractButton

This feature depends on the availability of a feedback plugin - see bug 1214404 for that.
Be sure to install qtdeclarative5-qtfeedback-plugin when testing.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:734
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/593/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2875
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/450
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/450/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2881
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/2881/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/2443

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/593/rebuild

review: Approve (continuous-integration)

[Loïc Molinari (loic.molinari)]

Good!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-autolanding/342/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/264
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/2332
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-autolanding/268
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-autolanding/268
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-autolanding/268/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-vm-saucy/207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4412
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/4412/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2334
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/2334/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/2019/console

review: Needs Fixing (continuous-integration)

[Francis Ginther (fginther)]

A necessary job change caused the mako failure, re-approving.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2013-08-28 20:35:28 +0000
+++ debian/control	2013-09-02 13:45:12 +0000
@@ -20,6 +20,7 @@
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
                qtdeclarative5-window-plugin,
+               qtdeclarative5-qtfeedback-plugin,
                qtdeclarative5-unity-action-plugin,
                devscripts,
                libqt5organizer5,
@@ -39,6 +40,7 @@
          libqt5svg5,
          qtdeclarative5-qtquick2-plugin,
          qtdeclarative5-window-plugin,
+         qtdeclarative5-qtfeedback-plugin,
          qtdeclarative5-unity-action-plugin,
          ttf-ubuntu-font-family,
          ubuntu-ui-toolkit-theme,

=== modified file 'modules/Ubuntu/Components/AbstractButton.qml'
--- modules/Ubuntu/Components/AbstractButton.qml	2013-08-07 12:09:15 +0000
+++ modules/Ubuntu/Components/AbstractButton.qml	2013-09-02 13:45:12 +0000
@@ -15,6 +15,7 @@
  */
 
 import QtQuick 2.0
+import QtFeedback 5.0
 
 /*!
     \qmlabstract AbstractButton
@@ -26,6 +27,7 @@
 
     This class defines the behavior of the button: it defines the MouseArea
     and the states.
+    All components deriving from this class support haptic feedback out of the box.
 */
 ActionItem {
     id: button
@@ -80,6 +82,16 @@
      */
     property alias __mouseArea: mouseArea
 
+    HapticsEffect {
+        id: pressEffect
+        attackIntensity: 0.0
+        attackTime: 250
+        intensity: 1.0
+        duration: 100
+        fadeTime: 250
+        fadeIntensity: 0.0
+    }
+
     MouseArea {
         id: mouseArea
         anchors.fill: parent
@@ -89,6 +101,7 @@
 
         onClicked: {
             if (button.__acceptEvents) {
+                pressEffect.start()
                 button.clicked()
             }
         }