Merge lp:~nik90/component-store/add-haptic-shadow-radial into lp:component-store

[Nekhelesh Ramananthan]

Added haptic feedback to radial action buttons. Also added a drop shadow to the radial bottom edge hint.

=== modified file 'ComponentStore/RadialBottomEdge/RadialAction.qml'
--- ComponentStore/RadialBottomEdge/RadialAction.qml	2014-11-15 13:52:44 +0000
+++ ComponentStore/RadialBottomEdge/RadialAction.qml	2015-03-23 14:34:47 +0000
@@ -5,4 +5,5 @@
     property string iconName: "add"
     property color iconColor: "Black"
     property color backgroundColor: "White"
+    property bool enabled: true
 }

=== modified file 'ComponentStore/RadialBottomEdge/RadialBottomEdge.qml'
--- ComponentStore/RadialBottomEdge/RadialBottomEdge.qml	2015-03-11 02:23:25 +0000
+++ ComponentStore/RadialBottomEdge/RadialBottomEdge.qml	2015-03-23 14:34:47 +0000
@@ -1,4 +1,5 @@
-import QtQuick 2.0
+import QtQuick 2.2
+import QtFeedback 5.0
 import Ubuntu.Components 1.1
 
 Item {
@@ -21,6 +22,16 @@
 
     anchors.fill: parent
 
+    HapticsEffect {
+        id: clickEffect
+        attackIntensity: 0.0
+        attackTime: 50
+        intensity: 1.0
+        duration: 10
+        fadeTime: 50
+        fadeIntensity: 0.0
+    }
+
     Rectangle {
         id: bgVisual
         
@@ -42,6 +53,20 @@
         anchors.horizontalCenter: parent.horizontalCenter
         y: collapsedPosition
         z: parent.z + 1
+
+        Rectangle {
+            id: dropShadow
+            width: parent.width
+            height: parent.height
+            border.color: "#B3B3B3"
+            color: "Transparent"
+            radius: parent.radius
+            z: -1
+            anchors {
+                centerIn: parent
+                verticalCenterOffset: units.gu(-0.3)
+            }
+        }
         
         Icon {
             id: hintIcon
@@ -75,6 +100,7 @@
                 radius: width/2
                 anchors.centerIn: parent
                 color: modelData.backgroundColor
+                opacity: modelData.enabled ? 1.0 : 0.7
                 transform: Translate {
                     x: distance * Math.sin(radAngle)
                     y: -distance * Math.cos(radAngle)
@@ -89,8 +115,10 @@
                 }
 
                 MouseArea {
+                    enabled: modelData.enabled
                     anchors.fill: parent
                     onClicked: {
+                        clickEffect.start()
                         bottomEdgeHint.state = "collapsed"
                         modelData.triggered(null)
                     }

=== modified file 'GallerySRC/RadialBottomEdgeWidget.qml'
--- GallerySRC/RadialBottomEdgeWidget.qml	2014-11-15 14:50:47 +0000
+++ GallerySRC/RadialBottomEdgeWidget.qml	2015-03-23 14:34:47 +0000
@@ -22,12 +22,14 @@
             RadialAction {
                 iconName: "settings"
                 iconColor: UbuntuColors.coolGrey
+                enabled: false
             },
 
             RadialAction {
                 iconName: "save"
                 iconColor: "white"
                 backgroundColor: UbuntuColors.green
+                enabled: false
                 onTriggered: console.log("save")
             },
 

=== modified file 'docs/_components/radialbottomedge.rst'
--- docs/_components/radialbottomedge.rst	2015-03-20 01:33:25 +0000
+++ docs/_components/radialbottomedge.rst	2015-03-23 14:34:47 +0000
@@ -35,6 +35,7 @@
             RadialAction {
                 iconName: "save"
                 iconColor: "white"
+                enabled: false
                 backgroundColor: UbuntuColors.green
                 onTriggered: console.log("save")
             },
@@ -42,6 +43,7 @@
             RadialAction {
                 iconName: "delete"
                 iconColor: "white"
+                enabled: false
                 backgroundColor: UbuntuColors.red
                 onTriggered: console.log("delete")
             },
@@ -133,11 +135,12 @@
 
 This property is used to define a list of actions to be shown in the radial menu. The list takes
 a **RadialAction** which inherits **Action**. A RadialAction adds 3 properties on top of what Action
-provides which are iconName, iconColor and backgroundColor. ::
+provides which are iconName, iconColor, enabled and backgroundColor. ::
 
     RadialAction {
         iconName: "add"
         iconColor: "white"
+        enabled: false
         backgroundColor: "green"
     }
     

=== modified file 'docs/release.rst'
--- docs/release.rst	2015-03-20 12:17:50 +0000
+++ docs/release.rst	2015-03-23 14:34:47 +0000
@@ -1,6 +1,11 @@
 Release Notes
 =============
 
+**23rd March 2015**
+
+* Added haptic feedback to radial action buttons
+* Added drop shadow to radial bottom edge hint
+
 **13th March 2015**
 
 * Improved ListItemWithActions components by adding the following new properties,