Merge lp:~nik90/component-store/fix-debian-packaging into lp:~sil/component-store/community-components

[Nekhelesh Ramananthan]

Fixed debian packaging.

Fixed debian packaging. I tested the deb install and works as expected.

[lp:~nik90/component-store/fix-debian-packaging]

66. By Nekhelesh Ramananthan on 2015-04-13

merged lp:component-store

[Stuart Langridge (sil)]

review: Approve

=== added file 'curated-store/ComponentStore/CircleImage/ubuntu_component_store.json'
--- curated-store/ComponentStore/CircleImage/ubuntu_component_store.json	1970-01-01 00:00:00 +0000
+++ curated-store/ComponentStore/CircleImage/ubuntu_component_store.json	2015-04-13 17:45:57 +0000
@@ -0,0 +1,6 @@
+{
+    "name": "CircleImage",
+    "description": "This widget converts any image into a circular sized image which can be useful for showing user profile pictures.",
+    "version": "1.0",
+    "documentation_url": "http://ubuntu-component-store.readthedocs.org/en/latest/_components/circleimage.html"
+}

=== added file 'curated-store/ComponentStore/EmptyState/ubuntu_component_store.json'
--- curated-store/ComponentStore/EmptyState/ubuntu_component_store.json	1970-01-01 00:00:00 +0000
+++ curated-store/ComponentStore/EmptyState/ubuntu_component_store.json	2015-04-13 17:45:57 +0000
@@ -0,0 +1,6 @@
+{
+    "name": "EmptyState",
+    "description": "This widget provides a standardized way to show an empty state (approved by Canonical designers) to improve the user experience and avoid showing a blank page.",
+    "version": "1.0",
+    "documentation_url": "http://ubuntu-component-store.readthedocs.org/en/latest/_components/emptystate.html"
+}

=== added file 'curated-store/ComponentStore/FastScroll/ubuntu_component_store.json'
--- curated-store/ComponentStore/FastScroll/ubuntu_component_store.json	1970-01-01 00:00:00 +0000
+++ curated-store/ComponentStore/FastScroll/ubuntu_component_store.json	2015-04-13 17:45:57 +0000
@@ -0,0 +1,6 @@
+{
+    "name": "FastScroll",
+    "description": "This widget provides a quick way to navigate long list views by providing a fast scroll.",
+    "version": "1.0",
+    "documentation_url": "http://ubuntu-component-store.readthedocs.org/en/latest/_components/fastscroll.html"
+}

=== modified file 'curated-store/ComponentStore/ListItemWithActions/ListItemWithActions.qml'
--- curated-store/ComponentStore/ListItemWithActions/ListItemWithActions.qml	2014-11-11 16:33:41 +0000
+++ curated-store/ComponentStore/ListItemWithActions/ListItemWithActions.qml	2015-04-13 17:45:57 +0000
@@ -15,7 +15,9 @@
  */
 
 import QtQuick 2.2
+import QtFeedback 5.0
 import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
 
 Item {
     id: root
@@ -31,6 +33,9 @@
     property color selectedColor: "#E6E6E6"
     property bool selected: false
     property bool selectionMode: false
+    property bool showUnderscore: false
+    property bool showDivider: false
+    property bool enableHaptics: false
     property alias internalAnchors: mainContents.anchors
     default property alias contents: mainContents.children
 
@@ -64,7 +69,7 @@
         var xOffset = Math.abs(main.x)
         var index = Math.min(Math.floor(xOffset / actionFullWidth), _visibleRightSideActions.length)
         var newX = 0
-      if (index === _visibleRightSideActions.length) {
+        if (index === _visibleRightSideActions.length) {
             newX = -(rightActionsView.width - units.gu(2))
         } else if (index >= 1) {
             newX = -(actionFullWidth * index)
@@ -96,7 +101,7 @@
         var itemStartX = item.x - marginX
         var itemEndX = item.x + item.width + marginX
         return (point.x >= itemStartX) && (point.x <= itemEndX) &&
-               (point.y >= item.y) && (point.y <= (item.y + item.height));
+                (point.y >= item.y) && (point.y <= (item.y + item.height));
     }
 
     function getActionAt(point)
@@ -118,8 +123,8 @@
     function updateActiveAction()
     {
         if (triggerActionOnMouseRelease &&
-            (main.x <= -(root.actionWidth + units.gu(2))) &&
-            (main.x > -(rightActionsView.width - units.gu(2)))) {
+                (main.x <= -(root.actionWidth + units.gu(2))) &&
+                (main.x > -(rightActionsView.width - units.gu(2)))) {
             var actionFullWidth = actionWidth + units.gu(2)
             var xOffset = Math.abs(main.x)
             var index = Math.min(Math.floor(xOffset / actionFullWidth), _visibleRightSideActions.length)
@@ -183,6 +188,16 @@
     height: defaultHeight
     clip: height !== defaultHeight
 
+    HapticsEffect {
+        id: clickEffect
+        attackIntensity: 0.0
+        attackTime: 50
+        intensity: 1.0
+        duration: 10
+        fadeTime: 50
+        fadeIntensity: 0.0
+    }
+
     Rectangle {
         id: leftActionView
 
@@ -201,6 +216,7 @@
                 horizontalCenterOffset: actionThreshold / 2
             }
             name: leftSideAction && _showActions ? leftSideAction.iconName : ""
+            source: leftSideAction && _showActions ? leftSideAction.iconSource : ""
             color: Theme.palette.selected.field
             height: units.gu(3)
             width: units.gu(3)
@@ -208,48 +224,66 @@
     }
 
     Rectangle {
-       id: rightActionsView
-
-       anchors {
-           top: main.top
-           left: main.right
-           bottom: main.bottom
-       }
-       visible: _visibleRightSideActions.length > 0
-       width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + root.actionThreshold + units.gu(2) : 0
-       color: "white"
-       Row {
-           anchors{
-               top: parent.top
-               left: parent.left
-               leftMargin: units.gu(2)
-               right: parent.right
-               rightMargin: units.gu(2)
-               bottom: parent.bottom
-           }
-           spacing: units.gu(2)
-           Repeater {
-               id: rightActionsRepeater
-
-               model: _showActions ? _visibleRightSideActions : []
-               Item {
-                   property alias image: img
-
-                   height: rightActionsView.height
-                   width: root.actionWidth
-
-                   Icon {
-                       id: img
-
-                       anchors.centerIn: parent
-                       width: units.gu(3)
-                       height: units.gu(3)
-                       name: modelData.iconName
-                       color: root.activeAction === modelData ? UbuntuColors.lightAubergine : UbuntuColors.lightGrey
-                   }
-              }
-           }
-       }
+        id: rightActionsView
+
+        anchors {
+            top: main.top
+            left: main.right
+            bottom: main.bottom
+        }
+        visible: _visibleRightSideActions.length > 0
+        width: rightActionsRepeater.count > 0 ? rightActionsRepeater.count * (root.actionWidth + units.gu(2)) + root.actionThreshold + units.gu(2) : 0
+        color: "white"
+        Row {
+            anchors{
+                top: parent.top
+                left: parent.left
+                leftMargin: units.gu(2)
+                right: parent.right
+                rightMargin: units.gu(2)
+                bottom: parent.bottom
+            }
+            spacing: units.gu(2)
+            Repeater {
+                id: rightActionsRepeater
+
+                model: _showActions ? _visibleRightSideActions : []
+                Item {
+                    property alias image: img
+
+                    height: rightActionsView.height
+                    width: root.actionWidth
+
+                    Icon {
+                        id: img
+                        anchors.centerIn: parent
+                        width: units.gu(3)
+                        height: units.gu(3)
+                        name: modelData.iconName
+                        source: modelData.iconSource
+                        color: root.activeAction === modelData ? UbuntuColors.lightAubergine : UbuntuColors.lightGrey
+                    }
+                    Rectangle {
+                        id: underscore
+                        height: units.gu(0.2)
+                        anchors {
+                            left: parent.left
+                            right: parent.right
+                            bottom: parent.bottom
+                            bottomMargin: units.gu(1.5)
+
+                        }
+                        color: UbuntuColors.lightAubergine
+                        visible: root.activeAction === modelData && showUnderscore
+                        onVisibleChanged: {
+                            if (visible && enableHaptics) {
+                                clickEffect.start()
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 
 
@@ -306,7 +340,7 @@
             }
         }
         Behavior on color {
-           ColorAnimation {}
+            ColorAnimation {}
         }
     }
 
@@ -347,6 +381,7 @@
         ScriptAction {
             script: {
                 root.activeAction.triggered(root)
+                root.activeAction = null
                 mouseArea.state = ""
             }
         }
@@ -410,6 +445,9 @@
 
         onReleased: {
             if (root.triggerActionOnMouseRelease && root.activeAction) {
+                if (enableHaptics) {
+                    clickEffect.start()
+                }
                 triggerAction.start()
             } else {
                 root.returnToBounds(direction)
@@ -435,6 +473,10 @@
                     return
                 }
             }
+            if (enableHaptics) {
+                clickEffect.start()
+            }
+
             root.resetSwipe()
         }
 
@@ -450,5 +492,16 @@
         }
         z: -1
     }
+    ListItem.ThinDivider {
+        id: divider
+        visible: showDivider
+        width: parent.width + units.gu(4)
+        anchors {
+            left: parent.left
+            right: parent.right
+            bottom: parent.bottom
+            bottomMargin: units.gu(-0.15)
+        }
+    }
 }
 

=== added file 'curated-store/ComponentStore/ListItemWithActions/ubuntu_component_store.json'
--- curated-store/ComponentStore/ListItemWithActions/ubuntu_component_store.json	1970-01-01 00:00:00 +0000
+++ curated-store/ComponentStore/ListItemWithActions/ubuntu_component_store.json	2015-04-13 17:45:57 +0000
@@ -0,0 +1,6 @@
+{
+    "name": "ListItemWithActions",
+    "description": "This widget provides an updated listitem which is what the core apps currently use.",
+    "version": "1.0",
+    "documentation_url": "http://ubuntu-component-store.readthedocs.org/en/latest/_components/listitemwithactions.html"
+}

=== added file 'curated-store/ComponentStore/PageWithBottomEdge/ubuntu_component_store.json'
--- curated-store/ComponentStore/PageWithBottomEdge/ubuntu_component_store.json	1970-01-01 00:00:00 +0000
+++ curated-store/ComponentStore/PageWithBottomEdge/ubuntu_component_store.json	2015-04-13 17:45:57 +0000
@@ -0,0 +1,6 @@
+{
+    "name": "PageWithBottomEdge",
+    "description": "This component provides a bottom edge which can be used to house common actions.",
+    "version": "1.0",
+    "documentation_url": "http://ubuntu-component-store.readthedocs.org/en/latest/_components/pagewithbottomedge.html"
+}

=== modified file 'curated-store/ComponentStore/RadialBottomEdge/RadialAction.qml'
--- curated-store/ComponentStore/RadialBottomEdge/RadialAction.qml	2014-11-15 13:52:44 +0000
+++ curated-store/ComponentStore/RadialBottomEdge/RadialAction.qml	2015-04-13 17:45:57 +0000
@@ -5,4 +5,5 @@
     property string iconName: "add"
     property color iconColor: "Black"
     property color backgroundColor: "White"
+    property bool enabled: true
 }

=== modified file 'curated-store/ComponentStore/RadialBottomEdge/RadialBottomEdge.qml'
--- curated-store/ComponentStore/RadialBottomEdge/RadialBottomEdge.qml	2014-11-15 14:50:47 +0000
+++ curated-store/ComponentStore/RadialBottomEdge/RadialBottomEdge.qml	2015-04-13 17:45:57 +0000
@@ -1,4 +1,5 @@
-import QtQuick 2.0
+import QtQuick 2.2
+import QtFeedback 5.0
 import Ubuntu.Components 1.1
 
 Item {
@@ -11,7 +12,8 @@
     property color hintIconColor: UbuntuColors.coolGrey
     property bool bottomEdgeEnabled: true
 
-    property real expandedPosition: 0.6 * height
+    property int expandAngle: 360
+    property real expandedPosition: (0.85 - 0.25 * expandAngle/360) * height
     property real collapsedPosition: height - hintSize/2
 
     property list<RadialAction> actions
@@ -20,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
         
@@ -41,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
@@ -60,10 +86,13 @@
 
         Repeater {
             id: actionList
+            readonly property real itemSpace: bottomEdge.expandAngle/actionList.count;
+            readonly property real substractAngle: (bottomEdge.expandAngle == 360 || !actionList.count) ?
+                                                    0 : (actionList.count-1)/2 * itemSpace
             model: actions
             delegate: Rectangle {
                 id: actionDelegate
-                readonly property real radAngle: (index % actionList.count * (360/actionList.count)) * Math.PI / 180
+                readonly property real radAngle: (index % actionList.count * actionList.itemSpace - actionList.substractAngle) * Math.PI / 180
                 property real distance: bottomEdgeHint.actionListDistance
                 z: -1
                 width: actionButtonSize
@@ -71,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)
@@ -85,8 +115,10 @@
                 }
 
                 MouseArea {
+                    enabled: modelData.enabled
                     anchors.fill: parent
                     onClicked: {
+                        clickEffect.start()
                         bottomEdgeHint.state = "collapsed"
                         modelData.triggered(null)
                     }

=== added file 'curated-store/ComponentStore/RadialBottomEdge/ubuntu_component_store.json'
--- curated-store/ComponentStore/RadialBottomEdge/ubuntu_component_store.json	1970-01-01 00:00:00 +0000
+++ curated-store/ComponentStore/RadialBottomEdge/ubuntu_component_store.json	2015-04-13 17:45:57 +0000
@@ -0,0 +1,6 @@
+{
+    "name": "RadialBottomEdge",
+    "description": "This component provides a unique way to show actions buttons using the bottom edge. It allows app developers to decide how many actions they want to show and customize it to their liking.",
+    "version": "1.1",
+    "documentation_url": "http://ubuntu-component-store.readthedocs.org/en/latest/_components/radialbottomedge.html"
+}

=== added directory 'curated-store/ComponentStore/WelcomeWizard'
=== added file 'curated-store/ComponentStore/WelcomeWizard/Walkthrough.qml'
--- curated-store/ComponentStore/WelcomeWizard/Walkthrough.qml	1970-01-01 00:00:00 +0000
+++ curated-store/ComponentStore/WelcomeWizard/Walkthrough.qml	2015-04-13 17:45:57 +0000
@@ -0,0 +1,116 @@
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
+
+Page {
+    id: walkthrough
+
+    // Property to set the app name used in the walkthrough
+    property string appName
+
+    // Property to check if this is the first run or not
+    property bool isFirstRun: true
+
+    // Property to store the slides shown in the walkthrough (Each slide is a component defined in a separate file for simplicity)
+    property list<Component> model
+
+    // Property to set the color of bottom cirle to indicate the user's progress
+    property color completeColor: "green"
+
+    // Property to set the color of the bottom circle to indicate the slide still left to cover
+    property color inCompleteColor: "grey"
+
+    // Property to set the color of the skip welcome wizard text
+    property color skipTextColor: "grey"
+
+    // Property to signal walkthrough completion
+    signal finished
+
+    // ListView to show the slides
+    ListView {
+        id: listView
+        anchors {
+            left: parent.left
+            right: parent.right
+            top: skipLabel.bottom
+            bottom: separator.top
+        }
+
+        model: walkthrough.model
+        snapMode: ListView.SnapOneItem
+        orientation: Qt.Horizontal
+        highlightMoveDuration: UbuntuAnimation.FastDuration
+        highlightRangeMode: ListView.StrictlyEnforceRange
+        highlightFollowsCurrentItem: true
+
+        delegate: Item {
+            width: listView.width
+            height: listView.height
+            clip: true
+
+            Loader {
+                anchors {
+                    fill: parent
+                    margins: units.gu(2)
+                }
+
+                sourceComponent: modelData
+            }
+        }
+    }
+
+    // Label to skip the walkthrough. Only visible on the first slide
+    Label {
+        id: skipLabel
+
+        color: skipTextColor
+        fontSize: "small"
+        width: contentWidth
+        text: listView.currentIndex === 0 ? i18n.tr("Already used %1? <b>Skip the tutorial</b>").arg(appName) : i18n.tr("Skip")
+
+        anchors {
+            top: parent.top
+            left: parent.left
+            margins: units.gu(2)
+        }
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: walkthrough.finished()
+        }
+    }
+
+    // Separator between walkthrough slides and slide indicator
+    ListItem.ThinDivider {
+        id: separator
+        anchors.bottom: slideIndicator.top
+    }
+
+    // Indicator element to represent the current slide of the walkthrough
+    Row {
+        id: slideIndicator
+        height: units.gu(6)
+        spacing: units.gu(2)
+        anchors {
+            bottom: parent.bottom
+            horizontalCenter: parent.horizontalCenter
+        }
+
+        Repeater {
+            model: walkthrough.model.length
+            delegate: Rectangle {
+                height: width
+                radius: width/2
+                width: units.gu(2)
+                antialiasing: true
+                anchors.verticalCenter: parent.verticalCenter
+                color: listView.currentIndex >= index ? completeColor : inCompleteColor
+                Behavior on color {
+                    ColorAnimation {
+                        duration: UbuntuAnimation.FastDuration
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'curated-store/ComponentStore/WelcomeWizard/ubuntu_component_store.json'
--- curated-store/ComponentStore/WelcomeWizard/ubuntu_component_store.json	1970-01-01 00:00:00 +0000
+++ curated-store/ComponentStore/WelcomeWizard/ubuntu_component_store.json	2015-04-13 17:45:57 +0000
@@ -0,0 +1,6 @@
+{
+    "name": "WelcomeWizard",
+    "description": "This widget adds a welcome wizard to help introduce the app to users.",
+    "version": "1.0",
+    "documentation_url": "http://ubuntu-component-store.readthedocs.org/en/latest/_components/welcomewizard.html"
+}

=== modified file 'curated-store/GallerySRC/ListItemWithActionsWidget.qml'
--- curated-store/GallerySRC/ListItemWithActionsWidget.qml	2014-11-12 15:54:22 +0000
+++ curated-store/GallerySRC/ListItemWithActionsWidget.qml	2015-04-13 17:45:57 +0000
@@ -18,6 +18,9 @@
         id: testModel
         ListElement { title: "Slide me right to delete" }
         ListElement { title: "Slide me left to show more options" }
+        // TODO: not sure what the best wording for these additional properties should be [dpniel]
+        ListElement { title: "With thin divider" }
+        ListElement { title: "With haptic feedback and actions underscored" }
     }
 
     content: ListView {
@@ -32,6 +35,9 @@
             width: parent.width
             color: "White"
             triggerActionOnMouseRelease: true
+            showDivider: index === 2
+            enableHaptics: index === 3
+            showUnderscore: index === 3
 
             leftSideAction: Action {
                 iconName: "delete"

=== modified file 'curated-store/GallerySRC/RadialBottomEdgeWidget.qml'
--- curated-store/GallerySRC/RadialBottomEdgeWidget.qml	2014-11-15 14:50:47 +0000
+++ curated-store/GallerySRC/RadialBottomEdgeWidget.qml	2015-04-13 17:45:57 +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")
             },
 

=== added file 'curated-store/GallerySRC/Slide1.qml'
--- curated-store/GallerySRC/Slide1.qml	1970-01-01 00:00:00 +0000
+++ curated-store/GallerySRC/Slide1.qml	2015-04-13 17:45:57 +0000
@@ -0,0 +1,54 @@
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+// Slide 1
+Component {
+    id: slide1
+    Item {
+        id: slide1Container
+
+        UbuntuShape {
+            anchors {
+                bottom: textColumn.top
+                bottomMargin: units.gu(4)
+                horizontalCenter: parent.horizontalCenter
+            }
+
+            image: Image {
+                smooth: true
+                antialiasing: true
+                fillMode: Image.PreserveAspectFit
+                source: Qt.resolvedUrl("assets/flashback.png")
+            }
+        }
+
+        Column {
+            id: textColumn
+
+            anchors.centerIn: parent
+
+            Label {
+                text: "Welcome to"
+                fontSize: "x-large"
+                height: contentHeight
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
+            Label {
+                text: "Component Store Gallery"
+                font.bold: true
+                height: contentHeight
+                font.pixelSize: units.dp(50)
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
+        }
+
+        Label {
+            id: swipeText
+            text: "Swipe left to continue"
+            horizontalAlignment: Text.AlignHCenter
+            anchors.bottom: parent.bottom
+            anchors.bottomMargin: units.gu(2)
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+    }
+}

=== added file 'curated-store/GallerySRC/Slide2.qml'
--- curated-store/GallerySRC/Slide2.qml	1970-01-01 00:00:00 +0000
+++ curated-store/GallerySRC/Slide2.qml	2015-04-13 17:45:57 +0000
@@ -0,0 +1,42 @@
+import QtQuick 2.3
+import Ubuntu.Components 1.1
+
+// Slide 2
+Component {
+    id: slide2
+    Item {
+        id: slide2Container
+
+        Column {
+            id: mainColumn
+            spacing: units.gu(4)
+            anchors.fill: parent
+
+            Label {
+                id: introductionText
+                text: "Component Store Gallery"
+                font.bold: true
+                fontSize: "x-large"
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
+
+            Image {
+                id: centerImage
+                height: parent.height - bodyText.contentHeight - introductionText.height - 4*mainColumn.spacing
+                fillMode: Image.PreserveAspectFit
+                anchors.horizontalCenter: parent.horizontalCenter
+                source: Qt.resolvedUrl("assets/flashback.png")
+            }
+
+            Label {
+                id: bodyText
+                anchors.left: parent.left
+                anchors.right: parent.right
+                wrapMode: Text.WordWrap
+                font.pixelSize: units.dp(17)
+                horizontalAlignment: Text.AlignHCenter
+                text: "Component Store Gallery is a frontend app to the component store and provides a demo of all the components in the store. \n\nUbuntu Touch's first component store!"
+            }
+        }
+    }
+}

=== added file 'curated-store/GallerySRC/WelcomeWizardWidget.qml'
--- curated-store/GallerySRC/WelcomeWizardWidget.qml	1970-01-01 00:00:00 +0000
+++ curated-store/GallerySRC/WelcomeWizardWidget.qml	2015-04-13 17:45:57 +0000
@@ -0,0 +1,41 @@
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+import "../ComponentStore/WelcomeWizard"
+
+TemplateWidgetPage {
+    id: welcomeWizardWidget
+
+    title: "Welcome Wizard"
+    author: "Nekhelesh Ramananthan, Michael Spencer"
+    email: "[e-mail]"
+    license: "GNU General Public License v3.0"
+    description: "This widget adds a welcome wizard which helps showcase the \
+app features to the user."
+
+    Component {
+        id: pageComponent
+        Walkthrough {
+            id: walkthrough
+
+            appName: "Component Store Gallery"
+
+            onFinished: {
+                console.log("Welcome Wizard Complete!")
+                stack.pop()
+            }
+
+            model: [
+                Slide1{},
+                Slide2{}
+            ]
+        }
+    }
+
+    content: Button {
+        text: "Preview Welcome Wizard Component"
+        color: "Green"
+        height: units.gu(6)
+        onClicked: stack.push(pageComponent)
+        anchors.centerIn: parent
+    }
+}

=== modified file 'curated-store/GallerySRC/WidgetsModel.qml'
--- curated-store/GallerySRC/WidgetsModel.qml	2014-11-15 13:52:44 +0000
+++ curated-store/GallerySRC/WidgetsModel.qml	2015-04-13 17:45:57 +0000
@@ -32,4 +32,9 @@
         label: "Radial Bottom Edge"
         source: "GallerySRC/RadialBottomEdgeWidget.qml"
     }
+
+    ListElement {
+        label: "Welcome Wizard"
+        source: "GallerySRC/WelcomeWizardWidget.qml"
+    }
 }

=== modified file 'docs/_components/listitemwithactions.rst'
--- docs/_components/listitemwithactions.rst	2014-11-15 14:59:11 +0000
+++ docs/_components/listitemwithactions.rst	2015-04-13 17:45:57 +0000
@@ -83,6 +83,9 @@
 - :ref:`rightSideActions`: Action <List>
 - :ref:`locked`: boolean (false by default)
 - :ref:`triggerActionOnMouseRelease`: boolean (false by default)
+- :ref:`showDivider`: boolean (false by default)
+- :ref:`showUnderscore`: boolean (false by default)
+- :ref:`enableHaptics`: boolean (false by default) 
 
 Property Documentation
 ----------------------
@@ -116,7 +119,7 @@
         
         Label {
             id: subTitle
-            text: "SubTitle
+            text: "SubTitle"
         }
     }
 
@@ -184,3 +187,24 @@
 This property affects the right side actions behavior. If set to true, the user can swipe left to
 reveal the right side actions and execute an action by just hovering over it. By default, this is
 set to false meaning that the user needs to press on the action to trigger it.
+
+.. _showDivider:
+
+showDivider
+^^^^^^^^^^^
+
+This property can be used to display a thin divider along the bottom of the list item.
+
+.. _showUnderscore:
+
+showUnderscore
+^^^^^^^^^^^^^^
+
+This property when enabled displays an underscore underneath the active action in the rightSideActions.
+
+.. _enableHaptics:
+
+enableHaptics
+^^^^^^^^^^^^^
+
+This property enables haptic feedback when triggering actions in the list item.

=== modified file 'docs/_components/radialbottomedge.rst'
--- docs/_components/radialbottomedge.rst	2014-11-15 14:59:11 +0000
+++ docs/_components/radialbottomedge.rst	2015-04-13 17:45:57 +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")
             },
@@ -74,6 +76,7 @@
 - :ref:`actions`: RadialAction <list> 
 - :ref:`actionButtonSize`: int
 - :ref:`actionButtonDistance`: int
+- :ref:`expandAngle`: int (defaults to 360 deg)
 
 .. note:: All properties except for *hintIconSource* have well defined defaults. As a developer, you could choose to go with the defaults or change them to your liking.
 
@@ -132,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"
     }
     
@@ -156,3 +160,13 @@
 ^^^^^^^^^^^^^^^^^^^^
 
 The distance (separation) between the action buttons and the center of the radial menu.
+
+.. _expandAngle:
+
+expandAngle
+^^^^^^^^^^^
+
+The expand angle defines the spread angle. By default, it is set to 360 degrees which places the buttons
+in a full circle pattern. If it was set to 180 degrees, then the buttons would follow a semi-circle
+pattern.
+

=== added file 'docs/_components/welcomewizard.rst'
--- docs/_components/welcomewizard.rst	1970-01-01 00:00:00 +0000
+++ docs/_components/welcomewizard.rst	2015-04-13 17:45:57 +0000
@@ -0,0 +1,218 @@
+Welcome Wizard
+==============
+
++----------+----------------------------------------+
+| Author   | Nekhelesh Ramananthan, Michael Spencer |
++----------+-------------+--------------------------+
+| License  | BSD License                            |
++----------+----------------------------------------+
+| Contact  | [e-mail]                       |
++----------+----------------------------------------+
+| Framework| ubuntu-sdk-14.10                       |
++----------+----------------------------------------+
+
+This component shows users a welcome wizard which can be used to introduce
+and showcase the features of the app to guide the user. The API of this
+component is rather simple and provides a lot of freedom to the developer
+to present his content.
+
+It is recommended to put the Walkthrough{} component inside a qml Component{}
+since it is not run frequently. Walkthrough derives from a Page. So push it
+into a pagestack to show the welcome wizard as shown below in the example.
+
+Example:
+
+MainView.qml
+
+.. code-block:: qml
+
+    MainView
+    {
+        Component {
+            id: pageComponent
+            Walkthrough {
+                id: walkthrough
+
+                appName: "Component Store Gallery"
+
+                onFinished: {
+                    console.log("Welcome Wizard Complete!")
+                    // Here perhaps save isFirstRun variable to the disk
+                    stack.pop()
+                }
+
+                model: [
+                    Slide1{},
+                    Slide2{}
+                ]
+            }
+        }
+        
+        component.onCompleted: pagestack.push(pageComponent)
+    }
+    
+Slide1.qml
+        
+.. code-block:: qml
+
+    import QtQuick 2.3
+    import Ubuntu.Components 1.1
+
+    // Slide 1
+    Component {
+        id: slide1
+        Item {
+            id: slide1Container
+
+            UbuntuShape {
+                anchors {
+                    bottom: textColumn.top
+                    bottomMargin: units.gu(4)
+                    horizontalCenter: parent.horizontalCenter
+                } 
+
+                image: Image {
+                    smooth: true
+                    antialiasing: true
+                    fillMode: Image.PreserveAspectFit
+                    source: Qt.resolvedUrl("assets/flashback.png")
+                }
+            }
+
+            Column {
+                id: textColumn
+
+                anchors.centerIn: parent
+
+                Label {
+                    text: "Welcome to"
+                    fontSize: "x-large"
+                    height: contentHeight
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+                Label {
+                    text: "Component Store Gallery"
+                    font.bold: true
+                    height: contentHeight
+                    font.pixelSize: units.dp(50)
+                    anchors.horizontalCenter: parent.horizontalCenter
+                }
+            }
+
+            Label {
+                id: swipeText
+                text: "Swipe left to continue"
+                horizontalAlignment: Text.AlignHCenter
+                anchors.bottom: parent.bottom
+                anchors.bottomMargin: units.gu(2)
+                anchors.horizontalCenter: parent.horizontalCenter
+            }
+        }
+    }
+
+.. image:: ../_images/welcomewizard.png
+   :align: center
+   
+Properties
+----------
+
+- :ref:`appName`: string
+- :ref:`isFirstRun`: boolean
+- :ref:`model`: Item<list>
+- :ref:`completeColor`: color
+- :ref:`inCompleteColor`: color
+- :ref:`skipTextColor`: color
+
+Signals
+-------
+
+- :ref:`finished()`
+
+Property Documentation
+----------------------
+
+.. _appName:
+
+appName
+^^^^^^^
+
+Name of the application that is shown in some parts of the welcome wizard.
+
+.. _isFirstRun:
+
+isFirstRun
+^^^^^^^^^^
+
+Boolean property to determine if the welcome wizard was run for the first time
+or not. It is recommended to store this variable to the disk using U1dB or Qt.labs.settings 
+to remember the welcome wizard run state.
+
+.. _model:
+
+model
+^^^^^
+
+This property stores the welcome wizards slides that are shown to the user. 
+Create your content and store them in separate files per slide. So if you
+have 3 slides in your welcome wizard, you could define them as Slide1.qml,
+Slide2.qml and Slide3.qml and then reference them as,
+
+.. code-block:: qml
+
+    model: [
+        Slide1{},
+        Slide2{},
+        Slide3{}
+    ]
+    
+The slides should only contain the content you want to show. Everything else like the
+dots, divider, title etc are handled by the welcome wizard component itself. Think of these
+slides as delegates in a listview which only house the content itself.
+
+.. _completeColor:
+
+completeColor
+^^^^^^^^^^^^^
+
+This property sets the color of the bottom circle to indicate the progress of the user. By
+default it is green.
+
+.. _inCompleteColor:
+
+inCompleteColor
+^^^^^^^^^^^^^^^
+
+This property sets the color of the bottom circle to indicate the slides left in the wizard.
+By default it is grey.
+
+.. _skipTextColor:
+
+skipTextColor
+^^^^^^^^^^^^^
+
+This property sets the color of the skip text shown at the top of the welcome wizard.
+
+Signal Documentation
+--------------------
+
+.. _finished():
+
+finished()
+^^^^^^^^^^
+
+This signal is fired automatically when the user press the skip button. It can also be made
+to fire manually to exit the welcome wizard. You can perform exit tasks when this signal is fired
+like updating the :ref:`isFirstRun` variable and storing to disk etc.
+
+.. code-block:: qml
+
+    Button {
+        id: continueButton
+        color: "Green"
+        height: units.gu(5)
+        width: units.gu(25)
+        text: "Exit Welcome Wizard"
+        anchors.horizontalCenter: parent.horizontalCenter
+        onClicked: finished()
+    }
+

=== added file 'docs/_images/welcomewizard.png'
Binary files docs/_images/welcomewizard.png	1970-01-01 00:00:00 +0000 and docs/_images/welcomewizard.png	2015-04-13 17:45:57 +0000 differ
=== modified file 'docs/index.rst'
--- docs/index.rst	2015-01-04 12:05:08 +0000
+++ docs/index.rst	2015-04-13 17:45:57 +0000
@@ -56,3 +56,4 @@
    _components/listitemwithactions
    _components/pagewithbottomedge
    _components/radialbottomedge
+   _components/welcomewizard

=== modified file 'docs/release.rst'
--- docs/release.rst	2014-11-15 14:50:47 +0000
+++ docs/release.rst	2015-04-13 17:45:57 +0000
@@ -1,6 +1,38 @@
 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,
+
+  * showDivider - mimics SDK ListItem property
+  * showUnderscore - Shows an underscore under the active right side action
+  * enableHaptics - enables haptic effects on actions triggered
+
+**11th March 2015**
+
+* Added expandAngle property to radial bottom edge component to allow developers to specify the spread angle.
+
+**3rd March 2015**
+
+* Added WelcomeWizard component
+* Fixed a typo in listitemwithactions documentation
+
+**23rd February 2015**
+
+* ListItemWithActions: Reset active action after executing it.
+* ListItemWithActions has been fixed to use actions's iconSource property
+  to allow using icons that are not in the theme
+
+**4th January 2015**
+
+* Add ubuntu_component_store.json metadata files for curated components
+
 **15th November 2014**
 
 * Added radial bottom edge component

=== modified file 'script/debian/changelog'
--- script/debian/changelog	2014-11-09 15:37:52 +0000
+++ script/debian/changelog	2015-04-13 17:45:57 +0000
@@ -1,3 +1,15 @@
+ucs (0.2) trusty; urgency=medium
+
+  [Stuart Langridge]
+  * Added community channel which allows developers to submit components
+    easily to ucs.
+  * Converted ucs script to python
+
+  [Nekhelesh Ramananthan]
+  * Fixed UCS Gallery app and debian packaging
+
+ -- Nekhelesh Ramananthan <[e-mail]>  Tue, 06 Jan 2015 15:57:14 +0100
+
 ucs (0.1.2) trusty; urgency=medium
 
   * Improved install and update command to use less network bandwidth by only

=== modified file 'script/debian/control'
--- script/debian/control	2014-11-08 22:37:17 +0000
+++ script/debian/control	2015-04-13 17:45:57 +0000
@@ -10,7 +10,8 @@
 Package: ucs
 Architecture: all
 Depends: ${misc:Depends},
-	 bzr
+	 bzr,
+	 python-bzrlib
 Description: Ubuntu Component Store
  Ubuntu Component Store is a library hosting a collection of component and
  modules that app developers can use as plug-and-play components instead of