Merge lp:~elopio/ubuntu-ui-toolkit/fix1314390-click_element_on_unity into lp:ubuntu-ui-toolkit

[Leo Arias]

On the autopilot helpers, find the top container starting from the flickable.

[lp:~elopio/ubuntu-ui-toolkit/fix1314390-click_element_on_unity]

1029. By Leo Arias on 2014-04-29

Typo.

1030. By Leo Arias on 2014-04-30

Fixed python2, made compatible with python3. Thanks to thomi.

1031. By Leo Arias on 2014-05-15

Added a comment about the pending clean up of the test.

1032. By Leo Arias on 2014-05-16

Make the test work in utopic and trusty.

Unmerged revisions

=== modified file 'CHANGES'
--- CHANGES	2014-02-24 22:03:55 +0000
+++ CHANGES	2014-04-29 22:09:46 +0000
@@ -4,11 +4,22 @@
 .. contents:: List of Releases
    :depth: 1
 
-UNRELEASED
-##########
-
-API Changes
-***********
+Ubuntu.Components 1.1
+#####################
+
+API Changes
+***********
+
+Compatibility Breaks
+********************
+
+
+Ubuntu.Components 1.0
+#####################
+
+API Changes
+***********
+* ADDED IN: all modules exported as 0.1 as well as 1.0 version
 * ADDED IN: PickerDelegate: readonly property Picker picker
 * CHANGED IN: OptionSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded
 * CHANGED IN: ItemSelector: readonly property bool currentlyExpanded TO property bool currentlyExpanded
@@ -85,14 +96,17 @@
 * ADDED IN: Empty: property bool waitingConfirmationForRemoval
 * ADDED IN: Empty: function cancelItemRemoval()
 * CHANGED in CrossFadeImage: readonly property size sourceSize TO property size sourceSize
+* DEPRECATED in Header: property Item contents
+* DEPRECATED IN Tabs: property TabBar tabBar
 
 Compatibility Breaks
 ********************
 
-- CHANGED IN Tabs: Automatically show the header when the title of the active tab changes
-- CHANGED IN Page/MainView: Only enable auto-hide behavior of header when the Page's flickable can be flicked vertically, so that manual setting of anchors is no longer needed for flickables that only flick horizontally
-- CHANGED IN Page: Automatic detection of flickable inside a Page to control the header is now limited to Flickables that are anchored to the top of the Page or fill the Page. Header automatically shows when flickable.contentHeight becomes <= flickable.height.
-- CHANGED IN Action, ActionItem, OptionSelectorDelegate: Setting iconName now always selects the requested icon from ubuntu-mobile theme, not the system icon theme.
+* CHANGED IN Tabs: Automatically show the header when the title of the active tab changes
+* CHANGED IN Page/MainView: Only enable auto-hide behavior of header when the Page's flickable can be flicked vertically, so that manual setting of anchors is no longer needed for flickables that only flick horizontally
+* CHANGED IN Page: Automatic detection of flickable inside a Page to control the header is now limited to Flickables that are anchored to the top of the Page or fill the Page. Header automatically shows when flickable.contentHeight becomes <= flickable.height.
+* CHANGED IN Action, ActionItem, OptionSelectorDelegate: Setting iconName now always selects the requested icon from ubuntu-mobile theme, not the system icon theme.
+* CHANGED IN TabBar: The model now needs to have a selectedIndex property.
 
 SDK 0.1.46
 ##########
 
=== modified file 'components.api'
--- components.api	2014-04-01 12:57:27 +0000
+++ components.api	2014-04-29 22:09:46 +0000
@@ -1,4 +1,4 @@
-modules/Ubuntu/Components/AbstractButton.qml
+AbstractButton 0.1 1.0
 ActionItem
     signal clicked()
     signal pressAndHold()
@@ -6,13 +6,13 @@
     property bool hovered
     property bool __acceptEvents
     property internal __mouseArea
-modules/Ubuntu/Components/Action.qml
+Action 0.1 1.0
 UnityActions.Action
     property url iconSource
     property string iconName
     property bool visible
     property Component itemHint
-modules/Ubuntu/Components/ActionItem.qml
+ActionItem 0.1 1.0
 StyledItem
     property Action action
     property string text
@@ -20,19 +20,19 @@
     property string iconName
     signal triggered(var value)
     function trigger(value)
-modules/Ubuntu/Components/ActionList.qml
+ActionList 0.1 1.0
 QtObject
     default property list<Action> children
     property list<Action> actions
-modules/Ubuntu/Components/ActivityIndicator.qml
+ActivityIndicator 0.1 1.0
 AnimatedItem
     property bool running
-modules/Ubuntu/Components/Button.qml
+Button 0.1 1.0
 AbstractButton
     property color color
     property Gradient gradient
     property string iconPosition
-modules/Ubuntu/Components/CheckBox.qml
+CheckBox 0.1 1.0
 AbstractButton
     property bool checked
 modules/Ubuntu/Components/Colors/UbuntuColors.qml
@@ -45,7 +45,15 @@
     readonly property color coolGrey
     property Gradient orangeGradient
     property Gradient greyGradient
-modules/Ubuntu/Components/CrossFadeImage.qml
+ComboButton 1.1
+Button
+    property bool expanded
+    property real collapsedHeight
+    property real expandedHeight
+    readonly property real comboListHeight
+    default property list<Item> comboList
+    property color dropdownColor
+CrossFadeImage 0.1 1.0
 Item
     property url source
     property int fillMode
@@ -53,27 +61,28 @@
     readonly property bool running
     property size sourceSize
     readonly property int status
-modules/Ubuntu/Components/Header.qml
+Header 0.1 1.0
 StyledItem
     property bool animate
     function show()
     function hide()
     property string title
     property Item contents
+    property var tabsModel
+    property var pageStack
     property Flickable flickable
-modules/Ubuntu/Components/Icon.qml
+    property bool useDeprecatedToolbar
+Icon 0.1 1.0
 Item
     property string name
     property color color
     property color keyColor
-modules/Ubuntu/Components/Label.qml
+Label 0.1 1.0
 Text
     property string fontSize
-modules/Ubuntu/Components/ListItems/Base.qml
+Base 0.1 1.0
 Empty
     property variant icon
-    property url iconSource
-    property string iconName
     property url fallbackIconSource
     property string fallbackIconName
     property bool progression
@@ -84,12 +93,12 @@
     property real __rightIconMargin
     property bool __iconIsItem
     property internal children
-modules/Ubuntu/Components/ListItems/Caption.qml
+Caption 0.1 1.0
 Item
     property string text
-modules/Ubuntu/Components/ListItems/Divider.qml
+Divider 0.1 1.0
 Image
-modules/Ubuntu/Components/ListItems/Empty.qml
+Empty 0.1 1.0
 AbstractButton
     property bool selected
     property bool highlightWhenPressed
@@ -106,24 +115,24 @@
     property ThinDivider divider
     property real __contentsMargins
     function cancelItemRemoval()
-modules/Ubuntu/Components/ListItems/Expandable.qml
+Expandable 0.1 1.0
 Empty
     property bool expanded
     property real collapsedHeight
     property real expandedHeight
     property bool collapseOnClick
     default property QtObject children
-modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml
+ExpandablesColumn 0.1 1.0
 Flickable
     readonly property Item expandedItem
     function expandItem(item)
     function collapse()
     default property QtObject children
-modules/Ubuntu/Components/ListItems/Header.qml
+Header 0.1 1.0
 Item
     property string text
     property internal __foregroundColor
-modules/Ubuntu/Components/ListItems/ItemSelector.qml
+ItemSelector 0.1 1.0
 ListItem.Empty
     property var model
     property bool expanded
@@ -135,21 +144,19 @@
     readonly property real itemHeight
     signal delegateClicked(int index)
     signal expansionCompleted()
-modules/Ubuntu/Components/ListItems/MultiValue.qml
+MultiValue 0.1 1.0
 Base
     property variant values
-modules/Ubuntu/Components/ListItems/SingleControl.qml
+SingleControl 0.1 1.0
 Empty
     property Item control
     function __updateControl()
-modules/Ubuntu/Components/ListItems/SingleValue.qml
+SingleValue 0.1 1.0
 Base
     property string value
-modules/Ubuntu/Components/ListItems/Standard.qml
+Standard 0.1 1.0
 Empty
     property variant icon
-    property url iconSource
-    property string iconName
     property url fallbackIconSource
     property string fallbackIconName
     property bool progression
@@ -162,17 +169,14 @@
     property bool __controlAreaPressed
     property bool __iconIsItem
     property internal __foregroundColor
-modules/Ubuntu/Components/ListItems/Subtitled.qml
+Subtitled 0.1 1.0
 Base
-    property string text
     property string subText
-modules/Ubuntu/Components/ListItems/ThinDivider.qml
+ThinDivider 0.1 1.0
 Image
-modules/Ubuntu/Components/ListItems/ValueSelector.qml
+ValueSelector 0.1 1.0
 Empty
     property variant icon
-    property url iconSource
-    property string iconName
     property url fallbackIconSource
     property string fallbackIconName
     property real __iconWidth
@@ -183,7 +187,7 @@
     property variant values
     property int selectedIndex
     property bool expanded
-modules/Ubuntu/Components/MainView.qml
+MainView 0.1 1.0
 PageTreeNode
     property string applicationName
     property bool anchorToKeyboard
@@ -195,10 +199,10 @@
     default property internal contentsItem
     property list<Action> actions
     property UnityActions.ActionManager actionManager
-modules/Ubuntu/Components/Object.qml
+Object 0.1 1.0
 QtObject
     default property internal children
-modules/Ubuntu/Components/OptionSelector.qml
+OptionSelector 0.1 1.0
 ListItem.Empty
     property var model
     property bool expanded
@@ -210,31 +214,28 @@
     readonly property real itemHeight
     signal delegateClicked(int index)
     signal expansionCompleted()
-modules/Ubuntu/Components/OptionSelectorDelegate.qml
-ListItem.Standard
-    property string text
+OptionSelectorDelegate 0.1 1.0
+ListItem.Empty
     property string subText
     property url icon
-    property url iconSource
-    property string iconName
     property bool constrainImage
     property bool colourImage
     property color assetColour
     readonly property ListView listView
     readonly property string fragColourShader
-modules/Ubuntu/Components/OrientationHelper.qml
+OrientationHelper 0.1 1.0
 Item
     property bool automaticOrientation
     property bool transitionEnabled
     property alias rotating
     property int __orientationAngle
     property int orientationAngle
-modules/Ubuntu/Components/Page.qml
+Page 0.1 1.0
 PageTreeNode
     property string title
     property Flickable flickable
     property list<Action> actions
-modules/Ubuntu/Components/PageStack.qml
+PageStack 0.1 1.0
 PageTreeNode
     property bool __showHeader
     property int depth
@@ -242,7 +243,7 @@
     function push(page, properties)
     function pop()
     function clear()
-modules/Ubuntu/Components/Panel.qml
+Panel 0.1 1.0
 Item
     default property list<Object> contents
     property int align
@@ -259,7 +260,7 @@
     property bool __closeOnContentsClicks
     property bool __openOnHover
     property bool pressed
-modules/Ubuntu/Components/Pickers/DatePicker.qml
+DatePicker 0.1 1.0
 StyledItem
     property string mode
     property date date
@@ -274,7 +275,7 @@
     readonly property int seconds
     property var locale
     readonly property bool moving
-modules/Ubuntu/Components/Pickers/Dialer.qml
+Dialer 0.1 1.0
 StyledItem
     property real minimumValue
     property real maximumValue
@@ -284,7 +285,7 @@
     property list<var> centerContent
     readonly property list<DialerHands> hands
     signal handUpdated(var hand)
-modules/Ubuntu/Components/Pickers/DialerHand.qml
+DialerHand 0.1 1.0
 StyledItem
     property real value
     property DialerHandGroup hand
@@ -292,7 +293,7 @@
     default property list<QtObject> overlay
     readonly property int index
     property internal __grabber
-modules/Ubuntu/Components/Pickers/Picker.qml
+Picker 0.1 1.0
 StyledItem
     property bool circular
     property var model
@@ -302,27 +303,27 @@
     readonly property bool moving
     function positionViewAtIndex(index)
     property int __clickedIndex
-modules/Ubuntu/Components/Pickers/PickerDelegate.qml
+PickerDelegate 0.1 1.0
 AbstractButton
     readonly property Picker picker
 modules/Ubuntu/Components/Pickers/PickerPanel.qml
 Object
     function openDatePicker(caller, property, mode)
-modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml
+ActionSelectionPopover 0.1 1.0
 Popover
     property Item target
     property var actions
     property Component delegate
-modules/Ubuntu/Components/Popups/ComposerSheet.qml
+ComposerSheet 0.1 1.0
 SheetBase
     signal cancelClicked
     signal confirmClicked
-modules/Ubuntu/Components/Popups/DefaultSheet.qml
+DefaultSheet 0.1 1.0
 SheetBase
     property bool doneButton
     signal closeClicked
     signal doneClicked
-modules/Ubuntu/Components/Popups/Dialog.qml
+Dialog 0.1 1.0
 PopupBase
     default property list<Object> contents
     property string title
@@ -332,7 +333,7 @@
     property real edgeMargins
     property real callerMargin
     property bool modal
-modules/Ubuntu/Components/Popups/Popover.qml
+Popover 0.1 1.0
 PopupBase
     default property list<Object> container
     property real contentWidth
@@ -346,7 +347,7 @@
     function show()
     function hide()
     function __makeInvisible()
-modules/Ubuntu/Components/Popups/PopupBase.qml
+PopupBase 0.1 1.0
 OrientationHelper
     property Item dismissArea
     property bool grabDismissAreaEvents
@@ -358,7 +359,7 @@
     property bool __closeOnDismissAreaPress
     property internal __dimBackground
     property internal __eventGrabber
-modules/Ubuntu/Components/Popups/SheetBase.qml
+SheetBase 0.1 1.0
 PopupBase
     default property list<Object> container
     property real contentsWidth
@@ -367,19 +368,19 @@
     property bool modal
     property internal __leftButton
     property internal __rightButton
-modules/Ubuntu/Components/ProgressBar.qml
+ProgressBar 0.1 1.0
 AnimatedItem
     property bool indeterminate
     property real minimumValue
     property real maximumValue
     property real value
-modules/Ubuntu/Components/Scrollbar.qml
+Scrollbar 0.1 1.0
 StyledItem
     property Flickable flickableItem
     property int align
     property bool __interactive
     property internal __private
-modules/Ubuntu/Components/Slider.qml
+Slider 0.1 1.0
 StyledItem
     property real minimumValue
     property real maximumValue
@@ -389,20 +390,20 @@
     signal touched(bool onThumb)
     function formatValue(v)
     property internal __internals
-modules/Ubuntu/Components/StyledItem.qml
+StyledItem 0.1 1.0
 FocusScope
     property Component style
     readonly property Item __styleInstance
-modules/Ubuntu/Components/Switch.qml
+Switch 0.1 1.0
 CheckBox
-modules/Ubuntu/Components/Tab.qml
+Tab 0.1 1.0
 PageTreeNode
     property string title
     property url iconSource
     property Item page
     readonly property int index
     property internal __protected
-modules/Ubuntu/Components/TabBar.qml
+TabBar 0.1 1.0
 StyledItem
     property Item tabsItem
     property var model
@@ -411,7 +412,7 @@
     property int selectedIndex
     property bool alwaysSelectionMode
     property bool animate
-modules/Ubuntu/Components/Tabs.qml
+Tabs 0.1 1.0
 PageTreeNode
     property int selectedTabIndex
     readonly property Tab selectedTab
@@ -420,7 +421,8 @@
     default property list<Item> tabChildren
     readonly property int count
     signal modelChanged()
-modules/Ubuntu/Components/TextArea.qml
+    property var __model
+TextArea 0.1 1.0
 StyledItem
     property bool highlighted
     property string placeholderText
@@ -481,8 +483,7 @@
     function remove(start, end)
     function undo()
     function forceActiveFocus()
-    property internal __internal
-modules/Ubuntu/Components/TextField.qml
+TextField 0.1 1.0
 ActionItem
     property bool highlighted
     property string placeholderText
@@ -547,12 +548,11 @@
     function undo()
     function remove(start, end)
     function getText(start, end)
-    property internal __internal
-modules/Ubuntu/Components/Themes/Palette.qml
+Palette 0.1
 QtObject
     property PaletteValues normal
     property PaletteValues selected
-modules/Ubuntu/Components/Themes/PaletteValues.qml
+PaletteValues 0.1
 QtObject
     property color background
     property color backgroundText
@@ -564,40 +564,42 @@
     property color overlayText
     property color field
     property color fieldText
-modules/Ubuntu/Components/ToolbarButton.qml
+ToolbarButton 0.1 1.0
 ActionItem
-modules/Ubuntu/Components/ToolbarItems.qml
+ToolbarItems 0.1 1.0
 Item
     default property list<Object> contents
     property Item back
     property Item pageStack
     property bool opened
     property bool locked
-modules/Ubuntu/Components/UbuntuListView.qml
+UbuntuListView 0.1 1.0
 ListView
     property int expandedIndex
-modules/Ubuntu/Components/UbuntuNumberAnimation.qml
+UbuntuNumberAnimation 0.1 1.0
 NumberAnimation
-modules/Ubuntu/Components/UbuntuShape.qml
+UbuntuShape 0.1 1.0
 Item
     property color color
     property color gradientColor
     property string radius
     property Item image
     property url borderSource
-modules/Ubuntu/PerformanceMetrics/PerformanceOverlay.qml
+PerformanceOverlay 0.1 1.0
 Item
     property bool active
-modules/Ubuntu/Test/UbuntuTestCase.qml
+UbuntuTestCase 0.1 1.0
 TestCase
     function findChild(obj,objectName)
     function findInvisibleChild(obj,objectName)
     function mouseMoveSlowly(item,x,y,dx,dy,steps,stepdelay)
+    function flick(item, x, y, dx, dy, pressTimeout, steps, button, modifiers, delay)
+    function mouseLongPress(item, x, y, button, modifiers, delay)
     function tryCompareFunction(func, expectedResult, timeout)
 plugins.qmltypes
     name: "InverseMouseAreaType"
     prototype: "QQuickMouseArea"
-    exports: ["InverseMouseArea 0.1"]
+    exports: ["InverseMouseArea 0.1", "InverseMouseArea 1.0"]
     Property { name: "sensingArea"; type: "QQuickItem"; isPointer: true }
     Property { name: "topmostItem"; type: "bool" }
     Method {
@@ -605,7 +607,7 @@
     Parameter { name: "point"; type: "QPointF" }
     name: "ShapeItem"
     prototype: "QQuickItem"
-    exports: ["Shape 0.1"]
+    exports: ["Shape 0.1", "Shape 1.0"]
     name: "HAlignment"
     name: "VAlignment"
     Property { name: "color"; type: "QColor" }
@@ -620,7 +622,7 @@
     Method { name: "gridUnitChanged" }
     name: "UCAlarm"
     prototype: "QObject"
-    exports: ["Alarm 0.1"]
+    exports: ["Alarm 0.1", "Alarm 1.0"]
     name: "Status"
     name: "Operation"
     name: "Error"
@@ -643,14 +645,14 @@
     Method { name: "reset" }
     name: "UCAlarmModel"
     prototype: "QAbstractListModel"
-    exports: ["AlarmModel 0.1"]
+    exports: ["AlarmModel 0.1", "AlarmModel 1.0"]
     Property { name: "count"; type: "int"; isReadonly: true }
     Method {
     name: "get"
     Parameter { name: "index"; type: "int" }
     name: "UCArgument"
     prototype: "QObject"
-    exports: ["Argument 0.1"]
+    exports: ["Argument 0.1", "Argument 1.0"]
     Property { name: "name"; type: "string" }
     Property { name: "help"; type: "string" }
     Property { name: "required"; type: "bool" }
@@ -660,7 +662,7 @@
     Parameter { name: "i"; type: "int" }
     name: "UCArguments"
     prototype: "QObject"
-    exports: ["Arguments 0.1"]
+    exports: ["Arguments 0.1", "Arguments 1.0"]
     Property { name: "defaultArgument"; type: "UCArgument"; isPointer: true }
     Property { name: "arguments"; type: "UCArgument"; isList: true; isReadonly: true }
     Property { name: "values"; type: "QQmlPropertyMap"; isReadonly: true; isPointer: true }
@@ -673,10 +675,10 @@
     Method { name: "quitWithError" }
     name: "UCInverseMouse"
     prototype: "UCMouse"
-    exports: ["InverseMouse 0.1"]
+    exports: ["InverseMouse 0.1", "InverseMouse 1.0"]
     name: "UCMouse"
     prototype: "QObject"
-    exports: ["Mouse 0.1"]
+    exports: ["Mouse 0.1", "Mouse 1.0"]
     name: "Priority"
     Property { name: "enabled"; type: "bool" }
     Property { name: "acceptedButtons"; type: "Qt::MouseButtons"; isReadonly: true }
@@ -687,30 +689,38 @@
     Signal {
     name: "pressed"
     Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "released"
     Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "clicked"
     Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "pressAndHold"
     Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "doubleClicked"
     Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "positionChanged"
     Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "entered"
     Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     Signal {
     name: "exited"
     Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
+    Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
     name: "UCQQuickImageExtension"
     prototype: "QQuickImageBase"
-    exports: ["QQuickImageBase 0.1"]
+    exports: ["QQuickImageBase 0.1", "QQuickImageBase 1.0"]
     Property { name: "source"; type: "QUrl" }
     Signal {
     name: "sourceChanged"
@@ -720,14 +730,14 @@
     Parameter { type: "QUrl" }
     name: "UCStateSaver"
     prototype: "QObject"
-    exports: ["StateSaver 0.1"]
+    exports: ["StateSaver 0.1", "StateSaver 1.0"]
     name: "UCStateSaverAttached"
     prototype: "QObject"
     Property { name: "enabled"; type: "bool" }
     Property { name: "properties"; type: "string" }
     name: "UCUbuntuAnimation"
     prototype: "QObject"
-    exports: ["UbuntuAnimation 0.1"]
+    exports: ["UbuntuAnimation 0.1", "UbuntuAnimation 1.0"]
     Property { name: "SnapDuration"; type: "int"; isReadonly: true }
     Property { name: "FastDuration"; type: "int"; isReadonly: true }
     Property { name: "BriskDuration"; type: "int"; isReadonly: true }
@@ -737,7 +747,7 @@
     Property { name: "StandardEasingReverse"; type: "QEasingCurve"; isReadonly: true }
     name: "UCUnits"
     prototype: "QObject"
-    exports: ["UCUnits 0.1"]
+    exports: ["UCUnits 0.1", "UCUnits 1.0"]
     Property { name: "gridUnit"; type: "float" }
     Method {
     name: "dp"
@@ -747,13 +757,13 @@
     Parameter { name: "value"; type: "float" }
     name: "UCUriHandler"
     prototype: "QObject"
-    exports: ["UriHandler 0.1"]
+    exports: ["UriHandler 0.1", "UriHandler 1.0"]
     Signal {
     name: "opened"
     Parameter { name: "uris"; type: "QStringList" }
     name: "UbuntuI18n"
     prototype: "QObject"
-    exports: ["i18n 0.1"]
+    exports: ["i18n 0.1", "i18n 1.0"]
     Property { name: "domain"; type: "string" }
     Property { name: "language"; type: "string" }
     Method {
@@ -780,17 +790,17 @@
     Parameter { name: "n"; type: "int" }
     name: "ULConditionalLayout"
     prototype: "QObject"
-    exports: ["ConditionalLayout 0.1"]
+    exports: ["ConditionalLayout 0.1", "ConditionalLayout 1.0"]
     Property { name: "name"; type: "string" }
     Property { name: "when"; type: "QQmlBinding"; isPointer: true }
     Property { name: "layout"; type: "QQmlComponent"; isPointer: true }
     name: "ULItemLayout"
     prototype: "QQuickItem"
-    exports: ["ItemLayout 0.1"]
+    exports: ["ItemLayout 0.1", "ItemLayout 1.0"]
     Property { name: "item"; type: "string" }
     name: "ULLayouts"
     prototype: "QQuickItem"
-    exports: ["Layouts 0.1"]
+    exports: ["Layouts 0.1", "Layouts 1.0"]
     Property { name: "currentLayout"; type: "string"; isReadonly: true }
     Property { name: "layouts"; type: "ULConditionalLayout"; isList: true; isReadonly: true }
     name: "ULLayoutsAttached"
@@ -798,7 +808,7 @@
     Property { name: "item"; type: "string" }
     name: "UPMCpuUsage"
     prototype: "QQuickItem"
-    exports: ["CpuUsage 0.1"]
+    exports: ["CpuUsage 0.1", "CpuUsage 1.0"]
     Property { name: "graphModel"; type: "UPMGraphModel"; isReadonly: true; isPointer: true }
     Property { name: "period"; type: "int" }
     Property { name: "samplingInterval"; type: "int" }
@@ -810,7 +820,7 @@
     Property { name: "currentValue"; type: "int"; isReadonly: true }
     name: "UPMRenderingTimes"
     prototype: "QQuickItem"
-    exports: ["RenderingTimes 0.1"]
+    exports: ["RenderingTimes 0.1", "RenderingTimes 1.0"]
     Property { name: "period"; type: "int" }
     Property { name: "samples"; type: "int" }
     Property { name: "graphModel"; type: "UPMGraphModel"; isReadonly: true; isPointer: true }
@@ -820,5 +830,5 @@
     Parameter { name: "renderTime"; type: "qlonglong" }
     name: "UPMTextureFromImage"
     prototype: "QQuickItem"
-    exports: ["TextureFromImage 0.1"]
+    exports: ["TextureFromImage 0.1", "TextureFromImage 1.0"]
     Property { name: "image"; type: "QImage" }
 
=== modified file 'debian/control'
--- debian/control	2014-03-17 09:02:58 +0000
+++ debian/control	2014-04-29 22:09:46 +0000
@@ -8,6 +8,7 @@
                libglib2.0-dev,
                python3,
                python,
+               python3-flake8,
                libqt5qml-graphicaleffects | libqt5graphicaleffects5,
                qt5-default,
                qtbase5-dev,
@@ -134,9 +135,12 @@
          python-autopilot (>= 1.4),
          python-fixtures,
          python-mock,
+         python-testscenarios,
+         python-testtools,
          python3-fixtures,
+         python3-testscenarios,
+         python3-testtools,
          python3-autopilot (>= 1.4),
          ubuntu-ui-toolkit-examples (>= ${source:Version}),
 Description: Test package for Ubuntu UI Toolkit
  Autopilot tests for the ubuntu-ui-toolkit package
-
 
=== modified file 'debian/rules'
--- debian/rules	2014-03-27 08:59:19 +0000
+++ debian/rules	2014-04-29 22:09:46 +0000
@@ -9,6 +9,7 @@
 	dh $@ --fail-missing
 
 override_dh_auto_test:
+	flake8 tests/autopilot/ubuntuuitoolkit/
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	mkdir -p debian/tmp/home/run
 	chmod +x tests/xvfb.sh
@@ -20,8 +21,7 @@
 	dh_auto_build -- docs
 
 override_dh_install:
-	mkdir -p debian/tmp/`qmake -query QT_INSTALL_DOCS`/qch 
+	mkdir -p debian/tmp/`qmake -query QT_INSTALL_DOCS`/qch
 	mkdir -p debian/tmp/usr/share/ubuntu-ui-toolkit/doc
 	cp -r $(CURDIR)/documentation/*qch debian/tmp/`qmake -query QT_INSTALL_DOCS`/qch
 	dh_install --fail-missing
-
 
=== modified file 'documentation/overview.qdoc'
--- documentation/overview.qdoc	2014-01-23 17:13:24 +0000
+++ documentation/overview.qdoc	2014-04-29 22:09:46 +0000
@@ -31,70 +31,75 @@
      \part Basic QML Types
      Available through:
      \code
-         import Ubuntu.Components 0.1
+         import Ubuntu.Components 1.1
      \endcode
      \annotatedlist ubuntu
 
      \part List Items
      Available through:
      \code
-         import Ubuntu.Components.ListItems 0.1
+         import Ubuntu.Components.ListItems 1.0
      \endcode
      \annotatedlist ubuntu-listitems
 
      \part Pickers
      Available through:
      \code
-         import Ubuntu.Components.Pickers 0.1
+         import Ubuntu.Components.Pickers 1.0
      \endcode
      \annotatedlist ubuntu-pickers
 
      \part Popovers, Sheets and Dialogs
      Available through:
      \code
-         import Ubuntu.Components.Popups 0.1
+         import Ubuntu.Components.Popups 1.0
      \endcode
      \annotatedlist ubuntu-popups
 
      \part Layouting
      Available through:
      \code
-         import Ubuntu.Layouts 0.1
+         import Ubuntu.Layouts 1.0
      \endcode
      \annotatedlist ubuntu-layouts
 
      \part Theming Elements
      Available through:
      \code
-         import Ubuntu.Components 0.1
+         import Ubuntu.Components 1.1
      \endcode
      \annotatedlist theming
 
+     \part Style API
+     The Style API defines the interface components use to style the visuals.
+     Themes must make sure that these interfaces are all implemented.
+     \annotatedlist style-api
+
      \part Resolution Independence Items
      Available through:
      \code
-         import Ubuntu.Components 0.1
+         import Ubuntu.Components 1.1
      \endcode
      \annotatedlist resolution-independence
 
      \part Parsing Command-Line Arguments
      Available through:
      \code
-         import Ubuntu.Components 0.1
+         import Ubuntu.Components 1.1
      \endcode
      \annotatedlist ubuntu-commandline
 
      \part Services
      Available through:
      \code
-         import Ubuntu.Components 0.1
+         import Ubuntu.Components 1.1
      \endcode
      \annotatedlist ubuntu-services
 
      \part Performance Metrics
      Available through:
      \code
-         import Ubuntu.PerformanceMetrics 0.1
+         import Ubuntu.PerformanceMetrics 1.0
      \endcode
      \annotatedlist ubuntu-performance-metrics
  */
 
=== modified file 'documentation/resolution-independence.qdoc'
--- documentation/resolution-independence.qdoc	2013-09-25 15:29:26 +0000
+++ documentation/resolution-independence.qdoc	2014-04-29 22:09:46 +0000
@@ -64,7 +64,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 0.1
+    import Ubuntu.Components 1.1
 
     Item {
         width: units.gu(2)
@@ -79,7 +79,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 0.1
+    import Ubuntu.Components 1.1
 
     Rectangle {
         height: units.dp(1)
@@ -143,7 +143,7 @@
 
     Example Usage:
     \code
-    import Ubuntu.Components 0.1
+    import Ubuntu.Components 1.1
 
     Label {
         fontSize: "small"
 
=== modified file 'documentation/snippets/layouts/SimpleLayout.qml'
--- documentation/snippets/layouts/SimpleLayout.qml	2013-06-25 14:25:43 +0000
+++ documentation/snippets/layouts/SimpleLayout.qml	2014-04-29 22:09:46 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Layouts 1.0
 
 Item {
     id: root
 
=== modified file 'documentation/snippets/layouts/layout1.qml'
--- documentation/snippets/layouts/layout1.qml	2013-06-25 14:19:12 +0000
+++ documentation/snippets/layouts/layout1.qml	2014-04-29 22:09:46 +0000
@@ -16,8 +16,8 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Layouts 1.0
 
 Item {
     id: root
 
=== modified file 'documentation/snippets/layouts/layout2.qml'
--- documentation/snippets/layouts/layout2.qml	2013-06-25 14:19:12 +0000
+++ documentation/snippets/layouts/layout2.qml	2014-04-29 22:09:46 +0000
@@ -16,8 +16,8 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Layouts 1.0
 
 Item {
     id: root
 
=== modified file 'documentation/snippets/layouts/layout3.qml'
--- documentation/snippets/layouts/layout3.qml	2013-06-25 14:19:12 +0000
+++ documentation/snippets/layouts/layout3.qml	2014-04-29 22:09:46 +0000
@@ -16,8 +16,8 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Layouts 1.0
 
 Item {
     id: root
 
=== modified file 'documentation/snippets/layouts/layout6.qml'
--- documentation/snippets/layouts/layout6.qml	2013-06-25 14:19:12 +0000
+++ documentation/snippets/layouts/layout6.qml	2014-04-29 22:09:46 +0000
@@ -16,8 +16,8 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Layouts 1.0
 
 Item {
     id: root
 
=== modified file 'documentation/snippets/layouts/layout7.qml'
--- documentation/snippets/layouts/layout7.qml	2013-06-25 14:19:12 +0000
+++ documentation/snippets/layouts/layout7.qml	2014-04-29 22:09:46 +0000
@@ -16,8 +16,8 @@
 
 //![0]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Layouts 1.0
 
 Item {
     id: root
 
=== modified file 'documentation/snippets/statesaver/ColorChanger.qml'
--- documentation/snippets/statesaver/ColorChanger.qml	2013-09-24 06:20:26 +0000
+++ documentation/snippets/statesaver/ColorChanger.qml	2014-04-29 22:09:46 +0000
@@ -16,7 +16,7 @@
 
 //![color-saver]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Rectangle {
     id: root
 
=== modified file 'documentation/snippets/statesaver/MultiplePropertySaver.qml'
--- documentation/snippets/statesaver/MultiplePropertySaver.qml	2013-09-24 06:20:26 +0000
+++ documentation/snippets/statesaver/MultiplePropertySaver.qml	2014-04-29 22:09:46 +0000
@@ -16,7 +16,7 @@
 
 //![group-saver]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Rectangle {
     id: root
 
=== modified file 'documentation/snippets/statesaver/PropertyGroupSaver.qml'
--- documentation/snippets/statesaver/PropertyGroupSaver.qml	2013-09-24 06:20:26 +0000
+++ documentation/snippets/statesaver/PropertyGroupSaver.qml	2014-04-29 22:09:46 +0000
@@ -16,7 +16,7 @@
 
 //![property-group-saver]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Rectangle {
     id: root
 
=== modified file 'documentation/snippets/statesaver/PropertyGroupSaver2.qml'
--- documentation/snippets/statesaver/PropertyGroupSaver2.qml	2013-09-24 06:20:26 +0000
+++ documentation/snippets/statesaver/PropertyGroupSaver2.qml	2014-04-29 22:09:46 +0000
@@ -16,7 +16,7 @@
 
 //![property-group-saver]
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Rectangle {
     id: root
 
=== modified file 'documentation/ubuntu-components-listitems.qdoc'
--- documentation/ubuntu-components-listitems.qdoc	2013-09-25 15:29:26 +0000
+++ documentation/ubuntu-components-listitems.qdoc	2014-04-29 22:09:46 +0000
@@ -15,6 +15,6 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components.ListItems 0.1
+    \qmlmodule Ubuntu.Components.ListItems 1.0
     \title List Items
 */
 
=== modified file 'documentation/ubuntu-components-pickers.qdoc'
--- documentation/ubuntu-components-pickers.qdoc	2013-09-25 15:29:26 +0000
+++ documentation/ubuntu-components-pickers.qdoc	2014-04-29 22:09:46 +0000
@@ -15,6 +15,6 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components.Pickers 0.1
+    \qmlmodule Ubuntu.Components.Pickers 1.0
     \title Pickers
 */
 
=== modified file 'documentation/ubuntu-components-popups.qdoc'
--- documentation/ubuntu-components-popups.qdoc	2013-09-25 15:29:26 +0000
+++ documentation/ubuntu-components-popups.qdoc	2014-04-29 22:09:46 +0000
@@ -15,6 +15,6 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components.Popups 0.1
+    \qmlmodule Ubuntu.Components.Popups 1.0
     \title Popovers, Sheets and Dialogs 
 */
 
=== modified file 'documentation/ubuntu-components.qdoc'
--- documentation/ubuntu-components.qdoc	2013-09-25 15:29:26 +0000
+++ documentation/ubuntu-components.qdoc	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 /*!
-    \qmlmodule Ubuntu.Components 0.1
+    \qmlmodule Ubuntu.Components 1.1
     \title Basic QML Types
     \nextpage {Ubuntu User Interface Toolkit}
 */
 
=== modified file 'documentation/ubuntu-layouts.qdoc'
--- documentation/ubuntu-layouts.qdoc	2013-09-25 15:29:26 +0000
+++ documentation/ubuntu-layouts.qdoc	2014-04-29 22:09:46 +0000
@@ -15,6 +15,11 @@
  */
 
 /*!
+    \qmlmodule Ubuntu.Layouts 1.0
+    \title Layouts
+*/
+
+/*!
   \page ubuntu-layouts.html
   \title Layouts - Introduction
   \nextpage Layouts - Terminology
@@ -177,7 +182,7 @@
   \section2 Import
   First of all, in order to use the layouting abilities, you need to import Ubuntu.Layouts.
   \code
-  import Ubuntu.Layouts 0.1
+  import Ubuntu.Layouts 1.0
   \endcode
 
   This layout will have the red button anchored to the parent's left, top and bottom, having
 
=== modified file 'examples/calculator/calculator.qml'
--- examples/calculator/calculator.qml	2013-07-03 06:41:54 +0000
+++ examples/calculator/calculator.qml	2014-04-29 22:09:46 +0000
@@ -17,8 +17,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Layouts 1.0
 import "components"
 import "components/calculator.js" as Calculator
 
 
=== modified file 'examples/calculator/components/DefaultLayout.qml'
--- examples/calculator/components/DefaultLayout.qml	2013-07-02 14:42:23 +0000
+++ examples/calculator/components/DefaultLayout.qml	2014-04-29 22:09:46 +0000
@@ -17,8 +17,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Layouts 1.0
 
 Item {
     id: buttonGrid
 
=== modified file 'examples/calculator/components/Functions.qml'
--- examples/calculator/components/Functions.qml	2013-07-02 14:42:23 +0000
+++ examples/calculator/components/Functions.qml	2014-04-29 22:09:46 +0000
@@ -17,8 +17,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Layouts 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Layouts 1.0
 
 Grid {
     id: buttonGrid
 
=== modified file 'examples/jokes/jokes.qml'
--- examples/jokes/jokes.qml	2013-07-04 21:36:23 +0000
+++ examples/jokes/jokes.qml	2014-04-29 22:09:46 +0000
@@ -16,7 +16,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import QtMultimedia 5.0
 
 /*!
 
=== modified file 'examples/locale/locale.qml'
--- examples/locale/locale.qml	2013-07-04 21:36:23 +0000
+++ examples/locale/locale.qml	2014-04-29 22:09:46 +0000
@@ -16,8 +16,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0 as ListItem
 
 /*!
   \brief An application to test locales on the device
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Buttons.qml'
--- examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-03-04 12:16:38 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Buttons.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
 
 Template {
     objectName: "buttonsTemplate"
@@ -80,4 +81,67 @@
             }
         }
     }
+
+    TemplateSection {
+        className: "ComboButton"
+
+        TemplateRow {
+            title: i18n.tr("Collapsed")
+
+            ComboButton {
+                text: "Press me"
+                objectName: "combobutton_collapsed"
+                comboList:  UbuntuListView {
+                    model: 10
+                    delegate: Standard {
+                        text: "item #" + modelData
+                    }
+                }
+            }
+        }
+
+        TemplateRow {
+            title: i18n.tr("Icon")
+
+            ComboButton {
+                iconSource: "call.png"
+                comboList:  UbuntuListView {
+                    model: 10
+                    delegate: Standard {
+                        text: "item #" + modelData
+                    }
+                }
+            }
+        }
+
+        TemplateRow {
+            title: i18n.tr("Icon+Text")
+
+            ComboButton {
+                text: "Answer"
+                iconSource: "call.png"
+                comboList:  UbuntuListView {
+                    model: 10
+                    delegate: Standard {
+                        text: "item #" + modelData
+                    }
+                }
+            }
+        }
+        TemplateRow {
+            title: i18n.tr("Expanded")
+
+            ComboButton {
+                text: "Press me"
+                objectName: "combobutton_expanded"
+                expanded: true
+                comboList:  UbuntuListView {
+                    model: 10
+                    delegate: Standard {
+                        text: "item #" + modelData
+                    }
+                }
+            }
+        }
+    }
 }
 
=== modified file 'examples/ubuntu-ui-toolkit-gallery/Label.qml'
--- examples/ubuntu-ui-toolkit-gallery/Label.qml	2013-11-28 11:11:55 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Label.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.0
 
 Template {
     objectName: "labelsTemplate"
 
=== modified file 'examples/unit-converter/unit-converter.qml'
--- examples/unit-converter/unit-converter.qml	2013-05-06 16:24:50 +0000
+++ examples/unit-converter/unit-converter.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import "conversion.js" as Converter
 
 /*!
 
=== modified file 'manual-tests/button.qml'
--- manual-tests/button.qml	2012-11-14 07:40:05 +0000
+++ manual-tests/button.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Button {
    id: button
 
=== modified file 'modules/Ubuntu/Components/AbstractButton.qml'
--- modules/Ubuntu/Components/AbstractButton.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/AbstractButton.qml	2014-04-29 22:09:46 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmlabstract AbstractButton
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The AbstractButton class defines the behavior of the button.
 
 
=== modified file 'modules/Ubuntu/Components/Action.qml'
--- modules/Ubuntu/Components/Action.qml	2014-02-24 18:24:59 +0000
+++ modules/Ubuntu/Components/Action.qml	2014-04-29 22:09:46 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Action
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Describe an action that can be re-used in, for example a \l Button
 
 
=== modified file 'modules/Ubuntu/Components/ActionItem.qml'
--- modules/Ubuntu/Components/ActionItem.qml	2014-02-24 18:24:59 +0000
+++ modules/Ubuntu/Components/ActionItem.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmlabstract ActionItem
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief A visual representation of an Action. The API of ActionItem is a
         copy of the API of \l Action, with additional properties to define
@@ -54,6 +54,7 @@
       The image associated with the actionItem.
       Default value: action.iconSource.
 
+      This is the URL of any image file
       If both iconSource and iconName are defined, iconName will be ignored.
      */
     property url iconSource: action ? action.iconSource : (iconName ? "image://theme/" + iconName : "")
@@ -62,6 +63,14 @@
       The icon associated with the actionItem in the ubuntu-mobile icon theme.
       Default value: action.iconName.
 
+      \note The complete list of icons available in Ubuntu is not published yet.
+            For now please refer to the folders where the icon themes are installed:
+            \list
+              \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
+              \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
+            \endlist
+            These 2 separate icon themes will be merged soon.
+
       If both iconSource and iconName are defined, iconName will be ignored.
      */
     property string iconName: action ? action.iconName : ""
 
=== modified file 'modules/Ubuntu/Components/ActionList.qml'
--- modules/Ubuntu/Components/ActionList.qml	2013-08-28 10:41:42 +0000
+++ modules/Ubuntu/Components/ActionList.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ActionList
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief List of \l Action items
 */
 
=== modified file 'modules/Ubuntu/Components/ActivityIndicator.qml'
--- modules/Ubuntu/Components/ActivityIndicator.qml	2013-06-27 15:20:12 +0000
+++ modules/Ubuntu/Components/ActivityIndicator.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ActivityIndicator
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The ActivityIndicator component visually indicates that a task of
     unknown duration is in progress, e.g. busy indication, connection in progress
 
=== modified file 'modules/Ubuntu/Components/AnimatedItem.qml'
--- modules/Ubuntu/Components/AnimatedItem.qml	2013-06-26 19:25:09 +0000
+++ modules/Ubuntu/Components/AnimatedItem.qml	2014-04-29 22:09:46 +0000
@@ -16,7 +16,7 @@
 
 /*!
     \qmltype AnimatedItem
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The AnimatedItem drives the animated components behavior inside a Flickable.
     Reports whether the component whos parent is a Flickable is in the visible area or not,
 
=== modified file 'modules/Ubuntu/Components/Button.qml'
--- modules/Ubuntu/Components/Button.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/Button.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Button
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Standard Ubuntu button.
 
@@ -83,6 +83,11 @@
     property Gradient gradient: __styleInstance.defaultGradient
 
     /*!
+      The font used for the button's text.
+    */
+    property font font: __styleInstance ? __styleInstance.defaultFont : Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
+
+    /*!
        The source URL of the icon to display inside the button.
        Leave this value blank for a text-only button.
        If \l action is set, the default iconSource is that of the action.
 
=== modified file 'modules/Ubuntu/Components/CheckBox.qml'
--- modules/Ubuntu/Components/CheckBox.qml	2013-10-01 14:46:11 +0000
+++ modules/Ubuntu/Components/CheckBox.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype CheckBox
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief CheckBox is a component with two states, checked or unchecked. It can
     be used to set boolean options. The behavior is the same as \l Switch, the
 
=== added file 'modules/Ubuntu/Components/ComboButton.qml'
--- modules/Ubuntu/Components/ComboButton.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/ComboButton.qml	2014-04-29 22:09:46 +0000
@@ -0,0 +1,366 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components.Popups 1.0
+import "mathUtils.js" as MathUtils
+
+/*!
+    \qmltype ComboButton
+    \inqmlmodule Ubuntu.Components 1.1
+    \ingroup ubuntu
+    \brief Ubuntu button providing a drop-down panel visualizing custom options.
+
+    The component is composed of three main blocks: \b {main button}, \b {dropdown}
+    and \b {combo list}.
+
+    The \a {main button} holds the main functionailty of the component, and it is
+    located at the left-top side of the expanded button. The \a clicked() signal
+    is triggered only when this button is pressed.
+
+    The \a {dropdown} is a button located on the right of the main button. Its
+    functionality is to drive the component's expanded state.
+
+    The \a {combo list} is a panel showing the content specified in \l comboList
+    property when expanded. The content is stretched horizontally to the component's
+    width, and its height is controlled by the \l expandedHeight property as follows:
+    \list
+    \li If the content height is smaller than the value of \l expandedHeight, the combo
+        list will be expanded only to the height of the content.
+        \qml
+        import QtQuick 2.0
+        import Ubuntu.Components 1.1
+        ComboButton {
+            text: "smaller content"
+            Rectangle {
+                height: units.gu(5) // smaller than the default expandedHeight
+                color: "blue"
+            }
+        }
+        \endqml
+    \li If the content height is greater than \l expandedHeight, the combo list will
+        expand till the height specified by the property and the content will be
+        scrolled; in case the combo list content is one single Flickable, ListView,
+        GridView or PathView, the content scrolling will be provided by the content
+        itself.
+        \qml
+        import QtQuick 2.0
+        import Ubuntu.Components 1.1
+        ComboButton {
+            text: "long scrolled content"
+            Column {
+                Repeater {
+                    model: 5
+                    spacing: units.gu(1)
+                    Rectangle {
+                        height: units.gu(5)
+                        color: "blue"
+                    }
+                }
+            }
+        }
+        \endqml
+    \li In case the content is a single Flickable, ListView, GridView or PathView,
+        the content will be filling the entire combo list area defined.
+        \qml
+        import QtQuick 2.0
+        import Ubuntu.Components 1.1
+        import Ubuntu.Components.ListItems 1.0
+        ComboButton {
+            text: "listview"
+            ListView {
+                model: 10
+                delegate: Standard {
+                    text: "Item #" + modelData
+                }
+            }
+        }
+        \endqml
+    \li Vertical anchoring of combo list content to its parent is not possible
+        as the expansion calculation is done based on the combo list content height.
+        If the content wants to take the size of the entire combo list, it should
+        bind its height to the \l comboListHeight property.
+        \qml
+        import QtQuick 2.0
+        import Ubuntu.Components 1.1
+        ComboButton {
+            id: combo
+            text: "smaller content"
+            Rectangle {
+                height: combo.comboListHeight
+                color: "blue"
+            }
+        }
+        \endqml
+    \li In case the expansion needs to be the size of the combo list content, the \l
+        expandedHeight should be set to -1.
+        \qml
+        import QtQuick 2.0
+        import Ubuntu.Components 1.1
+        ComboButton {
+            text: "auto-sized content"
+            expandedHeight: -1
+            Column {
+                Repeater {
+                    model: 5
+                    spacing: units.gu(1)
+                    Button {
+                        text: "Button #" + modelData
+                    }
+                }
+            }
+        }
+        \endqml
+    \endlist
+
+    The combo list can be expanded/collapsed either through the \l expanded property
+    or by clicking on the dropdown button. It is not collapsed when pressing the main
+    button or clicking on the combo list. In order to do an auto-collapsing button
+    you must reset the expanded property (set it to false) when the main button is
+    clicked or when a selection is taken from the combo list content. The following
+    example illustrates a possible implementation.
+
+    \qml
+    import QtQuick 2.0
+    import Ubuntu.Components 1.1
+
+    ComboButton {
+        id: combo
+        text: "Auto closing"
+        expanded: true
+        expandedHeight: units.gu(30)
+        onClicked: expanded = false
+        UbuntuListView {
+            width: parent.width
+            height: combo.comboListHeight
+            model: 20
+            delegate: Standard {
+                text: "Action #" + modelData
+                onClicked: {
+                    combo.text = text;
+                    combo.expanded = false;
+                }
+            }
+        }
+    }
+    \endqml
+
+    \section2 Styling
+    The style of the component is defined in \l ComboButtonStyle.
+  */
+Button {
+    id: combo
+
+    /*!
+      Specifies whether the combo list is expanded or not. The default falue is
+      false.
+      */
+    property bool expanded: false
+
+    /*!
+      The property holds the height of the component when collapsed. By default
+      the value is the implicit height of the component.
+      */
+    property real collapsedHeight: implicitHeight
+
+    /*!
+        The property holds the maximum height value the component should expand.
+        When setting the property, remember to take into account the \l collapsedHeight
+        value. The best practice is to use bind it with collapsedHeight.
+        \qml
+        ComboButton {
+            text: "altered expandedHeight"
+            expandedHeight: collapsedHeight + units.gu(25)
+        }
+        \endqml
+
+        A value of -1 will instruct the component to expand the combo list as
+        much as its content height is.
+
+        The default value is \l collapsedHeight + 19.5 GU, so at least 3 ListItems
+        can fit in the combo list.
+        \sa collapsedHeight
+      */
+    property real expandedHeight: collapsedHeight + units.gu(19.5)
+
+    /*!
+      The property holds the maximum combo list height allowed based on the
+      \l expandedHeight and \l collapsedHeight values. It is a convenience property
+      that can be used to size the combo list content.
+      \qml
+      import QtQuick 2.0
+      import Ubuntu.Components 1.1
+      import Ubuntu.Components.ListItems 0.1
+      ComboButton {
+          id: combo
+          text: "Full comboList size"
+          ListView {
+              anchors {
+                  left: parent.left
+                  right: parent.right
+              }
+              height: combo.comboListHeight
+              model: 20
+              delegate: Standard {
+                  text: "Action #" + modelData
+              }
+          }
+      }
+      \endqml
+
+      \sa collapsedHeight, expandedHeight
+      */
+    readonly property real comboListHeight: (expandedHeight < 0) ?
+                            comboListHolder.height :
+                            (expandedHeight - collapsedHeight -
+                            (combo.__styleInstance ? combo.__styleInstance.comboListMargin : 0))
+
+    /*!
+        \qmlproperty list<Item> comboList
+        \default
+        Property holding the list of items to be shown in the combo list. Being
+        a default property children items declared will land in the combo list.
+        \note The component is not responsible for layouting the content. It only
+        provides scrolling abilities for the case the content exceeds the defined
+        expanded height.
+      */
+    default property alias comboList: comboListHolder.data
+
+    /* ----------------- Color and font configurations ----------------- */
+    /*!
+      The property specifies the color of the dropdown button and the combo list
+      for both collapsed and expanded states. You can use \l expanded to define
+      different colors for expanded or collapsed states.
+      */
+    property color dropdownColor: __styleInstance ? __styleInstance.defaultDropdownColor : color
+
+
+    style: Theme.createStyleComponent("ComboButtonStyle.qml", combo)
+
+    Component.onCompleted: {
+        // update mouse area to report clicks only on the main button area
+        // area excluding dropDown button and combo list
+        // we must do separate bindings as __mouseArea is a read-only property
+        __mouseArea.anchors.fill = undefined;
+        __mouseArea.anchors.left = Qt.binding(function() {return combo.left;});
+        __mouseArea.anchors.top = Qt.binding(function() {return combo.top;});
+        __mouseArea.anchors.right = Qt.binding(function() {return combo.right;});
+        __mouseArea.anchors.rightMargin = Qt.binding(function() {return combo.__styleInstance.dropDownWidth + combo.__styleInstance.dropDownSeparatorWidth;});
+        __mouseArea.height = Qt.binding(function() {return collapsedHeight;});
+        // for autopilot, set the main button name
+        __mouseArea.objectName = "combobutton_mainbutton";
+
+        // bind a height calculation to avoid unwanted change
+        combo.height = Qt.binding(function() {return collapsedHeight + __styleInstance.comboListPanel.height});
+    }
+
+    // dropdown button
+    AbstractButton {
+        id: dropDown
+        objectName: "combobutton_dropdown"
+        anchors {
+            right: parent.right
+            top: parent.top
+        }
+        width: combo.__styleInstance ? combo.__styleInstance.dropDownWidth : 0
+        height: combo.collapsedHeight
+        // open dropdown when pressed, not when clicked
+        onClicked: {
+            // toggle expanded
+            combo.expanded = !combo.expanded;
+        }
+    }
+
+    // expansion list
+    Flickable {
+        id: comboHolder
+        parent: combo.__styleInstance ? combo.__styleInstance.comboListHolder : combo
+        anchors.fill: parent
+        interactive: combo.expanded && !contentIsFlickable() && (combo.expandedHeight > 0)
+        flickableDirection: Flickable.VerticalFlick
+        contentHeight: comboListHolder.height
+
+        // consider PathView as Flickable in this case as well!
+        function contentIsFlickable() {
+            return (comboListHolder.children.length === 1) &&
+                    comboListHolder.children[0].hasOwnProperty("flicking");
+        }
+
+        Item {
+            id: comboListHolder
+            objectName: "combobutton_combolist"
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+
+            // stretch children width to holder's width
+            // must do binding to height manually to avoid binding loops caused
+            // by the vertical stretching when the component is a single flickable
+            property bool stretch: (combo.expandedHeight > 0 && comboHolder.contentIsFlickable())
+            onStretchChanged: stretchChildren()
+            onChildrenChanged: stretchChildren()
+            function stretchChildren() {
+                for (var i in comboListHolder.children) {
+                    var child = comboListHolder.children[i];
+                    if (comboListHolder.stretch) {
+                        child.anchors.left = undefined;
+                        child.anchors.right = undefined;
+                        child.anchors.fill = comboListHolder;
+                        comboListHolder.height = Qt.binding(function() {
+                            return combo.comboListHeight;
+                        });
+                    } else {
+                        child.anchors.left = comboListHolder.left;
+                        child.anchors.right = comboListHolder.right;
+                        comboListHolder.height = Qt.binding(function() {
+                            return comboListHolder.childrenRect.height;
+                        });
+                    }
+                }
+            }
+        }
+    }
+    Scrollbar {
+        flickableItem: comboHolder
+    }
+
+    /*
+      Drive the expansion height of the combo list holder
+      This is a common functionaity in all combo buttons, therefore we can have it
+      in the main component.
+      */
+    Binding {
+        target: combo.__styleInstance.comboListPanel
+        property: "height"
+        value: {
+            if (!expanded) {
+                return 0;
+            }
+            if (comboListHolder.stretch) {
+                return combo.comboListHeight + combo.__styleInstance.comboListMargin;
+            }
+
+            var h = comboListHolder.height;
+            var max = combo.comboListHeight + combo.__styleInstance.comboListMargin;
+            if (combo.expandedHeight < 0) {
+                return max;
+            }
+
+            return MathUtils.clamp(h, 0, max);
+        }
+    }
+}
 
=== modified file 'modules/Ubuntu/Components/CrossFadeImage.qml'
--- modules/Ubuntu/Components/CrossFadeImage.qml	2013-10-08 20:10:59 +0000
+++ modules/Ubuntu/Components/CrossFadeImage.qml	2014-04-29 22:09:46 +0000
@@ -19,7 +19,7 @@
 // we need to use named imports otherwise namespace collision is reported
 // by the QML engine. As workaround, we use Ubuntu named import.
 // Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Ubuntu
+import Ubuntu.Components 1.1 as Ubuntu
 
 /*!
    \qmltype CrossFadeImage
@@ -28,7 +28,7 @@
 
    \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.1
 
         CrossFadeImage {
             width: units.gu(100)
 
=== modified file 'modules/Ubuntu/Components/Header.qml'
--- modules/Ubuntu/Components/Header.qml	2014-03-12 09:36:00 +0000
+++ modules/Ubuntu/Components/Header.qml	2014-04-29 22:09:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2014 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -15,16 +15,12 @@
  */
 
 import QtQuick 2.0
-// FIXME: When a module contains QML, C++ and JavaScript elements exported,
-// we need to use named imports otherwise namespace collision is reported
-// by the QML engine. As workaround, we use Ubuntu named import.
-// Bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27645
-import Ubuntu.Components 0.1 as Ubuntu
+import Ubuntu.Components 1.0
 
 /*!
     \internal
     \qmltype Header
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
 */
 StyledItem {
@@ -44,7 +40,7 @@
     Behavior on y {
         enabled: animate && !(header.flickable && header.flickable.moving)
         SmoothedAnimation {
-            duration: Ubuntu.UbuntuAnimation.BriskDuration
+            duration: UbuntuAnimation.BriskDuration
         }
     }
 
@@ -54,7 +50,7 @@
         internal.movementEnded();
     }
 
-    visible: title || contents
+    visible: title || contents || tabsModel
     onVisibleChanged: {
         internal.checkFlickableMargins();
     }
@@ -77,13 +73,43 @@
       The text to display in the header
      */
     property string title: ""
-    onTitleChanged: contentsChanged()
+    onTitleChanged: {
+        header.show();
+    }
 
     /*!
+      \deprecated
       The contents of the header. If this is set, \l title will be ignored.
+      This property is now DEPRECATED. Set tabsModel to show tabs navigation in header.
      */
     property Item contents: null
-    onContentsChanged: header.show()
+    onContentsChanged: {
+        print("Header.contents property is now DEPRECATED. Set tabsModel to show tabs navigation.");
+        header.show();
+    }
+
+    /*!
+      A model of tabs to represent in the header.
+      This is automatically set by \l Tabs.
+     */
+    property var tabsModel: null
+
+    /*!
+      If it is possible to pop this PageStack, a back button will be
+      shown in the header.
+     */
+    property var pageStack: null
+
+    // FIXME: Currently autopilot can only get visual items, but once bug #1273956
+    //  is fixed to support non-visual items, a QtObject may be used.
+    //  --timp - 2014-03-20
+    Item {
+        // FIXME: This is a workaround to be able to get the properties of
+        //  tabsModel in an autopilot test.
+        objectName: "tabsModelProperties"
+        property int count: tabsModel ? tabsModel.count : 0
+        property int selectedIndex: tabsModel ? tabsModel.selectedIndex : -1
+    }
 
     /*!
       The flickable that controls the movement of the header.
@@ -97,6 +123,11 @@
         header.show();
     }
 
+    /*!
+      Set by \l MainView
+     */
+    property bool useDeprecatedToolbar: true
+
     QtObject {
         id: internal
 
@@ -184,5 +215,6 @@
         }
     }
 
-    style: Theme.createStyleComponent("HeaderStyle.qml", header)
+    style: header.useDeprecatedToolbar ? Theme.createStyleComponent("HeaderStyle.qml", header) :
+                                         Theme.createStyleComponent("NewHeaderStyle.qml", header)
 }
 
=== modified file 'modules/Ubuntu/Components/Icon.qml'
--- modules/Ubuntu/Components/Icon.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/Icon.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Icon
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The Icon component displays an icon from the icon theme.
 
 
=== added file 'modules/Ubuntu/Components/InputHandler.qml'
--- modules/Ubuntu/Components/InputHandler.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/InputHandler.qml	2014-04-29 22:09:46 +0000
@@ -0,0 +1,317 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+/*
+  This component is a unified text selection and scrolling handler for both
+  TextField and TextArea components.
+  */
+
+Item {
+    id: inputHandler
+    objectName: "input_handler"
+    // the root control
+    property Item main
+    // the input instance
+    property Item input
+    // the Flickable holdiong the input instance
+    property Flickable flickable
+    // selection cursor mode
+    property bool selectionCursor: input && input.selectedText !== ""
+    // True if mouse handlig is enabled, false if flicking mode is enabled
+    readonly property bool mouseHandlingEnabled: !flickable.interactive
+    // property holding the selection mode timeout
+    property int selectionModeTimeout: 200
+
+    // signal triggered when popup shoudl be opened
+    signal pressAndHold(int pos)
+
+    function activateInput() {
+        if (!input.activeFocus) {
+            input.forceActiveFocus();
+        } else {
+            showInputPanel();
+        }
+    }
+
+    function showInputPanel() {
+        if (!Qt.inputMethod.visible) {
+            Qt.inputMethod.show();
+        }
+        textChanged = false;
+    }
+    function hideInputPanel() {
+        Qt.inputMethod.hide();
+        // emit accepted signal if changed
+        if (textChanged && input.hasOwnProperty("accepted")) {
+            input.accepted();
+        }
+    }
+
+    // internal properties/functions
+    readonly property bool singleLine: input && input.hasOwnProperty("validator")
+    property var flickableList: new Array()
+    property bool textChanged: false
+    property int pressedPosition: -1
+    // move properties
+    property int moveStarts: -1
+    property int moveEnds: -1
+    // set scroller to the first Flickable that scrolls the input
+    // this can be the internal Flickable if the full autosize is disabled
+    // or one of the input's parent Flickable
+    readonly property bool scrollingDisabled: main && main.hasOwnProperty("autoSize") ?
+                                                  (main.autoSize && (main.maximumLineCount <= 0)) : false
+    onScrollingDisabledChanged: if (state == "") flickable.interactive = !scrollingDisabled
+    readonly property Flickable grandScroller: firstFlickableParent(main)
+    readonly property Flickable scroller: (scrollingDisabled && grandScroller) ? grandScroller : flickable
+
+    // ensures the text cusrorRectangle is always in the internal Flickable's visible area
+    function ensureVisible()
+    {
+        var rect = input.cursorRectangle;
+        if (flickable.moving || flickable.flicking)
+            return;
+        if (flickable.contentX >= rect.x)
+            flickable.contentX = rect.x;
+        else if (flickable.contentX + flickable.width <= rect.x + rect.width)
+            flickable.contentX = rect.x + rect.width - flickable.width;
+        if (flickable.contentY >= rect.y)
+            flickable.contentY = rect.y;
+        else if (flickable.contentY + flickable.height <= rect.y + rect.height)
+            flickable.contentY = rect.y + rect.height - flickable.height;
+    }
+    // returns the mouse position
+    function mousePosition(mouse) {
+        return singleLine ? input.positionAt(mouse.x) : input.positionAt(mouse.x, mouse.y);
+    }
+    // checks whether the position is in the selected text
+    function positionInSelection(pos) {
+        return (input.selectionStart !== input.selectionEnd)
+                && (pos >= Math.min(input.selectionStart, input.selectionEnd))
+                && (pos <= Math.max(input.selectionStart, input.selectionEnd));
+    }
+
+    // check whether the mouse is inside a selected text area
+    function mouseInSelection(mouse) {
+        var pos = mousePosition(mouse);
+        return positionInSelection(pos);
+    }
+    // selects text
+    function selectText(mouse) {
+        moveEnds = mousePosition(mouse);
+        if (moveStarts < 0) {
+            moveStarts = moveEnds;
+        }
+        input.select(moveStarts, moveEnds);
+    }
+    // returns the first Flickable parent of a given item
+    function firstFlickableParent(item) {
+        var p = item ? item.parent : null;
+        while (p && !p.hasOwnProperty("flicking")) {
+            p = p.parent;
+        }
+        return p;
+    }
+    // focuses the input if not yet focused, and shows the context menu
+    function openContextMenu(mouse) {
+        var pos = mousePosition(mouse);
+        if (!main.focus || !mouseInSelection(mouse)) {
+            activateInput();
+            input.cursorPosition = pressedPosition = mousePosition(mouse);
+        }
+        // open context menu at the cursor position
+        inputHandler.pressAndHold(input.cursorPosition);
+        // if opened with left press (touch falls into this criteria as well), we need to set state to inactive
+        // so the mouse moves won't result in selected text loss/change
+        if (mouse.button === Qt.LeftButton) {
+            state = "inactive";
+        }
+    }
+
+    // disables interactive Flickable parents, stops at the first non-interactive flickable.
+    function toggleFlickablesInteractive(turnOn) {
+        var p;
+        if (!turnOn) {
+            // handle the scroller separately
+            p = firstFlickableParent(scroller)
+            while (p) {
+                if (p.interactive) {
+                    flickableList.push(p);
+                    p.interactive = false;
+                } else {
+                    break;
+                }
+                p = firstFlickableParent(p);
+            }
+        } else {
+            while (flickableList.length > 0) {
+                p = flickableList.pop();
+                p.interactive = true;
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        state = (main.focus) ? "" : "inactive";
+    }
+
+    // states
+    states: [
+        // override default state to turn on the saved Flickable interactive mode
+        State {
+            name: ""
+            StateChangeScript {
+                // restore interactive for all Flickable parents
+                script: toggleFlickablesInteractive(true);
+            }
+        },
+        State {
+            name: "inactive"
+            // we do not disable scroller here as in case the internal scrolling
+            // is disabled (scrollingDisabled = true) the outer scroller (grandScroller)
+            // would be blocked as well, which we don't want to
+            PropertyChanges {
+                target: flickable
+                interactive: false
+            }
+        },
+        State {
+            name: "scrolling"
+            StateChangeScript {
+                script: {
+                    // stop scrolling all the parents
+                    toggleFlickablesInteractive(false);
+                    // stop selection timeout
+                    selectionTimeout.running = false;
+                }
+            }
+        },
+        State {
+            name: "select"
+            // during select state all the flickables are blocked (interactive = false)
+            // we can use scroller here as we need to disable the outer scroller too!
+            PropertyChanges {
+                target: scroller
+                interactive: false
+            }
+            StateChangeScript {
+                script: {
+                    // turn off interactive for all parent flickables
+                    toggleFlickablesInteractive(false);
+                    if (!positionInSelection(pressedPosition)) {
+                        input.cursorPosition = pressedPosition;
+                    }
+                }
+            }
+        }
+    ]
+
+    // brings the state back to default when the component looses focuse
+    Connections {
+        target: main
+        ignoreUnknownSignals: true
+        onFocusChanged: {
+            state = (main.focus) ? "" : "inactive";
+        }
+    }
+
+    // input specific signals
+    Connections {
+        target: input
+        onCursorRectangleChanged: if (!scrollingDisabled) ensureVisible()
+        onTextChanged: textChanged = true;
+    }
+
+    // inner or outer Flickable controlling
+    Connections {
+        target: scroller
+        // turn scrolling state on
+        onFlickStarted: if (!scrollingDisabled) state = "scrolling"
+        onMovementStarted: if (!scrollingDisabled) state = "scrolling"
+        // reset to default state
+        onMovementEnded: state = ""
+    }
+
+    // switches the state to selection
+    Timer {
+        id: selectionTimeout
+        interval: selectionModeTimeout
+        onTriggered: {
+            if (scroller && !scroller.moving) {
+                state = "select";
+            }
+        }
+    }
+
+    // Mouse handling
+    Mouse.forwardTo: [main]
+    Mouse.onPressed: {
+        if (input.activeFocus) {
+            // start selection timeout
+            selectionTimeout.restart();
+        }
+        // remember pressed position as we need it when entering into selection state
+        pressedPosition = mousePosition(mouse);
+        // consume event so it does not get forwarded to the input
+        mouse.accepted = true;
+    }
+    Mouse.onReleased: {
+        if (!main.focus && !main.activeFocusOnPress) {
+            return;
+        }
+
+        activateInput();
+        // stop text selection timer
+        selectionTimeout.running = false;
+        if (state === "") {
+            input.cursorPosition = mousePosition(mouse);
+        }
+        moveStarts = moveEnds = -1;
+        state = "";
+        // check if we get right-click from the frame or the area that has no text
+        if (mouse.button === Qt.RightButton) {
+            // open the popover
+            inputHandler.pressAndHold(input.cursorPosition);
+        }
+    }
+    Mouse.onPositionChanged: {
+        // leave if not focus, not the left button or not in select state
+        if (!input.activeFocus || (mouse.button !== Qt.LeftButton) || (state !== "select") || !main.selectByMouse) {
+            return;
+        }
+        // stop text selection timer
+        selectionTimeout.running = false;
+        selectText(mouse);
+    }
+    Mouse.onDoubleClicked: {
+        if (main.selectByMouse) {
+            input.selectWord();
+            // turn selection state temporarily so the selection is not cleared on release
+            state = "selection";
+        }
+    }
+    Mouse.onPressAndHold: openContextMenu(mouse)
+
+    // right button handling
+    MouseArea {
+        anchors.fill: parent
+        acceptedButtons: Qt.RightButton
+        // trigger pressAndHold
+        onReleased: openContextMenu(mouse)
+    }
+}
 
=== modified file 'modules/Ubuntu/Components/Label.qml'
--- modules/Ubuntu/Components/Label.qml	2014-01-23 19:01:47 +0000
+++ modules/Ubuntu/Components/Label.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Label
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Text with Ubuntu styling.
 
 
=== modified file 'modules/Ubuntu/Components/ListItems/Base.qml'
--- modules/Ubuntu/Components/ListItems/Base.qml	2014-02-13 10:27:14 +0000
+++ modules/Ubuntu/Components/ListItems/Base.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Base
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief Parent class of various list item classes that can have
         an icon and a progression symbol.
@@ -44,32 +44,6 @@
     property variant icon: iconSource != "" ? iconSource : undefined
 
     /*!
-      The image shown in the list item.
-      \qmlproperty url iconSource
-
-      This is a URL to any image file.
-      In order to use an icon from the Ubuntu theme, use the iconName property instead.
-     */
-    property url iconSource: iconName ? "image://theme/" + iconName : ""
-
-    /*!
-      The icon shown in the list item.
-
-      \qmlproperty string iconName
-
-      If both iconSource and iconName are defined, iconName will be ignored.
-
-      \note The complete list of icons available in Ubuntu is not published yet.
-            For now please refer to the folders where the icon themes are installed:
-            \list
-              \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
-              \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
-            \endlist
-            These 2 separate icon themes will be merged soon.
-    */
-    property string iconName
-
-    /*!
       \preliminary
       The location of the icon to show in the list item if iconSource failed to load (optional).
       \qmlproperty url fallbackIconSource
 
=== modified file 'modules/Ubuntu/Components/ListItems/Caption.qml'
--- modules/Ubuntu/Components/ListItems/Caption.qml	2013-07-04 22:12:37 +0000
+++ modules/Ubuntu/Components/ListItems/Caption.qml	2014-04-29 22:09:46 +0000
@@ -15,17 +15,17 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Caption
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item that shows a piece of text.
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.Standard {
                 text: "Default list item."
 
=== modified file 'modules/Ubuntu/Components/ListItems/Divider.qml'
--- modules/Ubuntu/Components/ListItems/Divider.qml	2012-10-19 01:09:07 +0000
+++ modules/Ubuntu/Components/ListItems/Divider.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Divider
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief Divider to break up list items into groups.
 
 
=== modified file 'modules/Ubuntu/Components/ListItems/Empty.qml'
--- modules/Ubuntu/Components/ListItems/Empty.qml	2014-02-04 14:39:53 +0000
+++ modules/Ubuntu/Components/ListItems/Empty.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Empty
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A list item with no contents.
     The Empty class can be used for generic list items containing other
@@ -34,8 +34,8 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.1
+        import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {
             Model {
 
=== modified file 'modules/Ubuntu/Components/ListItems/Expandable.qml'
--- modules/Ubuntu/Components/ListItems/Expandable.qml	2014-03-17 16:35:27 +0000
+++ modules/Ubuntu/Components/ListItems/Expandable.qml	2014-04-29 22:09:46 +0000
@@ -14,11 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Expandable
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief An expandable list item with no contents.
     The Expandable class can be used for generic list items containing other
@@ -35,8 +35,8 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.1
+        import Ubuntu.Components.ListItems 1.0 as ListItem
 
         Item {
             ListModel {
 
=== modified file 'modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml'
--- modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2014-02-26 09:46:30 +0000
+++ modules/Ubuntu/Components/ListItems/ExpandablesColumn.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype ExpandablesColumn
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A column to be used together with the \l Expandable item.
     This lays out its content just like a regular Column inside a Flickable but
@@ -29,8 +29,8 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.1
+        import Ubuntu.Components.ListItems 1.0 as ListItem
 
         ListItem.ExpandablesColumn {
             anchors { left: parent.left; right: parent.right }
 
=== modified file 'modules/Ubuntu/Components/ListItems/Header.qml'
--- modules/Ubuntu/Components/ListItems/Header.qml	2013-02-06 11:40:31 +0000
+++ modules/Ubuntu/Components/ListItems/Header.qml	2014-04-29 22:09:46 +0000
@@ -18,13 +18,13 @@
 
 /*!
     \qmltype Header
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief Header for grouping list items together
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.Header { text: "Title" }
             ListItem.Standard { text: "Item one" }
 
=== modified file 'modules/Ubuntu/Components/ListItems/IconVisual.qml'
--- modules/Ubuntu/Components/ListItems/IconVisual.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/ListItems/IconVisual.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 // internal helper class to create the visuals
 // for the icon.
 
=== modified file 'modules/Ubuntu/Components/ListItems/ItemSelector.qml'
--- modules/Ubuntu/Components/ListItems/ItemSelector.qml	2014-02-18 14:23:57 +0000
+++ modules/Ubuntu/Components/ListItems/ItemSelector.qml	2014-04-29 22:09:46 +0000
@@ -16,11 +16,11 @@
 
 import QtQuick 2.0
 import "." as ListItem
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype ItemSelector
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief ListItem displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a
     listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically.
@@ -29,7 +29,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             anchors.left: parent.left
             anchors.right: parent.right
 
=== modified file 'modules/Ubuntu/Components/ListItems/LabelVisual.qml'
--- modules/Ubuntu/Components/ListItems/LabelVisual.qml	2013-08-29 18:47:30 +0000
+++ modules/Ubuntu/Components/ListItems/LabelVisual.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 // internal helper class for text inside the list items.
 Label {
 
=== modified file 'modules/Ubuntu/Components/ListItems/MultiValue.qml'
--- modules/Ubuntu/Components/ListItems/MultiValue.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/ListItems/MultiValue.qml	2014-04-29 22:09:46 +0000
@@ -18,14 +18,14 @@
 
 /*!
     \qmltype MultiValue
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item displaying multiple values.
     \b{This component is under heavy development.}
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.MultiValue {
                 text: "Label"
 
=== modified file 'modules/Ubuntu/Components/ListItems/ProgressionVisual.qml'
--- modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2013-12-09 12:23:15 +0000
+++ modules/Ubuntu/Components/ListItems/ProgressionVisual.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 // Internal helper class for the visuals of
 // the progression symbol.
 
=== modified file 'modules/Ubuntu/Components/ListItems/SingleControl.qml'
--- modules/Ubuntu/Components/ListItems/SingleControl.qml	2013-07-14 20:18:08 +0000
+++ modules/Ubuntu/Components/ListItems/SingleControl.qml	2014-04-29 22:09:46 +0000
@@ -15,19 +15,19 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
 
 /*!
     \qmltype SingleControl
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A list item containing a single control
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.1
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.SingleControl {
                 control: Button {
 
=== modified file 'modules/Ubuntu/Components/ListItems/SingleValue.qml'
--- modules/Ubuntu/Components/ListItems/SingleValue.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/ListItems/SingleValue.qml	2014-04-29 22:09:46 +0000
@@ -18,13 +18,13 @@
 
 /*!
     \qmltype SingleValue
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief A list item displaying a single value
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.SingleValue {
                 text: "Label"
 
=== modified file 'modules/Ubuntu/Components/ListItems/Standard.qml'
--- modules/Ubuntu/Components/ListItems/Standard.qml	2013-11-07 19:45:58 +0000
+++ modules/Ubuntu/Components/ListItems/Standard.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Standard
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief The standard list item class. It shows a basic list item
         with a label (text), and optionally an icon, a progression arrow,
@@ -30,8 +30,8 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.1
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.Standard {
                 text: "Selectable standard list item"
@@ -76,32 +76,6 @@
     property variant icon: iconSource != "" ? iconSource : undefined
 
     /*!
-      The image shown in the list item.
-      \qmlproperty url iconSource
-
-      This is a URL to any image file.
-      In order to use an icon from the Ubuntu theme, use the iconName property instead.
-     */
-    property url iconSource: iconName ? "image://theme/" + iconName : ""
-
-    /*!
-      The icon shown in the list item.
-
-      \qmlproperty string iconName
-
-      If both iconSource and iconName are defined, iconName will be ignored.
-
-      \note The complete list of icons available in Ubuntu is not published yet.
-            For now please refer to the folders where the icon themes are installed:
-            \list
-              \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
-              \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
-            \endlist
-            These 2 separate icon themes will be merged soon.
-    */
-    property string iconName
-
-    /*!
       \preliminary
       The location of the icon to show in the list item if iconSource failed to load (optional).
       \qmlproperty url fallbackIconSource
 
=== modified file 'modules/Ubuntu/Components/ListItems/Subtitled.qml'
--- modules/Ubuntu/Components/ListItems/Subtitled.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/ListItems/Subtitled.qml	2014-04-29 22:09:46 +0000
@@ -15,18 +15,18 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype MultiValue
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item displaying a second string under the main label.
     \b{This component is under heavy development.}
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             ListItem.Subtitled {
                 text: "Idle"
@@ -71,13 +71,6 @@
 
     /*!
       \preliminary
-      The text that is shown in the list item as a label.
-      \qmlproperty string text
-     */
-    property alias text: label.text
-
-    /*!
-      \preliminary
       The list of strings that will be shown under the label text
       \qmlproperty string subText
      */
@@ -94,6 +87,7 @@
 
         LabelVisual {
             id: label
+            text: subtitledListItem.text
             selected: subtitledListItem.selected
             anchors {
                 top: parent.top
 
=== modified file 'modules/Ubuntu/Components/ListItems/ThinDivider.qml'
--- modules/Ubuntu/Components/ListItems/ThinDivider.qml	2013-11-19 08:51:02 +0000
+++ modules/Ubuntu/Components/ListItems/ThinDivider.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ThinDivider
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief Narrow line used as a divider between ListItems.
 
@@ -29,7 +29,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             width: 250
             ListItem.ThinDivider {} //can be used as header for list
 
=== modified file 'modules/Ubuntu/Components/ListItems/ValueSelector.qml'
--- modules/Ubuntu/Components/ListItems/ValueSelector.qml	2013-11-06 22:52:15 +0000
+++ modules/Ubuntu/Components/ListItems/ValueSelector.qml	2014-04-29 22:09:46 +0000
@@ -15,13 +15,13 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     ****DEPRECATED! PLEASE USE ITEM SELECTOR OR FOR THE UBUNTU SHAPE VERSION THE OPTION SELECTOR.****
 
     \qmltype ValueSelector
-    \inqmlmodule Ubuntu.Components.ListItems 0.1
+    \inqmlmodule Ubuntu.Components.ListItems 1.0
     \ingroup ubuntu-listitems
     \brief List item displaying single selected value when not expanded,
     where expanding it opens a listing of all the possible values for selection.
@@ -30,7 +30,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components.ListItems 1.0 as ListItem
         Column {
             width: 250
             ListItem.ValueSelector {
@@ -80,32 +80,6 @@
     property alias icon: selectorMain.icon
 
     /*!
-      The image shown in the list item.
-      \qmlproperty url iconSource
-
-      This is a URL to any image file.
-      In order to use an icon from the Ubuntu theme, use the iconName property instead.
-     */
-    property url iconSource: iconName ? "image://theme/" + iconName : ""
-
-    /*!
-      The icon shown in the list item.
-
-      \qmlproperty string iconName
-
-      If both iconSource and iconName are defined, iconName will be ignored.
-
-      \note The complete list of icons available in Ubuntu is not published yet.
-            For now please refer to the folders where the icon themes are installed:
-            \list
-              \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
-              \li Ubuntu Desktop: \l file:/usr/share/icons/ubuntu-mono-dark
-            \endlist
-            These 2 separate icon themes will be merged soon.
-    */
-    property string iconName
-
-    /*!
       \preliminary
       The location of the icon to show in the list item if iconSource failed to load (optional).
       \qmlproperty url fallbackIconSource
 
=== modified file 'modules/Ubuntu/Components/ListItems/qmldir'
--- modules/Ubuntu/Components/ListItems/qmldir	2014-02-13 11:33:09 +0000
+++ modules/Ubuntu/Components/ListItems/qmldir	2014-04-29 22:09:46 +0000
@@ -1,3 +1,4 @@
+module Ubuntu.Components.ListItems
 Empty 0.1 Empty.qml
 Base 0.1 Base.qml
 Caption 0.1 Caption.qml
@@ -16,3 +17,20 @@
 ThinDivider 0.1 ThinDivider.qml
 Expandable 0.1 Expandable.qml
 ExpandablesColumn 0.1 ExpandablesColumn.qml
+
+#version 1.0
+Empty 1.0 Empty.qml
+Base 1.0 Base.qml
+Caption 1.0 Caption.qml
+Divider 1.0 Divider.qml
+Header 1.0 Header.qml
+MultiValue 1.0 MultiValue.qml
+ItemSelector 1.0 ItemSelector.qml
+ValueSelector 1.0 ValueSelector.qml
+SingleValue 1.0 SingleValue.qml
+Standard 1.0 Standard.qml
+Subtitled 1.0 Subtitled.qml
+SingleControl 1.0 SingleControl.qml
+ThinDivider 1.0 ThinDivider.qml
+Expandable 1.0 Expandable.qml
+ExpandablesColumn 1.0 ExpandablesColumn.qml
 
=== modified file 'modules/Ubuntu/Components/MainView.qml'
--- modules/Ubuntu/Components/MainView.qml	2014-04-04 11:03:45 +0000
+++ modules/Ubuntu/Components/MainView.qml	2014-04-29 22:09:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2013 Canonical Ltd.
+ * Copyright 2012-2014 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -16,12 +16,12 @@
 
 import QtQuick 2.0
 import Ubuntu.Unity.Action 1.1 as UnityActions
-import Ubuntu.PerformanceMetrics 0.1
+import Ubuntu.PerformanceMetrics 1.0
 import QtQuick.Window 2.0
 
 /*!
     \qmltype MainView
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief MainView is the root Item that should be used for all applications.
         It automatically adds a header and toolbar for its contents and can
@@ -30,7 +30,7 @@
     The simplest way to use a MainView is to include a \l Page object inside the MainView:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.1
 
         MainView {
             width: units.gu(48)
@@ -57,7 +57,7 @@
     will automatically hide and show when the user scrolls up or down:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.1
 
         MainView {
             width: units.gu(48)
@@ -89,7 +89,7 @@
     A toolbar can be added to the application by setting the tools property of the \l Page:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.1
 
         MainView {
             width: units.gu(48)
@@ -169,7 +169,7 @@
       the content:
       \qml
           import QtQuick 2.0
-          import Ubuntu.Components 0.1
+          import Ubuntu.Components 1.1
 
           MainView {
               width: units.gu(40)
@@ -349,12 +349,9 @@
             Binding {
                 target: headerItem
                 property: "tabBar"
-                value: headerItem.contents
-                when: headerItem.contents &&
-                      headerItem.contents.hasOwnProperty("selectionMode") &&
-                      headerItem.contents.hasOwnProperty("alwaysSelectionMode") &&
-                      headerItem.contents.hasOwnProperty("selectedIndex") &&
-                      headerItem.contents.hasOwnProperty("pressed")
+                value: headerItem.__styleInstance.__tabBar
+                when: headerItem.__styleInstance &&
+                      headerItem.__styleInstance.hasOwnProperty("__tabBar")
             }
 
             Connections {
@@ -383,6 +380,8 @@
                         window.title = headerItem.title
                 }
             }
+
+            useDeprecatedToolbar: mainView.useDeprecatedToolbar
         }
 
         Connections {
@@ -451,6 +450,12 @@
 
         /*!
           \internal
+          Tabs needs to know whether to use a TabBar or the new header.
+         */
+        property alias useDeprecatedToolbar: mainView.useDeprecatedToolbar
+
+        /*!
+          \internal
           The action manager that has the global context for the MainView's actions,
           and to which a local context can be added for each Page that has actions.actions.
          */
 
=== modified file 'modules/Ubuntu/Components/Object.qml'
--- modules/Ubuntu/Components/Object.qml	2012-11-14 11:01:37 +0000
+++ modules/Ubuntu/Components/Object.qml	2014-04-29 22:09:46 +0000
@@ -19,7 +19,7 @@
 /*!
     \qmltype Object
     \internal
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Internal type used for lightweight objects that can have children.
 */
 
=== modified file 'modules/Ubuntu/Components/OptionSelector.qml'
--- modules/Ubuntu/Components/OptionSelector.qml	2013-12-13 15:50:35 +0000
+++ modules/Ubuntu/Components/OptionSelector.qml	2014-04-29 22:09:46 +0000
@@ -16,11 +16,11 @@
 
 import QtQuick 2.0
 import "ListItems" as ListItem
-import Ubuntu.Components 0.1 as Toolkit
+import Ubuntu.Components 1.1 as Toolkit
 
 /*!
     \qmltype OptionSelector
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu-components
     \brief Component displaying either a single selected value or expanded multiple choice with an optional image and subtext when not expanded, when expanding it opens a
     listing of all the possible values for selection with an additional option of always being expanded. If multiple choice is selected the list is expanded automatically.
@@ -29,7 +29,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.1
         Column {
             spacing: units.gu(3)
 
 
=== modified file 'modules/Ubuntu/Components/OptionSelectorDelegate.qml'
--- modules/Ubuntu/Components/OptionSelectorDelegate.qml	2014-03-04 12:16:38 +0000
+++ modules/Ubuntu/Components/OptionSelectorDelegate.qml	2014-04-29 22:09:46 +0000
@@ -16,7 +16,7 @@
 
 /*!
     \qmltype OptionSelectorDelegate
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu-components
     \brief OptionSelector delegate which can display text, subtext and an image from a custom model.
 
@@ -24,7 +24,7 @@
 
     Examples:
     \qml
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.1
         Column {
             width: 250
             OptionSelector {
@@ -45,21 +45,15 @@
 
 import QtQuick 2.0
 import "ListItems" as ListItem
-import Ubuntu.Components 0.1 as Toolkit
+import Ubuntu.Components 1.1 as Toolkit
 
-ListItem.Standard {
+ListItem.Empty {
     id: option
 
     __height: units.gu(5)
 
     /*!
       \preliminary
-      Main text.
-     */
-    property string text
-
-    /*!
-      \preliminary
       Subtext which appears below the main text.
      */
     property string subText
@@ -78,30 +72,6 @@
                    }
 
     /*!
-      The image shown for that option.
-      \qmlproperty url iconSource
-
-      This is a URL to any image file.
-      In order to use an icon from the Ubuntu theme, use the iconName property instead.
-     */
-    property url iconSource: iconName ? "image://theme/" + iconName : ""
-
-    /*!
-      The icon shown for that option.
-
-      \qmlproperty string iconName
-
-      If both iconSource and iconName are defined, iconName will be ignored.
-
-      \note The complete list of icons available in Ubuntu is not published yet.
-            For now please refer to the folders where the icon theme is installed:
-            \list
-              \li Ubuntu Touch: \l file:/usr/share/icons/ubuntu-mobile
-            \endlist
-    */
-    property string iconName
-
-    /*!
       \preliminary
       Constrains the size of the image to nothing greater than that of the delegate. Changes fillMode to Image.PreserveAspectFit.
      */
@@ -337,7 +307,7 @@
             objectName: "icon"
 
             height: constrainImage ? option.height : sourceSize.height
-            source: icon
+            source: option.iconSource
             fillMode: constrainImage ? Image.PreserveAspectFit : Image.Stretch
 
             ShaderEffect {
 
=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2013-11-27 11:15:17 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2014-04-29 22:09:46 +0000
@@ -16,11 +16,11 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import Ubuntu.Components 0.1 as Ubuntu
+import Ubuntu.Components 1.0
 
 /*!
     \qmltype OrientationHelper
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The OrientationHelper automatically rotates its children following the
            orientation of the device.
@@ -188,8 +188,8 @@
                     RotationAnimation {
                         target: orientationHelper
                         properties: "rotation"
-                        duration: Ubuntu.UbuntuAnimation.FastDuration
-                        easing: Ubuntu.UbuntuAnimation.StandardEasing
+                        duration: UbuntuAnimation.FastDuration
+                        easing: UbuntuAnimation.StandardEasing
                         direction: RotationAnimation.Shortest
                     }
                 }
 
=== modified file 'modules/Ubuntu/Components/Page.qml'
--- modules/Ubuntu/Components/Page.qml	2014-04-07 10:03:39 +0000
+++ modules/Ubuntu/Components/Page.qml	2014-04-29 22:09:46 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012 Canonical Ltd.
+ * Copyright 2012-2014 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype Page
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief A page is the basic Item that must be used inside the \l MainView,
         \l PageStack and \l Tabs.
@@ -33,7 +33,7 @@
 
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.1
 
         MainView {
             width: units.gu(48)
@@ -94,7 +94,7 @@
       and anchors to the top of the page or fills the page. For example:
       \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.1
 
         MainView {
             width: units.gu(30)
@@ -151,6 +151,13 @@
     Object {
         id: internal
 
+        Binding {
+            target: internal.header
+            property: "pageStack"
+            value: page.pageStack
+            when: page.active && internal.header != null && page.pageStack != null
+        }
+
         UnityActions.ActionContext {
             id: actionContext
 
 
=== modified file 'modules/Ubuntu/Components/PageStack.qml'
--- modules/Ubuntu/Components/PageStack.qml	2013-08-22 17:15:35 +0000
+++ modules/Ubuntu/Components/PageStack.qml	2014-04-29 22:09:46 +0000
@@ -19,7 +19,7 @@
 
 /*!
     \qmltype PageStack
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief A stack of \l Page items that is used for inter-Page navigation.
         Pages on the stack can be popped, and new Pages can be pushed.
@@ -39,8 +39,8 @@
     Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.1
+        import Ubuntu.Components.ListItems 1.0 as ListItem
 
         MainView {
             width: units.gu(48)
 
=== modified file 'modules/Ubuntu/Components/PageTreeNode.qml'
--- modules/Ubuntu/Components/PageTreeNode.qml	2013-07-18 16:42:06 +0000
+++ modules/Ubuntu/Components/PageTreeNode.qml	2014-04-29 22:09:46 +0000
@@ -19,7 +19,7 @@
 /*!
     \internal
     \qmltype PageTreeNode
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The common parent of \l Page, \l MainView, \l PageStack and \l Tabs.
 
 
=== modified file 'modules/Ubuntu/Components/PageWrapper.qml'
--- modules/Ubuntu/Components/PageWrapper.qml	2013-03-11 16:20:14 +0000
+++ modules/Ubuntu/Components/PageWrapper.qml	2014-04-29 22:09:46 +0000
@@ -20,7 +20,7 @@
 /*!
     \internal
     \qmltype PageWrapper
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Internal class used by \l PageStack
 
 
=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2014-04-02 09:47:42 +0000
+++ modules/Ubuntu/Components/Panel.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1 as Toolkit
+import Ubuntu.Components 1.1 as Toolkit
 
 /*!
     \qmltype Panel
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief A panel that can be swiped in and out from an edge of the window by the user.
     For most applications, it is highly recommended to use the \l MainView instead which includes
@@ -38,7 +38,7 @@
     A black panel that can be swiped in from the lower-right of the window can be created like this:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.1
 
         Item {
             width: units.gu(80)
@@ -69,7 +69,7 @@
     A panel that looks like the standard (bottom-aligned) toolbar, but with custom contents, can be created like this:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.1
 
         Item {
             width: units.gu(80)
@@ -106,7 +106,7 @@
     signals are forwarded from the panel by calling the child's trigger() function. Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.1
 
         Rectangle {
             color: Theme.palette.normal.background
@@ -583,8 +583,9 @@
         }
 
         onEntered: {
-            // panel.__openOnHover
-            panel.open();
+            if (panel.__openOnHover) {
+                panel.open();
+            }
             hideTimer.stop();
         }
 
 
=== modified file 'modules/Ubuntu/Components/Pickers/DatePicker.qml'
--- modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-03-06 10:46:17 +0000
+++ modules/Ubuntu/Components/Pickers/DatePicker.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype DatePicker
-    \inqmlmodule Ubuntu.Components.Pickers 0.1
+    \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief DatePicker component provides date and time value picking functionality.
 
@@ -36,8 +36,8 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
-    import Ubuntu.Components.Pickers 0.1
+    import Ubuntu.Components 1.1
+    import Ubuntu.Components.Pickers 1.0
 
     Column {
         Label {
@@ -56,8 +56,8 @@
     which shows only year and month date units would look as follows:
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
-    import Ubuntu.Components.Pickers 0.1
+    import Ubuntu.Components 1.1
+    import Ubuntu.Components.Pickers 1.0
 
     Column {
         Label {
@@ -75,8 +75,8 @@
     The following example demonstrates how to use DatePicker for time picking.
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
-    import Ubuntu.Components.Pickers 0.1
+    import Ubuntu.Components 1.1
+    import Ubuntu.Components.Pickers 1.0
 
     Column {
         Label {
@@ -112,8 +112,8 @@
     \endlist
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
-    import Ubuntu.Components.Pickers 0.1
+    import Ubuntu.Components 1.1
+    import Ubuntu.Components.Pickers 1.0
 
     Column {
         Label {
 
=== modified file 'modules/Ubuntu/Components/Pickers/DayModel.qml'
--- modules/Ubuntu/Components/Pickers/DayModel.qml	2013-12-10 16:52:07 +0000
+++ modules/Ubuntu/Components/Pickers/DayModel.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 PickerModelBase {
     circular: true
 
=== modified file 'modules/Ubuntu/Components/Pickers/Dialer.qml'
--- modules/Ubuntu/Components/Pickers/Dialer.qml	2013-09-24 10:42:52 +0000
+++ modules/Ubuntu/Components/Pickers/Dialer.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import "../" 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Dialer
-    \inqmlmodule Ubuntu.Components.Pickers 0.1
+    \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief Dialer is a phone dialer style picker component.
 
@@ -35,7 +35,7 @@
 
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components.Pickers 0.1
+    import Ubuntu.Components.Pickers 1.0
 
     Dialer {
         size: units.gu(20)
 
=== modified file 'modules/Ubuntu/Components/Pickers/DialerHand.qml'
--- modules/Ubuntu/Components/Pickers/DialerHand.qml	2013-09-24 11:02:17 +0000
+++ modules/Ubuntu/Components/Pickers/DialerHand.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import "../" 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype DialerHand
-    \inqmlmodule Ubuntu.Components.Pickers 0.1
+    \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief DialerHand represents a value selector on a Dialer.
 
 
=== modified file 'modules/Ubuntu/Components/Pickers/DialerHandGroup.qml'
--- modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2013-09-12 09:19:28 +0000
+++ modules/Ubuntu/Components/Pickers/DialerHandGroup.qml	2014-04-29 22:09:46 +0000
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.0
-import "../" 0.1
+import Ubuntu.Components 1.1
 
 /*!
   \internal
 
=== modified file 'modules/Ubuntu/Components/Pickers/HoursModel.qml'
--- modules/Ubuntu/Components/Pickers/HoursModel.qml	2013-12-16 13:01:41 +0000
+++ modules/Ubuntu/Components/Pickers/HoursModel.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 PickerModelBase {
     property int from
 
=== modified file 'modules/Ubuntu/Components/Pickers/MinutesModel.qml'
--- modules/Ubuntu/Components/Pickers/MinutesModel.qml	2013-12-13 11:22:51 +0000
+++ modules/Ubuntu/Components/Pickers/MinutesModel.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 PickerModelBase {
     property int from
 
=== modified file 'modules/Ubuntu/Components/Pickers/MonthModel.qml'
--- modules/Ubuntu/Components/Pickers/MonthModel.qml	2013-12-13 11:22:51 +0000
+++ modules/Ubuntu/Components/Pickers/MonthModel.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 PickerModelBase {
     circular: (count >= 11)
 
=== modified file 'modules/Ubuntu/Components/Pickers/Picker.qml'
--- modules/Ubuntu/Components/Pickers/Picker.qml	2014-03-06 10:46:17 +0000
+++ modules/Ubuntu/Components/Pickers/Picker.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Picker
-    \inqmlmodule Ubuntu.Components.Pickers 0.1
+    \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief Picker is a slot-machine style value selection component.
 
@@ -35,8 +35,8 @@
     Example:
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
-    import Ubuntu.Components.Pickers 0.1
+    import Ubuntu.Components 1.1
+    import Ubuntu.Components.Pickers 1.0
 
     Picker {
         model: ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"]
 
=== modified file 'modules/Ubuntu/Components/Pickers/PickerDelegate.qml'
--- modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2014-03-06 10:46:17 +0000
+++ modules/Ubuntu/Components/Pickers/PickerDelegate.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import "../" 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype PickerDelegate
-    \inqmlmodule Ubuntu.Components.Pickers 0.1
+    \inqmlmodule Ubuntu.Components.Pickers 1.0
     \ingroup ubuntu-pickers
     \brief PickerDelegate component serves as base for Picker delegates.
 
 
=== modified file 'modules/Ubuntu/Components/Pickers/PickerPanel.qml'
--- modules/Ubuntu/Components/Pickers/PickerPanel.qml	2014-02-19 10:36:14 +0000
+++ modules/Ubuntu/Components/Pickers/PickerPanel.qml	2014-04-29 22:09:46 +0000
@@ -16,13 +16,13 @@
 
 import QtQuick 2.0
 import QtQuick.Window 2.0
-import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
+import Ubuntu.Components.Popups 1.0
 
 /*!
     \qmltype PickerPanel
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu-pickers
     \brief Provides a panel for opening a DatePicker in place of the input panel or
     as Popover, depending on the form factor.
@@ -32,7 +32,7 @@
     on date pickers.
     \qml
     import QtQuick 2.0
-    import Ubuntu.Components 0.1
+    import Ubuntu.Components 1.1
 
     MainWindow {
         width: units.gu(40)
 
=== modified file 'modules/Ubuntu/Components/Pickers/PickerRow.qml'
--- modules/Ubuntu/Components/Pickers/PickerRow.qml	2014-03-06 10:46:17 +0000
+++ modules/Ubuntu/Components/Pickers/PickerRow.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Row {
     id: row
 
=== modified file 'modules/Ubuntu/Components/Pickers/SecondsModel.qml'
--- modules/Ubuntu/Components/Pickers/SecondsModel.qml	2013-12-13 11:22:51 +0000
+++ modules/Ubuntu/Components/Pickers/SecondsModel.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 PickerModelBase {
     property int from
 
=== modified file 'modules/Ubuntu/Components/Pickers/YearModel.qml'
--- modules/Ubuntu/Components/Pickers/YearModel.qml	2013-12-13 11:22:51 +0000
+++ modules/Ubuntu/Components/Pickers/YearModel.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 PickerModelBase {
     // local properties
 
=== modified file 'modules/Ubuntu/Components/Pickers/qmldir'
--- modules/Ubuntu/Components/Pickers/qmldir	2013-12-10 16:37:04 +0000
+++ modules/Ubuntu/Components/Pickers/qmldir	2014-04-29 22:09:46 +0000
@@ -8,3 +8,10 @@
 internal MonthModel MonthModel.qml
 internal DayModel DayModel.qml
 internal PickerModelBase PickerModelBase.qml
+
+#version 1.0
+Picker 1.0 Picker.qml
+PickerDelegate 1.0 PickerDelegate.qml
+Dialer 1.0 Dialer.qml
+DialerHand 1.0 DialerHand.qml
+DatePicker 1.0 DatePicker.qml
 
=== modified file 'modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml'
--- modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2013-08-07 12:50:35 +0000
+++ modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml	2014-04-29 22:09:46 +0000
@@ -15,13 +15,13 @@
  */
 
 import QtQuick 2.0
-import "../" 0.1
-import "../ListItems" 0.1
+import Ubuntu.Components 1.1
+import Ubuntu.Components.ListItems 1.0
 
 /*!
     \qmltype ActionSelectionPopover
     \inherits Popover
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief A special popover presenting actions to the user. The popover is closed
         automatically when the action is chosen.
 
=== modified file 'modules/Ubuntu/Components/Popups/ComposerSheet.qml'
--- modules/Ubuntu/Components/Popups/ComposerSheet.qml	2013-11-05 00:34:46 +0000
+++ modules/Ubuntu/Components/Popups/ComposerSheet.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 /*!
     \qmltype ComposerSheet
     \inherits SheetBase
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief Much like the \l DefaultSheet the Composer Sheet allows an application to insert a content
         view over the focused view without disrupting the navigation pattern. However the Composer Sheet
@@ -31,8 +31,8 @@
 
     Example:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.Popups 0.1
+        import Ubuntu.Components 1.1
+        import Ubuntu.Components.Popups 1.0
 
         Item {
             Component {
 
=== modified file 'modules/Ubuntu/Components/Popups/DefaultSheet.qml'
--- modules/Ubuntu/Components/Popups/DefaultSheet.qml	2013-07-01 05:54:33 +0000
+++ modules/Ubuntu/Components/Popups/DefaultSheet.qml	2014-04-29 22:09:46 +0000
@@ -15,12 +15,12 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype DefaultSheet
     \inherits SheetBase
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief The Default Sheet allows an application to insert a content view over the focused view
         without disrupting the navigation pattern (tabs state or drill-down path are maintained. When
@@ -32,8 +32,8 @@
 
     Example:
     \qml
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.Popups 0.1
+        import Ubuntu.Components 1.1
+        import Ubuntu.Components.Popups 1.0
 
         Item {
             Component {
 
=== modified file 'modules/Ubuntu/Components/Popups/Dialog.qml'
--- modules/Ubuntu/Components/Popups/Dialog.qml	2013-07-15 10:28:04 +0000
+++ modules/Ubuntu/Components/Popups/Dialog.qml	2014-04-29 22:09:46 +0000
@@ -15,13 +15,13 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import "internalPopupUtils.js" as InternalPopupUtils
 
 /*!
     \qmltype Dialog
     \inherits PopupBase
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief The Dialog caters for cases in which the application requires the user to determine
         between optional actions. The Dialog will interrupt the user flow and lock the view
@@ -33,8 +33,8 @@
     Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.Popups 0.1
+        import Ubuntu.Components 1.1
+        import Ubuntu.Components.Popups 1.0
 
         Item {
             width: units.gu(80)
 
=== modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
--- modules/Ubuntu/Components/Popups/Popover.qml	2014-01-10 15:34:32 +0000
+++ modules/Ubuntu/Components/Popups/Popover.qml	2014-04-29 22:09:46 +0000
@@ -16,12 +16,12 @@
 
 import QtQuick 2.0
 import "internalPopupUtils.js" as InternalPopupUtils
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype Popover
     \inherits PopupBase
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief A popover allows an application to present additional content without changing the view.
         A popover has a fixed width and automatic height, depending on is contents.
@@ -32,9 +32,9 @@
     Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
-        import Ubuntu.Components.Popups 0.1
+        import Ubuntu.Components 1.1
+        import Ubuntu.Components.ListItems 1.0 as ListItem
+        import Ubuntu.Components.Popups 1.0
 
         Rectangle {
             color: Theme.palette.normal.background
@@ -204,6 +204,7 @@
 
     StyledItem {
         id: foreground
+        objectName: "popover_foreground"
 
         //styling properties
         property real minimumWidth: units.gu(40)
 
=== modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
--- modules/Ubuntu/Components/Popups/PopupBase.qml	2014-01-08 16:32:38 +0000
+++ modules/Ubuntu/Components/Popups/PopupBase.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype PopupBase
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief The base class for all dialogs, sheets and popovers. Do not use directly.
 
@@ -142,6 +142,7 @@
     InverseMouseArea {
         id: eventGrabber
         enabled: true
+        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
         anchors.fill: __foreground
         sensingArea: dismissArea
         propagateComposedEvents: !grabDismissAreaEvents
 
=== modified file 'modules/Ubuntu/Components/Popups/SheetBase.qml'
--- modules/Ubuntu/Components/Popups/SheetBase.qml	2013-06-27 15:20:12 +0000
+++ modules/Ubuntu/Components/Popups/SheetBase.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,11 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 /*!
     \qmltype SheetBase
-    \inqmlmodule Ubuntu.Components.Popups 0.1
+    \inqmlmodule Ubuntu.Components.Popups 1.0
     \ingroup ubuntu-popups
     \brief Parent class of different types of sheets. Not to be used directly.
 
 
=== modified file 'modules/Ubuntu/Components/Popups/qmldir'
--- modules/Ubuntu/Components/Popups/qmldir	2013-07-13 14:35:21 +0000
+++ modules/Ubuntu/Components/Popups/qmldir	2014-04-29 22:09:46 +0000
@@ -9,3 +9,14 @@
 ActionSelectionPopover 0.1 ActionSelectionPopover.qml
 
 PopupUtils 0.1 popupUtils.js
+
+#version 1.0
+Dialog 1.0 Dialog.qml
+PopupBase 1.0 PopupBase.qml
+Popover 1.0 Popover.qml
+SheetBase 1.0 SheetBase.qml
+DefaultSheet 1.0 DefaultSheet.qml
+ComposerSheet 1.0 ComposerSheet.qml
+ActionSelectionPopover 1.0 ActionSelectionPopover.qml
+
+PopupUtils 1.0 popupUtils.js
 
=== modified file 'modules/Ubuntu/Components/ProgressBar.qml'
--- modules/Ubuntu/Components/ProgressBar.qml	2013-08-01 14:06:36 +0000
+++ modules/Ubuntu/Components/ProgressBar.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ProgressBar
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The ProgressBar component visually indicates the progress of a process of
     determinate or indeterminate duration.
 
=== modified file 'modules/Ubuntu/Components/Scrollbar.qml'
--- modules/Ubuntu/Components/Scrollbar.qml	2013-06-27 15:20:12 +0000
+++ modules/Ubuntu/Components/Scrollbar.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype ScrollBar
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The ScrollBar component provides scrolling functionality for
     scrollable views (i.e. Flickable, ListView).
 
=== modified file 'modules/Ubuntu/Components/Slider.qml'
--- modules/Ubuntu/Components/Slider.qml	2014-01-08 16:32:38 +0000
+++ modules/Ubuntu/Components/Slider.qml	2014-04-29 22:09:46 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype Slider
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Slider is a component to select a value from a continuous range of
      values.
 
=== modified file 'modules/Ubuntu/Components/StyledItem.qml'
--- modules/Ubuntu/Components/StyledItem.qml	2013-06-27 15:36:28 +0000
+++ modules/Ubuntu/Components/StyledItem.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmlabstract StyledItem
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup theming
     \brief The StyledItem class allows items to be styled by the theme.
 
 
=== modified file 'modules/Ubuntu/Components/Switch.qml'
--- modules/Ubuntu/Components/Switch.qml	2013-06-27 15:20:12 +0000
+++ modules/Ubuntu/Components/Switch.qml	2014-04-29 22:09:46 +0000
@@ -21,7 +21,7 @@
 
 /*!
     \qmltype Switch
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Switch is a component with two states, checked or unchecked. It can
     be used to set boolean options. The behavior is the same as \l CheckBox, the
 
=== modified file 'modules/Ubuntu/Components/Tab.qml'
--- modules/Ubuntu/Components/Tab.qml	2013-11-07 07:26:01 +0000
+++ modules/Ubuntu/Components/Tab.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Tab
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Component to represent a single tab in a \l Tabs environment.
 
 
=== modified file 'modules/Ubuntu/Components/TabBar.qml'
--- modules/Ubuntu/Components/TabBar.qml	2014-04-08 12:38:35 +0000
+++ modules/Ubuntu/Components/TabBar.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype TabBar
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief Tab bar that will be shown in the header when \l Tabs is active.
         This component does not need to be instantiated by the developer, it is
@@ -63,8 +63,18 @@
 
     /*!
       The property holds the index of the selected Tab item.
+      Note: Setting this property is DEPRECATED. Set the selectedIndex of the model instead.
       */
-    property int selectedIndex: (model && internal.modelChecked && model.count > 0) ? 0 : -1
+    property int selectedIndex: (model && internal.modelChecked) ? model.selectedIndex : -1
+
+    /*! \internal */
+    onSelectedIndexChanged: {
+        if (!model) return;
+        if (tabBar.selectedIndex !== model.selectedIndex) {
+            console.warn("Setting TabBar.selectedIndex is DEPRECATED. Set selectedIndex of the model instead");
+            tabBar.selectedIndex = Qt.binding(function() { return (model && internal.modelChecked) ? model.selectedIndex : -1 });
+        }
+    }
 
     /*!
       Do not deactivate the tab bar after a specified idle time or when the user selects a new tab.
@@ -93,20 +103,24 @@
 
         property bool modelChecked: true;
 
+        // returns true if the roles are good, false otherwise.
         function checkRoles() {
             if (tabBar.model.count <= 0)
-                return;
+                return false;
 
             modelChecked = true;
             var f = tabBar.model.get(0);
             if (f.tab === undefined && f.title === undefined) {
                 console.error("TabBar model must provide either tab or title role.");
                 tabBar.model = null;
+                return false;
             }
             if (f.tab !== undefined && f.tab.title === undefined) {
                 console.error("TabBar model's tab role must have title property.");
                 tabBar.model = null;
+                return false;
             }
+            return true;
         }
     }
 
@@ -117,6 +131,12 @@
         if (!model)
             return;
 
+        if (!model.hasOwnProperty("selectedIndex")) {
+            console.error("TabBar model must have selectedIndex property defined.");
+            tabBar.model = null;
+            return;
+        }
+
         if (!model.hasOwnProperty("count")) {
             console.error("TabBar model must have count property defined.");
             tabBar.model = null;
@@ -130,11 +150,11 @@
         }
 
         if (model.count > 0) {
-            internal.checkRoles();
-            tabBar.selectedIndex = Math.max(Math.min(tabBar.selectedIndex, model.count - 1), 0);
+            if (internal.checkRoles()) {
+                model.selectedIndex = Math.max(Math.min(tabBar.selectedIndex, model.count - 1), 0);
+            }
         } else {
             internal.modelChecked = false;
-            tabBar.selectedIndex = Qt.binding(function() { return (model && internal.modelChecked && model.count > 0) ? 0 : -1 })
         }
     }
 
 
=== modified file 'modules/Ubuntu/Components/Tabs.qml'
--- modules/Ubuntu/Components/Tabs.qml	2014-04-08 12:38:35 +0000
+++ modules/Ubuntu/Components/Tabs.qml	2014-04-29 22:09:46 +0000
@@ -18,7 +18,7 @@
 
 /*!
     \qmltype Tabs
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The Tabs class provides an environment where multible \l Tab
     children can be added, and the user is presented with a tab
@@ -33,8 +33,8 @@
     Example:
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
-        import Ubuntu.Components.ListItems 0.1 as ListItem
+        import Ubuntu.Components 1.1
+        import Ubuntu.Components.ListItems 1.0 as ListItem
 
         MainView {
             width: units.gu(48)
@@ -104,7 +104,7 @@
 
     \qml
         import QtQuick 2.0
-        import Ubuntu.Components 0.1
+        import Ubuntu.Components 1.1
 
         MainView {
             id: mainView
@@ -161,7 +161,7 @@
       The first tab is 0, and -1 means that no tab is selected.
       The initial value is 0 if Tabs has contents, or -1 otherwise.
      */
-    property alias selectedTabIndex: bar.selectedIndex
+    property alias selectedTabIndex: tabsModel.selectedIndex
 
     /*!
       \preliminary
@@ -176,14 +176,14 @@
     readonly property Item currentPage: selectedTab ? selectedTab.page : null
 
     /*!
+      \deprecated
       The \l TabBar that will be shown in the header
       and provides scrollable tab buttons.
+      This property is DEPRECATED. TabBar is now part of the header style.
      */
-    property TabBar tabBar: TabBar {
-        id: bar
-        model: tabsModel
-        visible: tabs.active
-    }
+    property TabBar tabBar: internal.header && internal.header.__styleInstance &&
+                            internal.header.__styleInstance.hasOwnProperty("__tabBar") ?
+                                internal.header.__styleInstance.__tabBar : null
 
     /*!
       Children are placed in a separate item that has functionality to extract the Tab items.
@@ -207,11 +207,24 @@
 
     /*!
       \internal
+      tst_tabs.qml needs access to the model to verify that Repeaters inside Tabs works.
+     */
+    property var __model: tabsModel
+
+    /*!
+      \internal
       required by TabsStyle
      */
     ListModel {
         id: tabsModel
 
+        property bool updateDisabled: false
+
+        /*!
+          The index of the selected tab.
+         */
+        property int selectedIndex: tabsModel.count > 0 ? 0 : -1
+
         function listModel(tab) {
             return {"title": tab.title, "tab": tab};
         }
@@ -292,13 +305,6 @@
         id: internal
         property Header header: tabs.__propagated ? tabs.__propagated.header : null
 
-        Binding {
-            target: tabBar
-            property: "animate"
-            when: internal.header && internal.header.hasOwnProperty("animate")
-            value: internal.header.animate
-        }
-
         /*
           List of connected Repeaters to avoid repeater "hammering" of itemAdded() signal.
           */
@@ -439,8 +445,8 @@
 
     Binding {
         target: internal.header
-        property: "contents"
-        value: tabs.active ? tabs.tabBar: null
+        property: "tabsModel"
+        value: tabsModel
         when: internal.header && tabs.active
     }
 }
 
=== modified file 'modules/Ubuntu/Components/TextArea.qml'
--- modules/Ubuntu/Components/TextArea.qml	2014-01-08 16:32:38 +0000
+++ modules/Ubuntu/Components/TextArea.qml	2014-04-29 22:09:46 +0000
@@ -15,11 +15,12 @@
  */
 
 import QtQuick 2.0
+import Ubuntu.Components 1.1 as Ubuntu
 import "mathUtils.js" as MathUtils
 
 /*!
     \qmltype TextArea
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The TextArea item displays a block of editable, scrollable, formatted
     text.
@@ -60,19 +61,34 @@
     mode and 4 lines on fixed-mode. The line size is calculated from the font size and the
     ovarlay and frame spacing specified in the style.
 
+    \section2 Scrolling and text selection
+    The input is activated when the tap or mouse is released after being pressed
+    over the component.
+
     Scrolling the editing area can happen when the size is fixed or in auto-sizing mode when
     the content size is bigger than the visible area. The scrolling is realized by swipe
     gestures, or by navigating the cursor.
 
-    The item enters in selection mode when the user performs a long tap (or long mouse press)
-    or a double tap/press on the text area. The mode is visualized by two selection cursors
-    (pins) which can be used to select the desired text. The text can also be selected by
-    moving the finger/mouse towards the desired area right after entering in selection mode.
-    The way the text is selected is driven by the mouseSelectionMode value, which is either
-    character or word. The editor leaves the selection mode by pressing/tapping again on it
-    or by losing focus.
-
-    \b{This component is under heavy development.}
+    The content can be selected in the following ways:
+    \list
+    \li - double tapping/left mouse clicking over the content, when the word that
+          had been tapped over will be selected
+    \li - by pressing and dragging the selection cursor over the text input. Note
+          that there has to be a delay of approx. 200 ms between the press and drag
+          gesture, time when the input switches from scroll mode to selection mode
+    \endlist
+
+    The input is focused (activated) upon tap/left mouse button release. The cursor
+    will be placed at the position the mouse/tap point at release time. If the click
+    is happening on a selected area, the selection will be cleared. Long press above
+    a selected area brings up the clipboard context menu. When the long press happens
+    over a non-selected area, the cursor will be moved to the position and the component
+    enters in selection mode. The selection mode can also be activated by tapping and
+    keeping the tap/mouse over for approx 300 ms. If there is a move during this time,
+    the component enters into scrolling mode. The mode is exited once the scrolling
+    finishes. During the scrolling mode the selected text is preserved.
+
+    \note During text selection all interactive parent Flickables are turned off.
   */
 
 StyledItem {
@@ -708,7 +724,7 @@
     */
     function forceActiveFocus()
     {
-        internal.activateEditor();
+        inputHandler.activateInput();
     }
 
     // logic
@@ -721,6 +737,14 @@
     // activation area on mouse click
     // the editor activates automatically when pressed in the editor control,
     // however that one can be slightly spaced to the main control area
+    MouseArea {
+        anchors.fill: parent
+        enabled: internal.frameSpacing > 0
+        acceptedButtons: Qt.LeftButton | Qt.RightButton
+        // activate input when pressed on the frame
+        preventStealing: false
+        Ubuntu.Mouse.forwardTo: [inputHandler]
+    }
 
     //internals
 
@@ -744,8 +768,6 @@
     LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
 
-    /*!\internal */
-    property alias __internal: internal
     QtObject {
         id: internal
         // public property locals enabling aliasing
@@ -757,23 +779,8 @@
         property real inputAreaWidth: control.width - 2 * frameSpacing
         property real inputAreaHeight: control.height - 2 * frameSpacing
         //selection properties
-        property bool draggingMode: false
-        property bool selectionMode: false
         property bool prevShowCursor
 
-        signal popupTriggered(int pos)
-
-        onDraggingModeChanged: {
-            if (draggingMode) selectionMode = false;
-        }
-        onSelectionModeChanged: {
-            if (selectionMode)
-                draggingMode = false;
-            else {
-                toggleSelectionCursors(false);
-            }
-        }
-
         function toggleSelectionCursors(show)
         {
             if (!show) {
@@ -788,25 +795,6 @@
             }
         }
 
-        function activateEditor()
-        {
-            if (!editor.activeFocus)
-                editor.forceActiveFocus();
-            else
-                showInputPanel();
-
-        }
-
-        function showInputPanel()
-        {
-            if (!Qt.inputMethod.visible)
-                Qt.inputMethod.show();
-        }
-        function hideInputPanel()
-        {
-            Qt.inputMethod.hide();
-        }
-
         function linesHeight(lines)
         {
             var lineHeight = editor.font.pixelSize * lines + lineSpacing * lines
@@ -822,24 +810,6 @@
                 control.height = linesHeight(MathUtils.clamp(control.lineCount, 1, max));
             }
         }
-
-        function enterSelectionMode(x, y)
-        {
-            if (undefined !== x && undefined !== y) {
-                control.cursorPosition = control.positionAt(x, y);
-                control.moveCursorSelection(control.cursorPosition + 1);
-            }
-            toggleSelectionCursors(true);
-        }
-
-        function positionCursor(x, y) {
-            var cursorPos = control.positionAt(x, y);
-            if (control.selectedText === "")
-                control.cursorPosition = cursorPos;
-            else if (control.selectionStart > cursorPos || control.selectionEnd < cursorPos) {
-                control.cursorPosition = cursorPos;
-            }
-        }
     }
 
     // grab Enter/Return keys which may be stolen from parent components of TextArea
@@ -869,7 +839,7 @@
             popover: control.popover
             visible: editor.cursorVisible
 
-            Component.onCompleted: internal.popupTriggered.connect(cursorItem.openPopover)
+            Component.onCompleted: inputHandler.pressAndHold.connect(cursorItem.openPopover)
         }
     }
     // selection cursor loader
@@ -922,6 +892,7 @@
     }
     Flickable {
         id: flicker
+        objectName: "textarea_scroller"
         anchors {
             fill: parent
             margins: internal.frameSpacing
@@ -929,38 +900,23 @@
         clip: true
         contentWidth: editor.paintedWidth
         contentHeight: editor.paintedHeight
-        interactive: !autoSize || (autoSize && maximumLineCount > 0)
         // do not allow rebounding
         boundsBehavior: Flickable.StopAtBounds
-        pressDelay: 500
-
-        function ensureVisible(r)
-        {
-            if (moving || flicking)
-                return;
-            if (contentX >= r.x)
-                contentX = r.x;
-            else if (contentX+width <= r.x+r.width)
-                contentX = r.x+r.width-width;
-            if (contentY >= r.y)
-                contentY = r.y;
-            else if (contentY+height <= r.y+r.height)
-                contentY = r.y+r.height-height;
-        }
 
         // editor
         // Images are not shown when text contains <img> tags
         // bug to watch: https://bugreports.qt-project.org/browse/QTBUG-27071
         TextEdit {
+            objectName: "textarea_input"
             readOnly: false
             id: editor
             focus: true
-            onCursorRectangleChanged: flicker.ensureVisible(cursorRectangle)
             width: internal.inputAreaWidth
             height: Math.max(internal.inputAreaHeight, editor.contentHeight)
             wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
             mouseSelectionMode: TextEdit.SelectWords
             selectByMouse: false
+            activeFocusOnPress: false
             cursorDelegate: cursor
             color: control.__styleInstance.color
             selectedTextColor: Theme.palette.selected.foregroundText
@@ -972,55 +928,15 @@
             // autosize handling
             onLineCountChanged: internal.frameSize()
 
-            // remove selection when typing starts or input method start entering text
-            onInputMethodComposingChanged: {
-                if (inputMethodComposing)
-                    internal.selectionMode = false;
-            }
-            Keys.onPressed: {
-                if ((event.text !== ""))
-                    internal.selectionMode = false;
-            }
-            Keys.onReleased: {
-                // selection positioners are updated after the keypress
-                if (selectionStart == selectionEnd)
-                    internal.selectionMode = false;
-            }
-
-            // handling text selection
-            MouseArea {
-                id: handler
-                enabled: control.enabled && control.activeFocusOnPress
+            // input selection and navigation handling
+            Ubuntu.Mouse.forwardTo: [inputHandler]
+            InputHandler {
+                id: inputHandler
                 anchors.fill: parent
-                propagateComposedEvents: true
-
-                onPressed: {
-                    internal.activateEditor();
-                    internal.draggingMode = true;
-                }
-                onPressAndHold: {
-                    // move mode gets false if there was a mouse move after the press;
-                    // this is needed as Flickable will send a pressAndHold in case of
-                    // press -> move-pressed ->stop-and-hold-pressed gesture is performed
-                    if (!internal.draggingMode)
-                        return;
-                    internal.draggingMode = false;
-                    // open popup
-                    internal.positionCursor(mouse.x, mouse.y);
-                    internal.popupTriggered(editor.cursorPosition);
-                }
-                onReleased: {
-                    internal.draggingMode = false;
-                }
-                onDoubleClicked: {
-                    internal.activateEditor();
-                    if (control.selectByMouse)
-                        control.selectWord();
-                }
-                onClicked: {
-                    internal.activateEditor();
-                    internal.positionCursor(mouse.x, mouse.y);
-                }
+                main: control
+                input: editor
+                flickable: flicker
+                selectionModeTimeout: control.__styleInstance.selectionModeTimeout
             }
         }
     }
 
=== modified file 'modules/Ubuntu/Components/TextCursor.qml'
--- modules/Ubuntu/Components/TextCursor.qml	2013-06-27 15:20:12 +0000
+++ modules/Ubuntu/Components/TextCursor.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import "Popups" 0.1
+import Ubuntu.Components.Popups 1.0
 
 StyledItem {
     id: cursorItem
 
=== modified file 'modules/Ubuntu/Components/TextField.qml'
--- modules/Ubuntu/Components/TextField.qml	2014-03-17 17:58:47 +0000
+++ modules/Ubuntu/Components/TextField.qml	2014-04-29 22:09:46 +0000
@@ -16,10 +16,11 @@
 
 import QtQuick 2.0
 import Ubuntu.Unity.Action 1.1 as UnityActions
+import Ubuntu.Components 1.1 as Ubuntu
 
 /*!
     \qmltype TextField
-    \inqmlmodule Ubuntu.Components 0.1
+    \inqmlmodule Ubuntu.Components 1.1
     \ingroup ubuntu
     \brief The TextField element displays a single line of editable plain text.
     Input constraints can be set through validator or inputMask. Setting echoMode
@@ -70,6 +71,34 @@
         }
     }
     \endqml
+
+    \section2 Scrolling and text selection
+    The input is activated when the tap or mouse is released after being pressed
+    over the component.
+
+    The text can be scrolled horizontally by swiping over the content both when
+    the component is active or inactive.
+
+    The content can be selected in the following ways:
+    \list
+    \li - double tapping/left mouse clicking over the content, when the word that
+          had been tapped over will be selected
+    \li - by pressing and dragging the selection cursor over the text input. Note
+          that there has to be a delay of approx. 200 ms between the press and drag
+          gesture, time when the input switches from scroll mode to selection mode
+    \endlist
+
+    The input is focused (activated) upon tap/left mouse button release. The cursor
+    will be placed at the position the mouse/tap point at release time. If the click
+    is happening on a selected area, the selection will be cleared. Long press above
+    a selected area brings up the clipboard context menu. When the long press happens
+    over a non-selected area, the cursor will be moved to the position and the component
+    enters in selection mode. The selection mode can also be activated by tapping and
+    keeping the tap/mouse over for approx 300 ms. If there is a move during this time,
+    the component enters into scrolling mode. The mode is exited once the scrolling
+    finishes. During the scrolling mode the selected text is preserved.
+
+    \note During text selection all interactive parent Flickables are turned off.
 */
 
 ActionItem {
@@ -98,10 +127,11 @@
     property bool hasClearButton: true
 
     /*!
-      \preliminary
+      \deprecated
       Component to be shown and used instead of the default On Screen Keyboard.
     */
     property Component customSoftwareInputPanel
+    onCustomSoftwareInputPanelChanged: console.error("customSoftwareInputPanel property deprecated.")
 
     /*!
       The property overrides the default popover of the TextField. When set, the TextField
@@ -146,10 +176,8 @@
     /*!
       Whether the TextField should gain active focus on a mouse press. By default
       this is set to true.
-
-      \qmlproperty bool activeFocusOnPress
     */
-    property alias activeFocusOnPress: editor.activeFocusOnPress
+    property bool activeFocusOnPress: true
 
     /*!
       Whether the TextField should scroll when the text is longer than the width.
@@ -446,11 +474,8 @@
 
       If false, the user cannot use the mouse to select text, only can use it to
       focus the input.
-
-      \qmlproperty bool selectByMouse
-      \preliminary
     */
-    property alias selectByMouse: virtualKbdHandler.enabled
+    property bool selectByMouse: true
 
     /*!
       This read-only property provides the text currently selected in the text input.
@@ -504,7 +529,7 @@
 
       \qml
       import QtQuick 2.0
-      import Ubuntu.Components 0.1
+      import Ubuntu.Components 1.1
       TextField{
           validator: IntValidator{bottom: 11; top: 31;}
           focus: true
@@ -719,7 +744,7 @@
     */
     function forceActiveFocus()
     {
-        internal.activateEditor();
+        inputHandler.activateInput();
     }
 
     /*!
@@ -815,27 +840,23 @@
     // grab clicks from the area between the frame and the input
     MouseArea {
         anchors.fill: parent
-        // us it only when there is space between the frame and input
+        acceptedButtons: Qt.LeftButton | Qt.RightButton
+        // use it only when there is space between the frame and input
         enabled: internal.spacing > 0
-        onClicked: internal.activateEditor()
+        preventStealing: false
+        // forward mouse events to input so we can handle those uniformly
+        Ubuntu.Mouse.forwardTo: [inputHandler]
     }
 
     Text { id: fontHolder }
 
     //internals
-    /*! \internal */
-    property alias __internal: internal
     QtObject {
         id: internal
         // array of borders in left, top, right, bottom order
-        property bool textChanged: false
         property real spacing: control.__styleInstance.overlaySpacing
         property real lineSpacing: units.dp(3)
         property real lineSize: editor.font.pixelSize + lineSpacing
-        //selection properties
-        property bool selectionMode: false
-
-        signal popupTriggered()
 
         property int type: action ? action.parameterType : 0
         onTypeChanged: {
@@ -847,54 +868,6 @@
              || type == UnityActions.Action.Real)
                 inputMethodHints = Qt.ImhDigitsOnly
         }
-
-        function activateEditor()
-        {
-            if (!editor.activeFocus)
-                editor.forceActiveFocus();
-            else
-                showInputPanel();
-        }
-
-        function showInputPanel()
-        {
-            if (control.customSoftwareInputPanel != undefined) {
-                // TODO implement once we have the SIP ready
-            } else {
-                if (!Qt.inputMethod.visible)
-                    Qt.inputMethod.show();
-            }
-            textChanged = false;
-        }
-        function hideInputPanel()
-        {
-            if (control.customSoftwareInputPanel != undefined) {
-                // TODO implement once we have the SIP ready
-            } else {
-                Qt.inputMethod.hide();
-            }
-            // emit accepted signal if changed
-            if (textChanged)
-                control.accepted();
-        }
-        // reset selection
-        function resetEditorSelection(mouseX)
-        {
-            editor.cursorPosition = editor.positionAt(mouseX);
-        }
-
-        // positions the cursor depending on whether there is a selection active or not
-        function positionCursor(x) {
-
-            var cursorPos = control.positionAt(x);
-            if (control.selectedText === "") {
-                control.cursorPosition = cursorPos;
-            }
-            // If target cursor position is outside selection then cancel selection and move cursor
-            else if (control.selectionStart > cursorPos || control.selectionEnd < cursorPos) {
-                control.cursorPosition = cursorPos;
-            }
-        }
     }
 
     //left pane
@@ -947,7 +920,7 @@
             popover: control.popover
             visible: editor.cursorVisible
 
-            Component.onCompleted: internal.popupTriggered.connect(openPopover)
+            Component.onCompleted: inputHandler.pressAndHold.connect(openPopover)
         }
     }
 
@@ -999,79 +972,55 @@
 
 
     // text input
-    TextInput {
-        id: editor
-        // FocusScope will forward focus to this component
-        focus: true
+    Flickable {
+        id: flicker
+        objectName: "textfield_scroller"
         anchors {
             left: leftPane.right
             right: clearButton.left
+            top: parent.top
+            bottom: parent.bottom
             margins: internal.spacing
-            verticalCenter: parent.verticalCenter
         }
-        // get the control's style
+        topMargin: internal.spacing
+        // do not allow rebounding
+        boundsBehavior: Flickable.StopAtBounds
+        // need to forward events as events occurred on topMargin area are not grabbed by the MouseArea.
+        Ubuntu.Mouse.forwardTo: [inputHandler]
+
         clip: true
-        onTextChanged: internal.textChanged = true
-        cursorDelegate: cursor
-        color: control.__styleInstance.color
-        selectedTextColor: Theme.palette.selected.foregroundText
-        selectionColor: Theme.palette.selected.foreground
-        font.pixelSize: FontUtils.sizeToPixels("medium")
-        passwordCharacter: "\u2022"
-        // forward keys to the root element so it can be captured outside of it
-        Keys.forwardTo: [control]
-
-        // handle virtual keyboard and cursor positioning, as the MouseArea overrides
-        // those functionalities of the TextInput
-        MouseArea {
-            id: virtualKbdHandler
-            anchors.fill: parent
-            hoverEnabled: true
-            preventStealing: true
-
-            onClicked: {
-                // activate control
-                if (!control.activeFocus) {
-                    internal.activateEditor();
-                    // set cursor position if no selection was previously set
-                    internal.positionCursor(mouse.x)
-                } else if (!internal.selectionMode){
-                    // reset selection and move cursor unde mouse click
-                    internal.resetEditorSelection(mouse.x);
-                } else if (internal.selectionMode) {
-                    // reset selection mode (onReleased is triggered prior to onClicked
-                    // and resetting selection mode there would cause to enter in the\
-                    // previous if-clause
-                    internal.selectionMode = false;
-                }
-            }
-
-            onPressAndHold: {
-                internal.activateEditor();
-                internal.positionCursor(mouse.x);
-                internal.popupTriggered();
-            }
-
-            onDoubleClicked: {
-                // select word under doubletap
-                if (!control.activeFocus)
-                    return;
-                editor.selectWord();
-                internal.selectionMode = false;
-            }
-            onPressed: {
-                // don't do anything while the control is inactive
-                if (!control.activeFocus || (pressedButtons != Qt.LeftButton))
-                    return;
-                internal.activateEditor();
-                if (control.selectedText === "") {
-                    internal.resetEditorSelection(mouse.x);
-                    internal.selectionMode = true;
-                }
-            }
-            onReleased: {
-                if (!containsMouse)
-                    internal.selectionMode = false;
+        contentWidth: editor.contentWidth
+        contentHeight: editor.contentHeight
+
+        TextInput {
+            id: editor
+            // FocusScope will forward focus to this component
+            focus: true
+            anchors.verticalCenter: parent.verticalCenter
+            // get the control's style
+            clip: true
+            cursorDelegate: cursor
+            color: control.__styleInstance.color
+            selectedTextColor: Theme.palette.selected.foregroundText
+            selectionColor: Theme.palette.selected.foreground
+            font.pixelSize: FontUtils.sizeToPixels("medium")
+            passwordCharacter: "\u2022"
+            // forward keys to the root element so it can be captured outside of it
+            Keys.forwardTo: [control]
+
+            // overrides
+            selectByMouse: false
+            activeFocusOnPress: false
+
+            // input selection and navigation handling
+            Ubuntu.Mouse.forwardTo: [inputHandler]
+            InputHandler {
+                id: inputHandler
+                anchors.fill: parent
+                main: control
+                input: editor
+                flickable: flicker
+                selectionModeTimeout: control.__styleInstance.selectionModeTimeout
             }
         }
     }
 
=== modified file 'modules/Ubuntu/Components/TextInputPopover.qml'
--- modules/Ubuntu/Components/TextInputPopover.qml	2014-03-17 18:17:23 +0000
+++ modules/Ubuntu/Components/TextInputPopover.qml	2014-04-29 22:09:46 +0000
@@ -15,8 +15,8 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1 as Toolkit
-import "Popups" 0.1
+import Ubuntu.Components 1.1 as Toolkit
+import Ubuntu.Components.Popups 1.0
 
 ActionSelectionPopover {
     objectName: "text_input_popover"
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2013-06-27 15:20:12 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ActivityIndicatorStyle.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Image {
     id: container
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2013-08-21 15:35:56 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/BubbleShape.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Item {
     id: bubbleShape
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2013-07-01 22:26:49 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonForeground.qml	2014-04-29 22:09:46 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Item {
     id: buttonForeground
@@ -30,6 +30,7 @@
     property real spacing
     property bool hasIcon: iconSource != ""
     property bool hasText: text != ""
+    property alias font: label.font
 
     opacity: enabled ? 1.0 : 0.5
     implicitHeight: Math.max(icon.height, label.height)
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-02-04 22:07:10 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ButtonStyle.qml	2014-04-29 22:09:46 +0000
@@ -17,7 +17,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Item {
     id: buttonStyle
@@ -26,7 +26,16 @@
     property real minimumWidth: units.gu(10)
     property real horizontalPadding: units.gu(1)
     property color defaultColor: UbuntuColors.orange
+    property font defaultFont: Qt.font({family: "Ubuntu", pixelSize: FontUtils.sizeToPixels("medium")})
     property Gradient defaultGradient
+    property real buttonFaceOffset: 0
+    /*!
+      The property overrides the button's default background with an item. This
+      item can be used by derived styles to reuse the ButtonStyle and override
+      the default coloured background with an image or any other drawing.
+      The default value is null.
+      */
+    property Item backgroundSource: null
 
     width: button.width
     height: button.height
@@ -36,12 +45,22 @@
     LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
     LayoutMirroring.childrenInherit: true
 
+    /*! \internal */
+    // Color properties in a JS ternary operator don't work as expected in
+    // QML because it overwrites alpha values with 1. A workaround is to use
+    // Qt.rgba(). For more information, see
+    // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1197802 and
+    // https://bugreports.qt-project.org/browse/QTBUG-32238.
+    function __colorHack(color) { return Qt.rgba(color.r, color.g, color.b, color.a); }
+
+
     /* The proxy is necessary because Gradient.stops and GradientStop.color are
        non-NOTIFYable properties. They cannot be written to so it is fine but
        the proxy avoids the warnings.
     */
+    property QtObject gradientProxy: gradientProxyObject
     QtObject {
-        id: gradientProxy
+        id: gradientProxyObject
         property color topColor
         property color bottomColor
 
@@ -67,16 +86,11 @@
         id: background
         anchors.fill: parent
         borderSource: "radius_idle.sci"
-        visible: color.a != 0.0
+        visible: (color.a != 0.0) || backgroundSource
+        image: backgroundSource
 
-        // Color properties in a JS ternary operator don't work as expected in
-        // QML because it overwrites alpha values with 1. A workaround is to use
-        // Qt.rgba(). For more information, see
-        // https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1197802 and
-        // https://bugreports.qt-project.org/browse/QTBUG-32238.
-        function colorHack(color) { return Qt.rgba(color.r, color.g, color.b, color.a); }
-        color: isGradient ? colorHack(gradientProxy.topColor) : colorHack(button.color)
-        gradientColor: isGradient ? colorHack(gradientProxy.bottomColor) : colorHack(button.color)
+        color: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.topColor) : __colorHack(button.color))
+        gradientColor: backgroundSource ? "#00000000" : (isGradient ? __colorHack(gradientProxy.bottomColor) : __colorHack(button.color))
     }
 
     UbuntuShape {
@@ -98,7 +112,10 @@
     ButtonForeground {
         id: foreground
         width: parent.width - 2*horizontalPadding
-        anchors.centerIn: parent
+        anchors {
+            centerIn: parent
+            horizontalCenterOffset: buttonFaceOffset
+        }
         text: button.text
         /* Pick either a clear or dark text color depending on the luminance of the
            background color to maintain good contrast (works in most cases)
@@ -107,6 +124,7 @@
         iconSource: button.iconSource
         iconPosition: button.iconPosition
         iconSize: units.gu(3)
+        font: button.font
         spacing: horizontalPadding
         transformOrigin: Item.Top
         scale: button.pressed ? 0.98 : 1.0
 
=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2014-02-05 19:59:43 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml	2014-04-29 22:09:46 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 
 Item {
     id: checkBoxStyle
 
=== added file 'modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml'
--- modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Themes/Ambiance/ComboButtonStyle.qml	2014-04-29 22:09:46 +0000
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+/*!
+    \qmltype ComboButton
+    \ingroup style-api
+    \brief ComboButton style API.
+
+    The component defines the style of the ComboButton component.
+  */
+Item {
+    id: comboStyle
+
+    /*!
+      Width of the drop down button.
+      */
+    property real dropDownWidth: units.gu(5)
+
+    /*!
+      Width of the dropdown button separator.
+      */
+    property real dropDownSeparatorWidth: units.dp(2)
+
+    /*!
+      Distance between the combo list and the main button.
+      */
+    property real comboListMargin: units.gu(0.8)
+
+    /*!
+      The item which will holds the combo list data. Implementations can point both
+      this \l comboListPanel to the same component, however separate items should be
+      used if a gap between the panel and the content is required.
+      See Ambiance theme.
+      */
+    property Item comboListHolder: comboListContent
+
+    /*!
+      The item pointing to the panel holding the combo list and additional design
+      artifacts. It is used by the component to drive the expansion size.
+      */
+    property Item comboListPanel: panelItem
+
+    /*!
+      \qmlproperty color defaultColor
+      Default color for the main button.
+      */
+    property alias defaultColor: mainButton.defaultColor
+
+    /*!
+      \qmlproperty Gradient defaultGradient
+      Default gradient for the main button.
+      */
+    property alias defaultGradient: mainButton.defaultGradient
+
+    /*!
+      Default color for the dropdown button when released.
+      */
+    property color defaultDropdownColor: __combo.expanded ? Qt.rgba(0, 0, 0, 0.05) : defaultColor
+    /*!
+      Default button face font.
+      */
+    property alias defaultFont: mainButton.defaultFont
+
+
+    width: __combo.width
+    height: __combo.collapsedHeight
+
+    /*! \internal */
+    property ComboButton __combo: styledItem
+
+    implicitWidth: mainButton.implicitWidth
+    implicitHeight: mainButton.implicitHeight
+
+    LayoutMirroring.enabled: Qt.application.layoutDirection == Qt.RightToLeft
+    LayoutMirroring.childrenInherit: true
+
+    ButtonStyle {
+        id: mainButton
+        anchors {
+            left: parent.left
+            top: parent.top
+            right: parent.right
+        }
+        height: __combo.collapsedHeight
+        // overrides
+        backgroundSource: comboFace
+        buttonFaceOffset: -dropDownWidth/2 - dropDownSeparatorWidth
+        horizontalPadding: units.gu(4) - dropDownSeparatorWidth
+        minimumWidth: units.gu(36)
+
+        // FIXME: use hardcoded color while we get the theme palette updated
+        defaultColor: "#b2b2b2"
+        defaultGradient: null
+
+        // button face
+        ShaderEffectSource {
+            id: comboFace
+            sourceItem: content
+            hideSource: true