Merge lp:~nick-dedekind/ubuntu-settings-components/indicator-polishing into lp:~registry/ubuntu-settings-components/trunk

[Nick Dedekind]

Visual changes for indicator RTM polishing sprint

Visual changes for indicator RTM polishing sprint

https://docs.google.com/a/canonical.com/document/d/1KC40suUs13gajIlE1Ms6PJYoIPx_AjlF4ae6bvtNjNc/edit

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/65/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/23/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/27

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/65/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/ubuntu-settings-components/indicator-polishing]

82. By Nick Dedekind on 2014-07-31

added missing files

83. By Nick Dedekind on 2014-07-31

made tryTEST_TARGET work

84. By Nick Dedekind on 2014-07-31

removed old files

85. By Nick Dedekind on 2014-07-31

removed old artwork

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:81
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/66/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/28/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/66/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/ubuntu-settings-components/indicator-polishing]

86. By Nick Dedekind on 2014-07-31

added uqmlscene

87. By Nick Dedekind on 2014-07-31

merged uqmlscene branch

88. By Nick Dedekind on 2014-07-31

version bumped

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-ci/67/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-qmltests-utopic/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-settings-components-utopic-armhf-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-ci/67/rebuild

review: Needs Fixing (continuous-integration)

[lp:~nick-dedekind/ubuntu-settings-components/indicator-polishing]

89. By Nick Dedekind on 2014-08-04

rebased

90. By Nick Dedekind on 2014-08-04

fixed runtests.sh for changes in folder structure

91. By Nick Dedekind on 2014-08-07

rebased

92. By Nick Dedekind on 2014-08-14

MP review changes

93. By Nick Dedekind on 2014-08-14

updated sdk to 1.1

94. By Nick Dedekind on 2014-09-09

updated for changes to listitem.empty

95. By Nick Dedekind on 2014-09-09

removed highlight on select. done by listitem

96. By Nick Dedekind on 2014-09-11

few tweaks

97. By Nick Dedekind on 2014-09-11

removed USC.IconVisual. fixed binding loops

98. By Nick Dedekind on 2014-09-15

Added UbuntuShapeForItem for colorizing framed theme icons

99. By Nick Dedekind on 2014-09-16

Added click slot

100. By Nick Dedekind on 2014-09-16

checkable made same as switch menu

101. By Nick Dedekind on 2014-09-19

merged with trunk

102. By Nick Dedekind on 2014-09-22

fixed color overlay alignment

103. By Nick Dedekind on 2014-09-22

use image instead of shape for player icon

104. By Nick Dedekind on 2014-09-23

fixed up media player menu

105. By Nick Dedekind on 2014-09-23

fixed layout bugs in media player item

106. By Nick Dedekind on 2014-09-24

MediaPlayerMenu.running -> showTrack

107. By Nick Dedekind on 2014-09-24

fixed tests for running change

108. By Nick Dedekind on 2014-09-25

added i18n

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-06-26 13:01:19 +0000
+++ CMakeLists.txt	2014-07-31 16:42:23 +0000
@@ -69,8 +69,32 @@
     endif()
 endif()
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra")
+
+if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")
+    option(Werror "Treat warnings as errors" ON)
+else()
+    option(Werror "Treat warnings as errors" OFF)
+endif()
+
+if (Werror)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+endif()
+
+file(GLOB_RECURSE QML_EXTRA_FILES
+    ${CMAKE_SOURCE_DIR}/tests/*.qml
+    ${CMAKE_SOURCE_DIR}/tests/*.js
+    ${CMAKE_SOURCE_DIR}/tests/*.jpg
+    ${CMAKE_SOURCE_DIR}/tests/*.png
+    ${CMAKE_SOURCE_DIR}/tests/*.sci
+    ${CMAKE_SOURCE_DIR}/tests/*.svg
+)
+add_custom_target(qml_fake_target SOURCES ${QML_EXTRA_FILES})
+
 # Tests
 enable_testing()
 
 add_subdirectory(Ubuntu)
+add_subdirectory(examples)
 add_subdirectory(tests)

=== modified file 'Ubuntu/Settings/Components/ActionTextField.qml'
--- Ubuntu/Settings/Components/ActionTextField.qml	2013-10-04 12:38:07 +0000
+++ Ubuntu/Settings/Components/ActionTextField.qml	2014-07-31 16:42:23 +0000
@@ -20,6 +20,7 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
+import QtQuick.Layouts 1.1
 
 Item {
     id: textField
@@ -29,43 +30,44 @@
 
     signal activated(var value)
 
-    TextField {
-        id: replyField
-        objectName: "replyText"
+    implicitHeight: layout.implicitHeight
 
+    RowLayout {
+        id: layout
         anchors {
-            top: parent.top
-            bottom: parent.bottom
             left: parent.left
-            right: sendButton.left
-            rightMargin: units.gu(1)
-        }
-        placeholderText: "Reply"
-        hasClearButton: false
-
-        onEnabledChanged: {
-            //Make sure that the component lost focus when enabled = false,
-            //otherwise it will get focus again when enable = true
-            if (!enabled) {
-                focus = false;
-            }
-        }
-    }
-
-    Button {
-        id: sendButton
-        objectName: "sendButton"
-        anchors {
-            top: parent.top
-            bottom: parent.bottom
             right: parent.right
         }
-        width: units.gu(9)
-        enabled: replyField.text !== "" && textField.activateEnabled
-        color: enabled ? "#c94212" : "#bababa"
-
-        onClicked: {
-            textField.activated(replyField.text);
+        spacing: units.gu(1)
+
+        TextField {
+            id: replyField
+            objectName: "replyText"
+
+            placeholderText: "Reply"
+            hasClearButton: false
+
+            Layout.fillWidth: true
+
+            onEnabledChanged: {
+                //Make sure that the component lost focus when enabled = false,
+                //otherwise it will get focus again when enable = true
+                if (!enabled) {
+                    focus = false;
+                }
+            }
+        }
+
+        Button {
+            id: sendButton
+            objectName: "sendButton"
+            Layout.preferredWidth: units.gu(9)
+            enabled: replyField.text !== "" && textField.activateEnabled
+            color: enabled ? "#c94212" : "#bababa"
+
+            onClicked: {
+                textField.activated(replyField.text);
+            }
         }
     }
 }

=== modified file 'Ubuntu/Settings/Components/CMakeLists.txt'
--- Ubuntu/Settings/Components/CMakeLists.txt	2014-06-27 09:35:26 +0000
+++ Ubuntu/Settings/Components/CMakeLists.txt	2014-07-31 16:42:23 +0000
@@ -1,3 +1,1 @@
-add_subdirectory(artwork)
-
 add_usc_plugin(Ubuntu.Settings.Components 0.1 Ubuntu/Settings/Components)

=== modified file 'Ubuntu/Settings/Components/Calendar.qml'
--- Ubuntu/Settings/Components/Calendar.qml	2013-10-29 22:08:08 +0000
+++ Ubuntu/Settings/Components/Calendar.qml	2014-07-31 16:42:23 +0000
@@ -204,7 +204,7 @@
 
                     // Styling properties
                     property color color: Theme.palette.selected.backgroundText
-                    property color todayColor: "#DD4814"
+                    property color todayColor: Theme.palette.selected.foreground
                     property string fontSize: "large"
                     property var backgroundColor: "transparent" // FIXME use color instead var when Qt will fix the bug with the binding (loses alpha)
                     property var sundayBackgroundColor: "#19AEA79F" // FIXME use color instead var when Qt will fix the bug with the binding (loses alpha)

=== modified file 'Ubuntu/Settings/Components/IconVisual.qml'
--- Ubuntu/Settings/Components/IconVisual.qml	2013-10-30 17:09:39 +0000
+++ Ubuntu/Settings/Components/IconVisual.qml	2014-07-31 16:42:23 +0000
@@ -54,7 +54,7 @@
         property Image source: visible ? image : null
         property color keyColorOut: Qt.rgba(0.0, 0.0, 0.0, 0.0)
         property color keyColorIn: "#808080"
-        property real threshold: 0.6
+        property real threshold: 0.1
 
         fragmentShader: source ? "
             varying highp vec2 qt_TexCoord0;

=== renamed file 'Ubuntu/Settings/Components/HeroMessageHeader.qml' => 'Ubuntu/Settings/Components/MessageHeader.qml'
--- Ubuntu/Settings/Components/HeroMessageHeader.qml	2013-10-04 10:10:47 +0000
+++ Ubuntu/Settings/Components/MessageHeader.qml	2014-07-31 16:42:23 +0000
@@ -18,147 +18,109 @@
  *      Olivier Tilloy <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.1
 import Ubuntu.Components 0.1
+import QtQuick.Layouts 1.1
 
 Item {
-    id: heroMessageHeader
+    id: messageHeader
 
     property alias avatar: avatarImage.source
     property alias icon: iconImage.source
-    property alias appIcon: appIconImage.source
-    property alias titleText: __titleText
-    property alias subtitleText: __subtitleText
-    property alias bodyText: __bodyText
-    property real bodyBottom: bodyText.y + bodyText.height
-
-    signal appIconClicked()
-
-    height: units.gu(9)
-
-    UbuntuShape {
-        id: avatarImageContainer
+    property alias title: titleText.text
+    property alias time: timeText.text
+    property alias body: bodyText.text
+
+    signal iconClicked()
+
+    implicitHeight: layout.height
+
+    function shakeIcon() {
+        ani.restart();
+    }
+
+    RowLayout {
+        id: layout
         anchors {
-            top: parent.top
-            topMargin: units.gu(2)
             left: parent.left
-            leftMargin: units.gu(2)
-        }
-        height: units.gu(6)
-        width: units.gu(6)
-        image: Image {
-            id: avatarImage
-            objectName: "avatar"
-            fillMode: Image.PreserveAspectFit
-        }
-    }
-
-    Image {
-        id: iconImage
-        objectName: "icon"
-        anchors {
-            top: parent.top
-            topMargin: units.gu(2)
-            left: avatarImageContainer.right
-            leftMargin: units.gu(1)
-        }
-        width: units.gu(2)
-        height: width
-        horizontalAlignment: Image.AlignHCenter
-        verticalAlignment: Image.AlignBottom
-        fillMode: Image.PreserveAspectFit
-    }
-
-    Label {
-        id: __titleText
-        objectName: "title"
-        anchors {
-            baseline: iconImage.bottom
-            left: iconImage.right
-            leftMargin: units.gu(1)
-            right: __appIcon.left
-            rightMargin: units.gu(2)
-        }
-        elide: Text.ElideRight
-        font.weight: Font.DemiBold
-        fontSize: "medium"
-    }
-
-    Label {
-        id: __subtitleText
-        objectName: "subtitle"
-        anchors {
-            baseline: __titleText.baseline
-            baselineOffset: units.gu(2.5)
-            left: __titleText.left
-            right: __titleText.right
-        }
-        elide: Text.ElideRight
-        fontSize: "small"
-    }
-
-    Label {
-        id: __bodyText
-        objectName: "body"
-        anchors {
-            baseline: __subtitleText.baseline
-            baselineOffset: units.gu(2.5)
-            left: __titleText.left
-            right: parent.right
-            rightMargin: units.gu(2)
-        }
-        maximumLineCount: 2
-        wrapMode: Text.WordWrap
-        elide: Text.ElideRight
-        fontSize: "small"
-    }
-
-    Item {
-        id: __appIcon
-        width: units.gu(7)
-        height: units.gu(7)
-        anchors {
-            top: parent.top
-            right: parent.right
-        }
-        opacity: 0.0
-        enabled: heroMessageHeader.state === "expanded"
-
-        Image {
-            id: appIconImage
-            objectName: "appIcon"
-            height: width
-            anchors {
-                left: parent.left
-                leftMargin: units.gu(2)
-                right: parent.right
-                rightMargin: units.gu(2)
-                topMargin: units.gu(1)
-                verticalCenter: parent.verticalCenter
-            }
-            fillMode: Image.PreserveAspectFit
-        }
-
-        MouseArea {
-            anchors.fill: parent
-            onClicked: heroMessageHeader.appIconClicked()
-        }
-    }
-
-    states: State {
-        name: "expanded"
-
-        PropertyChanges {
-            target: __appIcon
-            opacity: 1.0
-        }
-    }
-
-    transitions: Transition {
-        NumberAnimation {
-            property: "opacity"
-            duration: 200
-            easing.type: Easing.OutQuad
+            right: parent.right
+            rightMargin: units.gu(4)
+        }
+        spacing: units.gu(2)
+
+        UbuntuShape {
+            id: avatarImageContainer
+            Layout.preferredHeight: units.gu(6)
+            Layout.preferredWidth: units.gu(6)
+            image: Image {
+                id: avatarImage
+                objectName: "avatar"
+                fillMode: Image.PreserveAspectFit
+            }
+        }
+
+        ColumnLayout {
+            Label {
+                id: titleText
+                objectName: "title"
+
+                maximumLineCount: 1
+                elide: Text.ElideRight
+                font.weight: Font.DemiBold
+                fontSize: "medium"
+
+                Layout.fillWidth: true
+                // calculate width with regard to the time's incursion into this layout's space.
+                Layout.maximumWidth: parent.width - timeText.width + units.gu(3)
+            }
+            spacing: units.gu(0.5)
+
+            Label {
+                id: bodyText
+                objectName: "body"
+
+                maximumLineCount: 3
+                wrapMode: Text.WordWrap
+                elide: Text.ElideRight
+                fontSize: "small"
+
+                Layout.fillWidth: true
+            }
+        }
+    }
+
+    ColumnLayout {
+        id: timeIcon
+        anchors.right: parent.right
+
+        Label {
+            id: timeText
+            objectName: "time"
+            elide: Text.ElideRight
+            fontSize: "x-small"
+            maximumLineCount: 1
+            horizontalAlignment: Text.AlignRight
+        }
+        spacing: units.gu(0.5)
+
+        IconVisual {
+            id: iconImage
+            objectName: "icon"
+            Layout.preferredHeight: units.gu(3)
+            Layout.preferredWidth: units.gu(3)
+            Layout.alignment: Qt.AlignRight
+            color: Theme.palette.selected.backgroundText
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: messageHeader.iconClicked()
+            }
+
+            SequentialAnimation {
+                id: ani
+                PropertyAnimation { target: iconImage; property: "rotation"; duration: 50; to: -20 }
+                SpringAnimation { target: iconImage; property: "rotation"; from: -20; to: 0; mass: 0.5; spring: 15; damping: 0.1 }
+            }
         }
     }
 }

=== modified file 'Ubuntu/Settings/Components/QuickReply.qml'
--- Ubuntu/Settings/Components/QuickReply.qml	2013-10-29 17:40:23 +0000
+++ Ubuntu/Settings/Components/QuickReply.qml	2014-07-31 16:42:23 +0000
@@ -53,7 +53,7 @@
                 width: units.gu(2)
                 height: width
                 fillMode: Image.PreserveAspectFit
-                source: "artwork/message_sms01_54px.png"
+                source: "image://theme/message"
             }
 
             Label {
@@ -97,7 +97,7 @@
                         rightMargin: messageMargins
                     }
                     verticalAlignment: Text.AlignVCenter
-                    fontSize: "medium"
+                    fontSize: "medium"v
                     text: modelData
                 }
 

=== removed directory 'Ubuntu/Settings/Components/artwork'
=== removed file 'Ubuntu/Settings/Components/artwork/CMakeLists.txt'
--- Ubuntu/Settings/Components/artwork/CMakeLists.txt	2014-06-27 09:35:26 +0000
+++ Ubuntu/Settings/Components/artwork/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# export the artwork files.
-export_qmlfiles(Ubuntu.Settings.Components.Art Ubuntu/Settings/Components/artwork DESTINATION ${QT_IMPORTS_DIR})

=== removed file 'Ubuntu/Settings/Components/artwork/message_sms01_54px.png'
Binary files Ubuntu/Settings/Components/artwork/message_sms01_54px.png	2013-10-04 09:48:04 +0000 and Ubuntu/Settings/Components/artwork/message_sms01_54px.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'Ubuntu/Settings/Components/qmldir'
--- Ubuntu/Settings/Components/qmldir	2014-06-30 15:36:05 +0000
+++ Ubuntu/Settings/Components/qmldir	2014-07-31 16:42:23 +0000
@@ -2,7 +2,7 @@
 
 ActionTextField 0.1 ActionTextField.qml
 Calendar 0.1 Calendar.qml
-HeroMessageHeader 0.1 HeroMessageHeader.qml
+MessageHeader 0.1 MessageHeader.qml
 IconVisual 0.1 IconVisual.qml
 QuickReply 0.1 QuickReply.qml
 StatusIcon 0.1 StatusIcon.qml

=== modified file 'Ubuntu/Settings/Menus/AccessPointMenu.qml'
--- Ubuntu/Settings/Menus/AccessPointMenu.qml	2014-05-22 23:58:14 +0000
+++ Ubuntu/Settings/Menus/AccessPointMenu.qml	2014-07-31 16:42:23 +0000
@@ -18,95 +18,33 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
 ListItem.Empty {
     id: menu
     implicitHeight: units.gu(5.5)
 
-    property bool checked: false
+    property bool active: false
     property bool secure: false
     property bool adHoc: false
     property int signalStrength: 0
     property alias text: label.text
 
-    __acceptEvents: false
-
-    CheckBox {
-        id: checkbox
-        objectName: "checkBox"
-        property bool enableCheckConnection: true
-
-        height: units.gu(3)
-        width: units.gu(3)
-
+    Icon {
+        id: iconSignal
+        objectName: "iconSignal"
+
+        color: active ? UbuntuColors.green : Theme.palette.selected.backgroundText
+
+        width: height
+        height: Math.min(units.gu(3), parent.height - units.gu(1))
         anchors {
             left: parent.left
             leftMargin: menu.__contentsMargins
             verticalCenter: parent.verticalCenter
         }
 
-        // need onCompleted to set the initial value
-        // can't use binding otherwise we will get feedback from connections.
-        Component.onCompleted: {
-            enableCheckConnection = false;
-            checked = menu.checked;
-            enableCheckConnection = true;
-        }
-
-        // FIXME : should use Checkbox.toggled signal
-        // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
-        onCheckedChanged: {
-            if (!enableCheckConnection) {
-                return;
-            }
-            var oldEnable = enableCheckConnection;
-            enableCheckConnection = false;
-
-            menu.checked = checked;
-            menu.triggered(menu.checked);
-
-            enableCheckConnection = oldEnable;
-        }
-
-        Connections {
-            target: menu
-            onCheckedChanged: {
-                if (!checkbox.enableCheckConnection) {
-                    return;
-                }
-                var oldEnable = checkbox.enableCheckConnection;
-                checkbox.enableCheckConnection = false;
-
-                checkbox.checked = menu.checked;
-
-                checkbox.enableCheckConnection = oldEnable;
-            }
-        }
-
-        Connections {
-            target: menu.__mouseArea
-            onClicked: {
-                checkbox.clicked();
-            }
-        }
-    }
-
-    Icon {
-        id: iconSignal
-        objectName: "iconSignal"
-
-        color: Theme.palette.selected.backgroundText
-
-        width: height
-        height: Math.min(units.gu(3), parent.height - units.gu(1))
-        anchors {
-            left: checkbox.right
-            leftMargin: units.gu(1)
-            verticalCenter: parent.verticalCenter
-        }
-
         name: {
             var imageName = "nm-signal-100"
 
@@ -135,7 +73,7 @@
             rightMargin: menu.__contentsMargins
         }
         elide: Text.ElideRight
-        opacity: label.enabled ? 1.0 : 0.5
+        color: active ? UbuntuColors.green : Theme.palette.selected.backgroundText
     }
 
     Icon {
@@ -144,7 +82,7 @@
         visible: secure
         name: "network-secure"
 
-        color: Theme.palette.selected.backgroundText
+        color: active ? UbuntuColors.green : Theme.palette.selected.backgroundText
 
         width: height
         height: Math.min(units.gu(3), parent.height - units.gu(1))

=== modified file 'Ubuntu/Settings/Menus/ButtonMenu.qml'
--- Ubuntu/Settings/Menus/ButtonMenu.qml	2013-10-29 17:40:23 +0000
+++ Ubuntu/Settings/Menus/ButtonMenu.qml	2014-07-31 16:42:23 +0000
@@ -18,17 +18,19 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
-
-ListItem.Standard {
-    property alias buttonText: button.text
-
-    iconFrame: false
-    Component.onCompleted: button.clicked.connect(clicked)
-
-    control: Button {
-        id: button
-        objectName: "button"
-        width: Math.max(units.gu(5), implicitWidth)
+
+StandardMenu {
+    id: menu
+    property string buttonText
+
+    component: Component {
+        Button {
+            id: button
+            objectName: "button"
+            text: menu.buttonText
+            width: Math.max(units.gu(5), implicitWidth)
+
+            onClicked: menu.clicked()
+        }
     }
 }

=== modified file 'Ubuntu/Settings/Menus/CMakeLists.txt'
--- Ubuntu/Settings/Menus/CMakeLists.txt	2014-06-27 13:56:26 +0000
+++ Ubuntu/Settings/Menus/CMakeLists.txt	2014-07-31 16:42:23 +0000
@@ -1,7 +1,5 @@
 project(UbuntuSettingsMenusQml)
 
-add_subdirectory(artwork)
-
 find_package(Qt5Core REQUIRED)
 
 include_directories(

=== modified file 'Ubuntu/Settings/Menus/EventMenu.qml'
--- Ubuntu/Settings/Menus/EventMenu.qml	2014-05-22 23:58:14 +0000
+++ Ubuntu/Settings/Menus/EventMenu.qml	2014-07-31 16:42:23 +0000
@@ -60,7 +60,6 @@
 
     Components.Label {
         id: dateLabel
-        color: Theme.palette.normal.backgroundText
 
         anchors {
             verticalCenter: parent.verticalCenter

=== modified file 'Ubuntu/Settings/Menus/GroupedMessageMenu.qml'
--- Ubuntu/Settings/Menus/GroupedMessageMenu.qml	2013-12-13 16:00:06 +0000
+++ Ubuntu/Settings/Menus/GroupedMessageMenu.qml	2014-07-31 16:42:23 +0000
@@ -22,41 +22,37 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
-ListItem.Standard {
+StandardMenu {
     id: menu
 
-    property alias count: label.text
+    property string count: "0"
 
     signal dismissed()
 
-    iconSource: Qt.resolvedUrl("artwork/default_app.svg")
-
-    control: UbuntuShape {
-        height: label.height + units.gu(2)
-        width: label.width + units.gu(2)
-        color: Theme.palette.normal.backgroundText
-        radius: "medium"
-
-        Label {
-            id: label
-            objectName: "messageCount"
-
-            anchors {
-                horizontalCenter: parent.horizontalCenter
-                verticalCenter: parent.verticalCenter
-            }
-            horizontalAlignment: Text.AlignRight
-            font.weight: Font.DemiBold
-            fontSize: "medium"
-            text: "0"
-
-            color: Theme.palette.normal.foregroundText
-        }
-
-        Connections {
-            target: menu.__mouseArea
-            onClicked: {
-                menu.clicked();
+    iconSource: Qt.resolvedUrl("image://theme/message")
+
+    component: Component {
+        UbuntuShape {
+            height: label.implicitHeight + units.gu(2)
+            width: label.implicitWidth + units.gu(2)
+
+            color: Theme.palette.normal.backgroundText
+            radius: "medium"
+
+            Label {
+                id: label
+                objectName: "messageCount"
+
+                anchors {
+                    horizontalCenter: parent.horizontalCenter
+                    verticalCenter: parent.verticalCenter
+                }
+                horizontalAlignment: Text.AlignRight
+                font.weight: Font.DemiBold
+                fontSize: "medium"
+                text: menu.count
+
+                color: Theme.palette.normal.foregroundText
             }
         }
     }

=== modified file 'Ubuntu/Settings/Menus/MediaPlayerMenu.qml'
--- Ubuntu/Settings/Menus/MediaPlayerMenu.qml	2013-10-04 10:04:18 +0000
+++ Ubuntu/Settings/Menus/MediaPlayerMenu.qml	2014-07-31 16:42:23 +0000
@@ -19,6 +19,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
+import QtQuick.Layouts 1.1
 
 ListItem.Empty {
     id: menu
@@ -35,7 +36,7 @@
     implicitHeight: column.height + units.gu(2)
     Behavior on implicitHeight { UbuntuNumberAnimation {} }
 
-    Column {
+    ColumnLayout {
         id: column
         anchors {
             left: parent.left
@@ -47,17 +48,15 @@
         }
         height: running ? trackRow.height : playerRow.height
 
-        Row {
+        RowLayout {
             objectName: "player"
             id: playerRow
             spacing: menu.__contentsMargins
             visible: !running
 
-            Behavior on opacity { UbuntuNumberAnimation {} }
-
             UbuntuShape {
-                width: units.gu(5)
-                height: width
+                Layout.preferredHeight: units.gu(5)
+                Layout.preferredWidth: units.gu(5)
 
                 image: Image {
                     id: playerIcon
@@ -70,38 +69,42 @@
             }
         }
 
-        Row {
+        RowLayout {
             objectName: "albumArt"
             id: trackRow
             width: menu.width
             spacing: units.gu(2)
             visible: running
 
-            Behavior on opacity { UbuntuNumberAnimation {} }
-
             UbuntuShape {
-                width: units.gu(10)
-                height: width
+                Layout.preferredHeight: units.gu(10)
+                Layout.preferredWidth: units.gu(10)
 
                 image: Image {
                     id: albumArtImage
                 }
             }
 
-            Column {
-                spacing: units.gu(1)
+            ColumnLayout {
                 anchors.verticalCenter: parent.verticalCenter
 
                 Label {
                     id: songLabel
+                    elide: Text.ElideRight
+                    maximumLineCount: 1
                 }
 
                 Label {
                     id: artistLabel
+                    elide: Text.ElideRight
+                    maximumLineCount: 1
                 }
 
                 Label {
                     id: albumLabel
+                    elide: Text.ElideRight
+                    maximumLineCount: 1
+                    fontSize: "small"
                 }
             }
         }

=== modified file 'Ubuntu/Settings/Menus/PlaybackItemMenu.qml'
--- Ubuntu/Settings/Menus/PlaybackItemMenu.qml	2013-10-04 10:04:18 +0000
+++ Ubuntu/Settings/Menus/PlaybackItemMenu.qml	2014-07-31 16:42:23 +0000
@@ -17,8 +17,10 @@
  */
 
 import QtQuick 2.0
+import Ubuntu.Settings.Components 0.1 as USC
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
+import QtQuick.Layouts 1.1
 
 ListItem.Empty {
     id: menu
@@ -33,66 +35,73 @@
     signal play(bool play)
     signal previous()
 
-    implicitHeight: controlsRow.height + units.gu(2)
-
-    Row {
-        id: controlsRow
-
-        anchors {
-            top: parent.top
-            topMargin: units.gu(1)
-            horizontalCenter: parent.horizontalCenter
-        }
-        spacing: units.gu(2)
-
-        Button {
+    implicitHeight: layout.implicitHeight + units.gu(2)
+
+    RowLayout {
+        id: layout
+        anchors.centerIn: parent
+        spacing: units.gu(3)
+
+        USC.IconVisual {
             objectName: "previousButton"
-            width: units.gu(5)
-            height: width
-            onClicked: menu.previous()
-            text: ""
+
+            Layout.preferredWidth: units.gu(5)
+            Layout.preferredHeight: units.gu(5)
+
+            source: "image://theme/media-skip-backward"
+            color: {
+                if (!enabled)
+                    return Theme.palette.normal.backgroundText;
+                return prevMA.pressed ? Theme.palette.selected.foreground : Theme.palette.normal.foregroundText;
+            }
             enabled: canGoPrevious
-            anchors.verticalCenter: parent.verticalCenter
 
-            Icon {
+            MouseArea {
+                id: prevMA
                 anchors.fill: parent
-                anchors.margins: units.gu(1)
-                name: "media-skip-backward"
-                color: Theme.palette.normal.foregroundText
+                onClicked: menu.previous()
             }
         }
 
-        Button {
+        USC.IconVisual {
             objectName: "playButton"
-            width: units.gu(6)
-            height: width
-            onClicked: menu.play(!playing)
-            text: ""
+
+            Layout.preferredWidth: units.gu(5)
+            Layout.preferredHeight: units.gu(5)
+
+            source: playing ? "image://theme/media-playback-pause" : "image://theme/media-playback-start"
+            color: {
+                if (!enabled)
+                    return Theme.palette.normal.backgroundText;
+                return playMA.pressed ? Theme.palette.selected.foreground : Theme.palette.normal.foregroundText;
+            }
             enabled: canPlay
-            anchors.verticalCenter: parent.verticalCenter
 
-            Icon {
+            MouseArea {
+                id: playMA
                 anchors.fill: parent
-                anchors.margins: units.gu(1)
-                name: playing ? "media-playback-pause" : "media-playback-start"
-                color:  Theme.palette.normal.foregroundText
+                onClicked: menu.play(!playing)
             }
         }
 
-        Button {
+        USC.IconVisual {
             objectName: "nextButton"
-            width: units.gu(5)
-            height: width
-            onClicked: menu.next()
-            text: ""
+
+            Layout.preferredWidth: units.gu(5)
+            Layout.preferredHeight: units.gu(5)
+
+            source: "image://theme/media-skip-forward"
+            color: {
+                if (!enabled)
+                    return Theme.palette.normal.backgroundText;
+                return nextMA.pressed ? Theme.palette.selected.foreground : Theme.palette.normal.foregroundText;
+            }
             enabled: canGoNext
-            anchors.verticalCenter: parent.verticalCenter
 
-            Icon {
+            MouseArea {
+                id: nextMA
                 anchors.fill: parent
-                anchors.margins: units.gu(1)
-                name: "media-skip-forward"
-                color:  Theme.palette.normal.foregroundText
+                onClicked: menu.next()
             }
         }
     }

=== modified file 'Ubuntu/Settings/Menus/ProgressBarMenu.qml'
--- Ubuntu/Settings/Menus/ProgressBarMenu.qml	2013-10-04 10:04:18 +0000
+++ Ubuntu/Settings/Menus/ProgressBarMenu.qml	2014-07-31 16:42:23 +0000
@@ -17,17 +17,25 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 
-ListItem.Standard {
-    property alias indeterminate: progressBar.indeterminate
-    property alias minimumValue: progressBar.minimumValue
-    property alias maximumValue: progressBar.maximumValue
-    property alias value: progressBar.value
-
-    control: ProgressBar {
-        id: progressBar
-        width: units.gu(20)
+StandardMenu {
+    id: menu
+    property bool indeterminate: false
+    property real minimumValue: 0.0
+    property real maximumValue: 1.0
+    property real value: 0.0
+
+    component: Component {
+        ProgressBar {
+            id: progressBar
+            width: units.gu(20)
+
+            indeterminate: menu.indeterminate
+            minimumValue: menu.minimumValue
+            maximumValue: menu.maximumValue
+            value: menu.value
+        }
     }
 }

=== modified file 'Ubuntu/Settings/Menus/ProgressValueMenu.qml'
--- Ubuntu/Settings/Menus/ProgressValueMenu.qml	2013-10-04 10:04:18 +0000
+++ Ubuntu/Settings/Menus/ProgressValueMenu.qml	2014-07-31 16:42:23 +0000
@@ -19,18 +19,19 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
 
-ListItem.Standard {
+StandardMenu {
     id: menuItem
 
     property int value : 0.0
 
-    control: Label {
-        id: progress
-        objectName: "progress"
+    component: Component {
+        Label {
+            id: progress
+            objectName: "progress"
 
-        text: menuItem.value + " %"
-        fontSize: "medium"
+            text: menuItem.value + " %"
+            fontSize: "medium"
+        }
     }
 }

=== renamed file 'Ubuntu/Settings/Menus/HeroMessageMenu.qml' => 'Ubuntu/Settings/Menus/SimpleMessageMenu.qml'
--- Ubuntu/Settings/Menus/HeroMessageMenu.qml	2013-10-29 17:40:23 +0000
+++ Ubuntu/Settings/Menus/SimpleMessageMenu.qml	2014-07-31 16:42:23 +0000
@@ -18,25 +18,28 @@
  *      Olivier Tilloy <[e-mail]>
  */
 
-import QtQuick 2.0
+import QtQuick 2.1
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.Settings.Components 0.1 as USC
+import QtQuick.Layouts 1.1
 
 ListItem.Empty {
     id: menu
 
-    property alias heroMessageHeader: __heroMessageHeader
-    property real collapsedHeight: heroMessageHeader.y + heroMessageHeader.bodyBottom + units.gu(2)
-    property real expandedHeight: collapsedHeight
+    property alias title: messageHeader.title
+    property alias time: messageHeader.time
+    property alias body: messageHeader.body
 
     property url avatar
-    property url appIcon
+    property url icon
 
-    signal appActivated
+    signal iconActivated
     signal dismissed
 
-    implicitHeight: collapsedHeight
+    property alias footer: footerLoader.sourceComponent
+
+    implicitHeight: layout.height + units.gu(3)
 
     Rectangle {
         id: background
@@ -47,33 +50,49 @@
         z: -1
     }
 
-    USC.HeroMessageHeader {
-        id: __heroMessageHeader
-
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: parent.right
-
-        avatar: menu.avatar != "" ? menu.avatar : "artwork/default_contact.png"
-        appIcon: menu.appIcon != "" ? menu.appIcon : "artwork/default_app.svg"
-        icon: appIcon
-
-        state: menu.state
-
-        onAppIconClicked:  {
-            menu.appActivated();
+    ColumnLayout {
+        id: layout
+
+        anchors {
+            left: parent.left
+            right: parent.right
+            leftMargin: units.gu(2)
+            rightMargin: units.gu(2)
+            verticalCenter: parent.verticalCenter
+        }
+        spacing: units.gu(1.5)
+
+        USC.MessageHeader {
+            id: messageHeader
+            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignTop
+
+            avatar: menu.avatar != "" ? menu.avatar : "image://theme/contact"
+            icon: menu.icon != "" ? menu.icon : "image://theme/message"
+
+            state: menu.state
+
+            onIconClicked:  {
+                menu.iconActivated();
+            }
+        }
+
+        Loader {
+            id: footerLoader
+            visible: menu.state === "expanded"
+            asynchronous: false
+            Layout.fillWidth: true
+            Layout.fillHeight: true
         }
     }
 
+    onTriggered: if (!footer || !selected) messageHeader.shakeIcon();
+
     states: State {
         name: "expanded"
-        when: selected
+        when: selected && footerLoader.status == Loader.Ready
 
         PropertyChanges {
-            target: menu
-            implicitHeight: menu.expandedHeight
-        }
-        PropertyChanges {
             target: background
             alpha: 0.05
         }
@@ -82,11 +101,11 @@
     transitions: Transition {
         ParallelAnimation {
             NumberAnimation {
-                properties: "opacity,implicitHeight"
+                properties: "height"
                 duration: 200
                 easing.type: Easing.OutQuad
             }
-            ColorAnimation {}
+            ColorAnimation { target: background}
         }
     }
 

=== removed file 'Ubuntu/Settings/Menus/SimpleTextMessageMenu.qml'
--- Ubuntu/Settings/Menus/SimpleTextMessageMenu.qml	2013-12-13 16:50:22 +0000
+++ Ubuntu/Settings/Menus/SimpleTextMessageMenu.qml	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright 2013 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/>.
- *
- * Authors:
- *      Renato Araujo Oliveira Filho <[e-mail]>
- *      Olivier Tilloy <[e-mail]>
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1
-
-HeroMessageMenu {
-    id: menu
-
-    property string title: ""
-    property string time: ""
-    property string message: ""
-
-    property alias footer: footerLoader.sourceComponent
-
-    expandedHeight: collapsedHeight + fullMessage.height
-    heroMessageHeader.titleText.text: title
-    heroMessageHeader.subtitleText.text: time
-    heroMessageHeader.bodyText.text: message
-
-    Item {
-        id: fullMessage
-
-        anchors {
-            left: parent.left
-            leftMargin: units.gu(2)
-            right: parent.right
-            rightMargin: units.gu(2)
-            top: heroMessageHeader.bottom
-        }
-        height: childrenRect.height
-        opacity: 0.0
-        enabled: false
-
-        Label {
-            id: bodyText
-            anchors {
-                top: parent.top
-                left: parent.left
-                right: parent.right
-            }
-            wrapMode: Text.WordWrap
-            elide: Text.ElideRight
-            fontSize: "medium"
-            text: heroMessageHeader.bodyText.text
-        }
-
-        Loader {
-            id: footerLoader
-
-            anchors {
-                top: bodyText.bottom
-                topMargin: item ? units.gu(2) : 0
-                left: parent.left
-                right: parent.right
-            }
-            height: item ? units.gu(4) : 0
-        }
-
-        states: State {
-            name: "expanded"
-            when: menu.state === "expanded"
-
-            PropertyChanges {
-                target: heroMessageHeader.bodyText
-                opacity: 0.0
-            }
-
-            PropertyChanges {
-                target: fullMessage
-                opacity: 1.0
-                enabled: true
-            }
-        }
-        transitions: Transition {
-            NumberAnimation {
-                property: "opacity"
-                duration: 200
-            }
-        }
-    }
-}

=== modified file 'Ubuntu/Settings/Menus/SnapDecisionMenu.qml'
--- Ubuntu/Settings/Menus/SnapDecisionMenu.qml	2013-10-29 17:40:23 +0000
+++ Ubuntu/Settings/Menus/SnapDecisionMenu.qml	2014-07-31 16:42:23 +0000
@@ -19,142 +19,80 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import Ubuntu.Settings.Components 0.1 as USC
+import QtQuick.Layouts 1.1
 
-HeroMessageMenu {
+SimpleMessageMenu {
     id: menu
 
-    property string title: ""
-    property string time: ""
-    property string message: ""
-
-    property bool activateEnabled: true
-    property alias actionButtonText: actionButton.text
+    property bool actionEnabled: true
+    property string actionButtonText: "Call back"
 
     property bool replyEnabled: true
-    property alias replyMessages: quickreply.messages
-    property alias replyButtonText: quickreply.buttonText
-
-    expandedHeight: collapsedHeight + buttons.height + quickreply.height
-    heroMessageHeader.titleText.text:  title
-    heroMessageHeader.subtitleText.text: message
-    heroMessageHeader.bodyText.text: time
-
-    signal activated
+    property string replyButtonText: "Send"
+
+    signal actionActivated
     signal replied(string value)
 
-    Item {
+    footer: Item {
         id: buttons
 
-        anchors.left: parent.left
-        anchors.leftMargin: units.gu(2)
-        anchors.right: parent.right
-        anchors.rightMargin: units.gu(2)
-        anchors.top: heroMessageHeader.bottom
-        anchors.topMargin: units.gu(1)
-        height: units.gu(4)
-        opacity: 0.0
-
-        Button {
-            objectName: "messageButton"
-            text: "Message"
-            anchors.left: parent.left
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            width: (parent.width - units.gu(1)) / 2
-            gradient: UbuntuColors.greyGradient
-
-            onClicked: {
-                if (quickreply.state === "") {
-                    quickreply.state = "expanded";
-                } else {
-                    quickreply.state = "";
-                }
-            }
-        }
-
-        Button {
-            id: actionButton
-            objectName: "actionButton"
-            text: "Call back"
-            anchors.right: parent.right
-            anchors.top: parent.top
-            anchors.bottom: parent.bottom
-            width: (parent.width - units.gu(1)) / 2
-            enabled: menu.activateEnabled
-
-            onClicked: {
-                menu.activated();
-            }
-        }
-
-        states: State {
-            name: "expanded"
-            when: menu.state === "expanded"
-
-            PropertyChanges {
-                target: buttons
-                opacity: 1.0
-            }
-        }
-        transitions: Transition {
-            NumberAnimation {
-                property: "opacity"
-                duration: 200
-                easing.type: Easing.OutQuad
-            }
-        }
-    }
-
-    USC.QuickReply {
-        id: quickreply
-
-        onReplied: {
-            menu.replied(value);
-        }
-
-        messages: ""
-        buttonText: "Send"
-        anchors {
-            top: buttons.bottom
-            topMargin: units.gu(2)
-            left: parent.left
-            right: parent.right
-        }
-        height: 0
-        opacity: 0.0
-        enabled: false
-        replyEnabled: menu.replyEnabled
-        messageMargins: __contentsMargins
-
-        states: State {
-            name: "expanded"
-
-            PropertyChanges {
-                target: quickreply
-                height: expandedHeight + units.gu(2)
-                opacity: 1.0
-            }
-
-            PropertyChanges {
-                target: quickreply
-                enabled: true
-            }
-        }
-
-        transitions: Transition {
-            NumberAnimation {
-                properties: "opacity,height"
-                duration: 200
-                easing.type: Easing.OutQuad
-            }
-        }
-    }
-
-    onStateChanged: {
-        if (state === "") {
-            quickreply.state = "";
+        implicitHeight: layout.implicitHeight
+
+        ColumnLayout {
+            id: layout
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            spacing: units.gu(1)
+
+            RowLayout {
+                spacing: units.gu(2)
+
+                Button {
+                    objectName: "messageButton"
+                    text: "Message"
+                    gradient: UbuntuColors.greyGradient
+                    Layout.fillWidth: true
+
+                    onClicked: {
+                        if (reply.state === "") {
+                            reply.state = "expanded";
+                        } else {
+                            reply.state = "";
+                        }
+                    }
+                }
+
+                Button {
+                    id: actionButton
+                    objectName: "actionButton"
+                    enabled: menu.actionEnabled
+                    text: actionButtonText
+                    Layout.fillWidth: true
+
+                    onClicked: {
+                        menu.actionActivated();
+                    }
+                }
+            }
+
+            USC.ActionTextField {
+                id: reply
+
+                Layout.fillWidth: true
+                Layout.fillHeight: true
+                visible: state == "expanded"
+
+                activateEnabled: menu.replyEnabled
+                buttonText: menu.replyButtonText
+
+                onActivated: {
+                    menu.replied(value);
+                }
+            }
         }
     }
 }

=== modified file 'Ubuntu/Settings/Menus/StandardMenu.qml'
--- Ubuntu/Settings/Menus/StandardMenu.qml	2014-07-01 12:15:17 +0000
+++ Ubuntu/Settings/Menus/StandardMenu.qml	2014-07-31 16:42:23 +0000
@@ -27,9 +27,17 @@
     property alias text: label.text
     property alias iconColor: iconVisual.color
     property alias component: componentLoader.sourceComponent
+    property alias foregroundColor: label.color
+    property alias backColor: overlay.color
+
+    Rectangle {
+        id: overlay
+        color: "transparent"
+        visible: color !== "transparent"
+        anchors.fill: parent
+    }
 
     RowLayout {
-
         anchors {
             fill: parent
             leftMargin: menu.__contentsMargins
@@ -56,11 +64,15 @@
 
             elide: Text.ElideRight
             maximumLineCount: 1
-            opacity: label.enabled ? 1.0 : 0.5
         }
 
         Loader {
             id: componentLoader
+            asynchronous: false
+            visible: status == Loader.Ready
+
+            Layout.preferredHeight: item ? item.height : 0
+            Layout.preferredWidth: item ? item.width : 0
         }
     }
 }

=== modified file 'Ubuntu/Settings/Menus/SwitchMenu.qml'
--- Ubuntu/Settings/Menus/SwitchMenu.qml	2013-10-29 17:40:23 +0000
+++ Ubuntu/Settings/Menus/SwitchMenu.qml	2014-07-31 16:42:23 +0000
@@ -19,50 +19,50 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import Ubuntu.Components.ListItems 0.1 as ListItem
 
-ListItem.Standard {
+StandardMenu {
     id: menu
 
     property bool checked: false
-    iconFrame: false
-
-    control: Switch {
-        id: switcher
-        objectName: "switcher"
-        property bool enableCheckConnection: true
-
-        Component.onCompleted: {
-            checked = menu.checked;
-        }
-
-        // FIXME : should use Checkbox.toggled signal
-        // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
-        onCheckedChanged: {
-            if (!enableCheckConnection) {
-                return;
+
+    component: Component {
+        Switch {
+            id: switcher
+            objectName: "switcher"
+            property bool enableCheckConnection: true
+
+            Component.onCompleted: {
+                checked = menu.checked;
             }
-            var oldEnable = enableCheckConnection;
-            enableCheckConnection = false;
-
-            menu.checked = checked;
-            menu.triggered(menu.checked);
-
-            enableCheckConnection = oldEnable;
-        }
-
-        Connections {
-            target: menu
+
+            // FIXME : should use Checkbox.toggled signal
+            // lp:~nick-dedekind/ubuntu-ui-toolkit/checkbox.toggled
             onCheckedChanged: {
-                if (!switcher.enableCheckConnection) {
+                if (!enableCheckConnection) {
                     return;
                 }
-                var oldEnable = switcher.enableCheckConnection;
-                switcher.enableCheckConnection = false;
-
-                switcher.checked = menu.checked;
-
-                switcher.enableCheckConnection = oldEnable;
+                var oldEnable = enableCheckConnection;
+                enableCheckConnection = false;
+
+                menu.checked = checked;
+                menu.triggered(menu.checked);
+
+                enableCheckConnection = oldEnable;
+            }
+
+            Connections {
+                target: menu
+                onCheckedChanged: {
+                    if (!switcher.enableCheckConnection) {
+                        return;
+                    }
+                    var oldEnable = switcher.enableCheckConnection;
+                    switcher.enableCheckConnection = false;
+
+                    switcher.checked = menu.checked;
+
+                    switcher.enableCheckConnection = oldEnable;
+                }
             }
         }
     }

=== modified file 'Ubuntu/Settings/Menus/TextMessageMenu.qml'
--- Ubuntu/Settings/Menus/TextMessageMenu.qml	2013-10-04 12:26:43 +0000
+++ Ubuntu/Settings/Menus/TextMessageMenu.qml	2014-07-31 16:42:23 +0000
@@ -22,7 +22,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Settings.Components 0.1 as USC
 
-SimpleTextMessageMenu {
+SimpleMessageMenu {
     id: menu
 
     property bool replyEnabled: true
@@ -31,7 +31,6 @@
     signal replied(string value)
 
     footer: USC.ActionTextField {
-        anchors.fill:  parent
 
         activateEnabled: menu.replyEnabled
         buttonText: menu.replyButtonText

=== modified file 'Ubuntu/Settings/Menus/TransferMenu.qml'
--- Ubuntu/Settings/Menus/TransferMenu.qml	2014-07-04 17:27:20 +0000
+++ Ubuntu/Settings/Menus/TransferMenu.qml	2014-07-31 16:42:23 +0000
@@ -15,7 +15,7 @@
  */
 
 import QtQuick 2.0
-import Ubuntu.Components 0.1
+import Ubuntu.Components 1.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import QtQuick.Layouts 1.1
 
@@ -41,21 +41,21 @@
             leftMargin: menu.__contentsMargins
             rightMargin: menu.__contentsMargins
         }
+        spacing: units.gu(2)
 
         UbuntuShape {
             id: imageShape
-            Layout.preferredWidth: units.gu(5)
-            Layout.preferredHeight: units.gu(5)
 
-            Layout.alignment: Qt.AlignTop
+            Layout.preferredWidth: units.gu(6)
+            Layout.preferredHeight: units.gu(6)
 
             image: Image {
                 objectName: "icon"
                 id: icon
 
                 sourceSize {
-                    width: units.gu(5)
-                    height: units.gu(5)
+                    width: units.gu(6)
+                    height: units.gu(6)
                 }
             }
         }
@@ -70,6 +70,7 @@
 
                 elide: Text.ElideRight
                 maximumLineCount: 1
+                font.weight: Font.DemiBold
             }
 
             ProgressBar {
@@ -77,8 +78,9 @@
                 objectName: "progress"
                 visible: menu.active
                 value: 0.0
+                showProgressPercentage: false
 
-                Layout.preferredHeight: units.gu(2)
+                Layout.preferredHeight: units.gu(1)
                 Layout.fillWidth: true
             }
 
@@ -88,6 +90,7 @@
                 Layout.fillWidth: true
                 visible: menu.active
 
+                fontSize: "x-small"
                 elide: Text.ElideRight
                 maximumLineCount: 1
             }

=== modified file 'Ubuntu/Settings/Menus/UserSessionMenu.qml'
--- Ubuntu/Settings/Menus/UserSessionMenu.qml	2013-10-04 10:04:18 +0000
+++ Ubuntu/Settings/Menus/UserSessionMenu.qml	2014-07-31 16:42:23 +0000
@@ -38,8 +38,15 @@
 
         Image {
             id: checkMark
-            source: "artwork/CheckMark.png"
+            source: "image://theme/tick"
+            height: units.gu(2)
+            width: height
             anchors.centerIn: parent
+
+            sourceSize {
+                height: height
+                width: width
+            }
         }
     }
 }

=== removed directory 'Ubuntu/Settings/Menus/artwork'
=== removed file 'Ubuntu/Settings/Menus/artwork/CMakeLists.txt'
--- Ubuntu/Settings/Menus/artwork/CMakeLists.txt	2014-06-27 09:35:26 +0000
+++ Ubuntu/Settings/Menus/artwork/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-# export the artwork files.
-export_qmlfiles(Ubuntu.Settings.Menus.Art Ubuntu/Settings/Menus/artwork DESTINATION ${QT_IMPORTS_DIR})

=== removed file 'Ubuntu/Settings/Menus/artwork/[e-mail]'
Binary files Ubuntu/Settings/Menus/artwork/[e-mail]	2013-09-25 08:54:58 +0000 and Ubuntu/Settings/Menus/artwork/[e-mail]	1970-01-01 00:00:00 +0000 differ
=== removed file 'Ubuntu/Settings/Menus/artwork/default_app.svg'
--- Ubuntu/Settings/Menus/artwork/default_app.svg	2013-10-04 09:48:04 +0000
+++ Ubuntu/Settings/Menus/artwork/default_app.svg	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg15137" xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink">
- <defs id="defs15139">
-  <radialGradient id="radialGradient2612" gradientUnits="userSpaceOnUse" cy="4.625" cx="62.625" gradientTransform="matrix(1 0 0 .34118 0 3.0471)" r="10.625">
-   <stop id="stop8840" offset="0"/>
-   <stop id="stop8842" style="stop-opacity:0" offset="1"/>
-  </radialGradient>
-  <linearGradient id="linearGradient15133" y2=".24326" gradientUnits="userSpaceOnUse" x2="62.2" gradientTransform="matrix(2.1499 0 0 2.1499 -110.12 31.935)" y1="-12.489" x1="62.2">
-   <stop id="stop4875" style="stop-color:#fff" offset="0"/>
-   <stop id="stop4877" style="stop-color:#fff;stop-opacity:0" offset="1"/>
-  </linearGradient>
-  <radialGradient id="radialGradient15127" gradientUnits="userSpaceOnUse" cy="-8.7256" cx="62.2" gradientTransform="matrix(2.4129 0 0 2.413 -126.48 34.231)" r="9.7553">
-   <stop id="stop8649" style="stop-color:#8fb1dc" offset="0"/>
-   <stop id="stop8651" style="stop-color:#3465a4" offset="1"/>
-  </radialGradient>
-  <radialGradient id="radialGradient2418" gradientUnits="userSpaceOnUse" cy="24.149" cx="17.814" gradientTransform="matrix(-2.644 0 2.9365e-8 2.5344 78.725 -37.986)" r="9.125">
-   <stop id="stop4847" style="stop-color:#fff" offset="0"/>
-   <stop id="stop4849" style="stop-color:#b6b6b6" offset="1"/>
-  </radialGradient>
-  <radialGradient id="radialGradient5145" gradientUnits="userSpaceOnUse" cy="13.067" cx="23.86" gradientTransform="matrix(-1.5425 0 0 -.84553 60.718 23.829)" r="18.098">
-   <stop id="stop14112" style="stop-color:#557695" offset="0"/>
-   <stop id="stop14114" style="stop-color:#15395c" offset="1"/>
-  </radialGradient>
-  <radialGradient id="radialGradient5147" gradientUnits="userSpaceOnUse" cy="-3.442" cx="62.225" gradientTransform="matrix(1.1035 0 0 1.0265 -4.1555 -1.8158)" r="10.081">
-   <stop id="stop14118" style="stop-color:#9e9e9e" offset="0"/>
-   <stop id="stop14120" style="stop-color:#9e9e9e;stop-opacity:0" offset="1"/>
-  </radialGradient>
- </defs>
- <g id="layer1">
-  <path id="path8836" style="opacity:.4;fill-rule:evenodd;fill:url(#radialGradient2612)" d="m73.25 4.625a10.625 3.625 0 1 1 -21.25 0 10.625 3.625 0 1 1 21.25 0z" transform="matrix(2.1647 0 0 2.5637 -111.56 26.85)"/>
-  <g id="g15122" transform="translate(.79042 -.78563)">
-   <path id="path6495" style="stroke:#204a87;fill:url(#radialGradient15127)" d="m43.505 24.387c0 10.99-8.9091 19.899-19.897 19.899-10.989 0-19.898-8.9091-19.898-19.899 0-10.989 8.9086-19.897 19.898-19.897 10.988 0 19.897 8.9081 19.897 19.897z"/>
-   <path id="path6534" style="stroke:url(#radialGradient5147);stroke-width:1.1035;fill:url(#radialGradient5145)" d="m23.726 5.3141c-1.5283 0.12067-3.0328 0.36544-4.4919 0.84567-1.23 0.48843 0.88689-0.42988-0.37486-0.60468-0.75942-0.12994-1.0776 0.65251-1.7561 0.67046-0.7741 0.023841-1.3048 0.71572-2.0319 0.79898-0.26187 1.4432-0.59924-0.56894-0.83949 0.13173 0.19047 0.7212-0.07796 1.1928-0.63582 1.6119-0.60156 0.68249-0.03584 1.2934 0.54212 0.69395 0.2775-0.83446 1.1825-1.7618 2.0655-1.2049 0.8837 0.48448 1.7582 1.6525 2.4938 0.40935-0.75488-0.090735-1.0462-0.73637-1.4079-1.2096-0.40023 0.031761-2.0794-0.32019-1.0059-0.24024 0.5284-0.17249 1.549-0.68558 1.9239-0.66537-0.94013 0.49026 0.35015 0.81268 0.73202 1.2035 0.68671 0.20357 0.99776 1.0757 0.37414 1.527-0.80181 0.4162 0.05573 1.1017 0.221 1.6748 0.12828 0.99827 0.99623 0.43282 1.2716-0.18046 0.39803-1.1153 1.6733-1.0767 2.5958-1.5522 1.008-0.51754 1.0248-0.53575 1.5034 0.20195 0.36764 0.21151 1.5947-0.55825 0.78901-0.929-0.68957 0.03713-1.142 0.46029-0.56364-0.60801 0.13915-0.57404 0.6791-1.3235 0.58092-1.7937-0.662-0.2603-1.324-0.5207-1.986-0.7811zm-9.3732 3.6945c0.35612 0.3643 1.5564 1.0234 1.4368 0.11255-0.14419-0.61744-1.0418-0.62308-1.4368-0.11255zm18.165-0.44471c-0.82412 0.16922-1.6412 0.35467-2.292 0.92363 0.19457 0.7853-0.8341 0.89786-1.2851 1.3281-0.12036 0.25242-0.02467 1.8403 0.51105 1.1573 0.58162-0.77246 0.83368 0.40868 1.4478 0.52687 0.4451-0.14324 0.5002-1.1438 0.33275-1.6043 0.28525-0.46984 0.75058-1.1195 1.3539-1.0659-0.37419 0.57099-0.80163 2.0315 0.3911 1.4345 0.34518-0.006-0.93958 0.75452-1.0166 1.273-0.48258 0.51284-0.9934 0.90587-1.6905 0.50847-0.33355-0.28162-0.50305-1.0992-0.71414-0.17566 0.43341 0.73252-1.089 0.04718-1.0514 1.0356-0.31972 0.61514-0.89623 0.8671-1.563 0.91149 0.24198 0.19141 1.1924 1.3314 0.24953 1.1701-0.60352 0.06628-1.4857 0.40701-1.2414 1.1653-0.27486 0.9444 0.4249 0.70654 0.85522 1.2977 0.70116-0.19916 1.1488-0.62908 1.2634-1.3621 0.65618-0.19273 0.73557-0.93195 1.456-0.91702 0.7182-0.40381 0.88559 0.73738 1.5587 0.82181 0.07058 0.4087-0.33464 1.281 0.45659 0.4693 0.76441-0.55387-0.79512-1.2716-0.30963-1.4066 0.69099 0.22071 0.94006 0.87671 1.051 1.519 0.56306 0.9634 0.70185 0.44404 0.74672-0.40362 0.87723-0.39439 1.1473 1.641 2.3881 1.1397 0.92678 0.19174 0.59949 0.8304-0.01904 1.2203-0.50066 0.47112-1.3382 0.17338-1.9265-0.01558-0.56472-0.27756-1.3196-0.24813-1.6214 0.38347-0.46529-0.21764-0.94642-0.91135-1.4178-1.3118-1.1647-0.5139-2.4314-0.07571-3.5919 0.23946-0.99563 1.1632-2.1949 2.219-2.6236 3.7359-0.62778 0.63853 0.54336 1.0082-0.24392 1.556-0.6428 0.51279 0.10805 1.1629 0.2458 1.7527 0.60445 0.74395 1.6306 3.0723 2.5708 2.1452 0.52705-0.80245 0.81963 0.61582 1.4399-0.30194 0.4952-0.39949 0.9695 0.45802 1.6897 0.14331 0.69372 0.4284 0.56095 1.0433 0.27484 1.6928 0.15583 0.54087 0.93098 0.9344 0.62978 1.6677-0.27366 0.68309 0.58312 1.201 0.41038 1.7987-0.5748 1.1512-0.43928 2.5747 0.09386 3.7157 0.42668 1.0325 0.67699 2.1484 0.64366 3.2692 0.74277 0.2222 1.1367-0.72912 1.8776-0.51313 0.72333 0.09324 0.99191-0.82974 1.5008-1.2158 0.56704-0.46747-0.07223-1.1873 0.82794-1.5185 0.87331-0.42523-1.106-1.0213 0.0152-1.4024 0.46515-0.51761 1.4132-0.69776 1.6008-1.3735-0.33834-1.0398-0.21797-2.1801-0.16738-3.2436 0.32552-0.84167 0.72975-1.6312 1.4262-2.2272 0.28082-0.92669 0.94924-1.7777 0.88942-2.7709-1.6476 0.50399-1.1482-0.21491-0.22962-0.87318 0.63508-0.42199 1.4051-0.84564 1.7006-1.5617 0.14435-0.81048-0.45227-2.1297-1.0079-0.90496-0.24511-0.4707-1.1542-0.71744-1.113-1.3307-0.17659-1.2625 0.34462-0.14427 0.86051 0.10789 1.1146-0.60521 1.6818 1.7766 2.3893 0.35503-0.618-4.471-3.052-8.528-6.34-11.567-0.571-1.0949-0.921 0.75-1.501 0.68-0.464-0.485-1.33-1.1394-0.122-0.914 1.034-0.3028 0.333-0.7027-0.425-0.6842-0.574-0.0697-1.101-0.2706-1.635-0.4789zm-20.56 0.4447c-0.275 1.3534-2.0109 1.1954-2.6162 2.5304-2.9783 3.153-4.8166 7.302-5.32 11.598 0.26584 1.0071 1.1105 1.4908 1.9601 1.9373 0.72184 0.41932 1.7801 0.2342 2.1848 1.1124 0.45187 0.36983 0.93948 1.0997 1.5856 0.87722 0.93664-0.09099 0.36019 0.85823 0.19973 1.3392-0.059277 0.607-0.80778 0.99372-0.52016 1.5778-0.24136 0.66166-0.43304 1.3177 0.10262 1.8906 0.45551 0.83988 0.82632 1.7478 1.6708 2.2751 0.59217 0.49728 1.2625 1.1553 1.0304 1.9974-0.12338 0.68167 0.04306 1.3099 0.3725 1.908-0.11816 0.67146-0.36073 1.3584-0.4105 2.0183 0.87949 0.62206 2.6705 2.0606 2.8031 0.49489 0.50176-0.45161 0.5321-1.1784 1.3743-1.1804 0.3909-0.47777 0.52549-1.2283 0.81706-1.8117-0.42572-0.5384 0.16631-1.3697 0.8046-1.3477 0.81594 0.06128 0.78593-0.89448 1.1111-1.4232-0.0073-0.77224-0.38892-1.6471 0.30542-2.227 0.52242-0.47344 0.46827-1.1675 0.5498-1.8097-1.171-0.7244-2.712-1.0911-3.6386-2.0687-0.18364-0.76504-0.7598-1.0229-1.4925-1.0784-0.30936-0.43256-0.25697-1.4628-0.79753-1.5131-0.69628 0.13369-1.3857 0.24089-1.8917-0.3644-0.573-0.776-1.069 0.2-1.593 0.546-0.492 0.856-1.8683-0.043-1.7038-1.007 0.4839-1.334-1.6425 0.148-0.7699-1.425 0.4151-1.715-0.7067-0.396-1.2952-0.011-0.71822 0.0081-0.98953-0.70747-0.86146-1.3625-0.091117-0.78733 0.48283-1.1877 1.0669-1.5822 0.78161 0.12038 0.97989-0.56085 1.5654-0.4722 0.73603-0.03767 1.0049 0.66782 1.4232 1.1357 0.17514-0.66797-0.18345-1.6152 0.55606-1.9879 0.56414-0.42781 1.137-0.84927 1.2721-1.5904 0.13304-0.77598 1.2893-0.46761 1.4837-1.2526 0.26877-0.8206 1.5114-0.15823 1.7899-0.96804 0.8733-0.82086-0.27242-0.57178-0.89854-0.59806-1.2353 0.12695 0.1228-0.32763 0.58598-0.58155 0.68608 0.09073 1.3195-0.13384 1.9499-0.37629 0.08445 0.85843 0.24597 1.3112 0.68417 0.30788-0.85421-0.20211-0.11618-1.0402-0.95973-1.2614-0.66764 0.04697 0.0066-1.4189-0.81571-1.2577-1.0697 0.70782-0.11401-0.50251-0.9854-0.66347-0.68736-0.74222-0.85436 0.47657-1.2276 0.9183 0.24207 0.84702-0.79095 0.66525-0.97976 1.3606-0.41814 1.2534-0.24143-0.08931-0.74055-0.41035-0.61653-0.24732-1.3592-0.3784-1.3637-1.1899 0.82658-0.60512 2.0667-0.96189 2.5994-1.9148 0.3095-0.74008-0.26215-1.1445-0.96618-1.0889l-0.000005-2e-7zm14.675 1.642c-0.12491 0.65746 0.5475 1.009 0.30788 1.7104-0.21487 0.76842-0.27728 1.3789 0.68289 0.93046 0.99668-0.51183 0.36052-0.90148-0.03867-1.5728-0.27187-0.44613-0.24574-1.275-0.9521-1.0681zm-0.75259 1.0947c-0.79414-0.24012-0.61745 1.4493-0.12164 1.0118 0.7276-0.17916 0.23703-0.5252 0.12164-1.0118zm10.023 8.9969c0.95184 0.84444 1.277 2.0946 1.8858 3.1596 0.90428 0.39972 0.0415 1.0795 0.44521 1.5712 0.84897 0.92228-1.1752 0.24516-0.90606-0.67899-0.1971-1.2139-1.0559-2.044-1.4678-3.1045-0.04294-0.3526-0.38552-0.71788 0.04284-0.94732z"/>
-   <path id="path8655" style="opacity:.4;stroke:url(#linearGradient15133);fill:none" d="m42.409 24.387c0 10.384-8.4184 18.803-18.801 18.803-10.384 0-18.802-8.4184-18.802-18.803 0-10.384 8.418-18.801 18.802-18.801 10.383 0 18.801 8.4175 18.801 18.801z"/>
-  </g>
-  <g id="g2414" transform="matrix(.99991 -.013701 .013701 .99991 -.28870 .53585)">
-   <path id="path3970" style="stroke-linejoin:round;fill-rule:evenodd;stroke:#666;fill:url(#radialGradient2418)" d="m30.5 20.937 17 16.5-7.75 0.25s3.25 6.75 3.25 6.75c1 3-3.5 4.125-4.25 1.875l-3-6.75-5.5 5.875 0.25-24.5z"/>
-   <path id="path4853" style="opacity:.4;stroke:#fff;fill:none" d="m31.657 23.379 13.476 13.186-6.9219 0.27746l3.8721 7.7566c0.40273 1.6501-2.0283 2.4126-2.5071 1.1529l-3.6831-7.845-4.4247 4.7083 0.18907-19.236z"/>
-  </g>
- </g>
-</svg>

=== removed file 'Ubuntu/Settings/Menus/artwork/default_contact.png'
Binary files Ubuntu/Settings/Menus/artwork/default_contact.png	2013-10-04 09:48:04 +0000 and Ubuntu/Settings/Menus/artwork/default_contact.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Ubuntu/Settings/Menus/artwork/secure.svg'
--- Ubuntu/Settings/Menus/artwork/secure.svg	2013-10-04 09:48:04 +0000
+++ Ubuntu/Settings/Menus/artwork/secure.svg	1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64"
-   height="64"
-   id="svg2986"
-   version="1.1"
-   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="secure.svg">
-  <defs
-     id="defs2988" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="7.9180415"
-     inkscape:cx="7.5048745"
-     inkscape:cy="29.401628"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:snap-grids="false"
-     inkscape:window-width="1549"
-     inkscape:window-height="876"
-     inkscape:window-x="51"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3012"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata2991">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     transform="translate(0,32)">
-    <path
-       inkscape:connector-curvature="0"
-       d="M 29.999999,-18 C 25.568001,-18 22,-14.432 22,-10 v 6 h -2 c -1.107999,0 -2,0.892 -2,2 v 18 c 0,1.108 0.892001,2 2,2 h 24 c 1.108,0 2,-0.892 2,-2 V -2 c 0,-1.108 -0.892,-2 -2,-2 h -2 v -6 c 0,-4.432 -3.568001,-8 -8.000001,-8 h -4 z m 0,4 h 4 c 2.216,0 4,1.784 4,4 v 6 H 26.000001 v -6 c 0,-2.216 1.784,-4 3.999998,-4 z"
-       style="fill:#dfdbd2;fill-rule:evenodd"
-       id="path8" />
-  </g>
-</svg>

=== modified file 'Ubuntu/Settings/Menus/qmldir'
--- Ubuntu/Settings/Menus/qmldir	2014-07-04 14:06:04 +0000
+++ Ubuntu/Settings/Menus/qmldir	2014-07-31 16:42:23 +0000
@@ -14,7 +14,7 @@
 ProgressValueMenu 0.1 ProgressValueMenu.qml
 SectionMenu 0.1 SectionMenu.qml
 SeparatorMenu 0.1 SeparatorMenu.qml
-SimpleTextMessageMenu 0.1 SimpleTextMessageMenu.qml
+SimpleMessageMenu 0.1 SimpleMessageMenu.qml
 SliderMenu 0.1 SliderMenu.qml
 SnapDecisionMenu 0.1 SnapDecisionMenu.qml
 StandardMenu 0.1 StandardMenu.qml
@@ -23,5 +23,3 @@
 TimeZoneMenu 0.1 TimeZoneMenu.qml
 TransferMenu 0.1 TransferMenu.qml
 UserSessionMenu 0.1 UserSessionMenu.qml
-
-internal HeroMessageMenu HeroMessageMenu.qml

=== modified file 'cmake/modules/QmlTest.cmake'
--- cmake/modules/QmlTest.cmake	2013-09-24 10:04:36 +0000
+++ cmake/modules/QmlTest.cmake	2014-07-31 16:42:23 +0000
@@ -20,12 +20,13 @@
 # qmltest_DEFAULT_PROPERTIES
 
 find_program(qmltestrunner_exe qmltestrunner)
-find_program(qmlscene_exe qmlscene)
 
 if(NOT qmltestrunner_exe)
   msg(FATAL_ERROR "Could not locate qmltestrunner.")
 endif()
 
+set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)
+
 macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
     set(options NO_ADD_TEST NO_TARGETS)
     set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
@@ -50,20 +51,29 @@
 
     set(qmlscene_command
         env ${qmltest_ENVIRONMENT}
-        ${qmlscene_exe} ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
+        ${qmlscene_exe} -qmljsdebugger=port:3768 ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
             ${qmlscene_imports}
     )
     add_custom_target(${qmlscene_TARGET} ${qmlscene_command})
 
 endmacro(add_manual_qml_test)
 
+macro(add_qml_benchmark SUBPATH COMPONENT_NAME ITERATIONS)
+    add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} ${ITERATIONS} ${ARGN})
+endmacro(add_qml_benchmark)
+
 macro(add_qml_test SUBPATH COMPONENT_NAME)
+    add_qml_test_internal(${SUBPATH} ${COMPONENT_NAME} 0 ${ARGN})
+endmacro(add_qml_test)
+
+macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
     set(options NO_ADD_TEST NO_TARGETS)
     set(multi_value_keywords IMPORT_PATHS TARGETS PROPERTIES ENVIRONMENT)
 
     cmake_parse_arguments(qmltest "${options}" "" "${multi_value_keywords}" ${ARGN})
 
     set(qmltest_TARGET test${COMPONENT_NAME})
+    set(qmltest_xvfb_TARGET xvfbtest${COMPONENT_NAME})
     set(qmltest_FILE ${SUBPATH}/tst_${COMPONENT_NAME})
 
     set(qmltestrunner_imports "")
@@ -79,13 +89,76 @@
         endforeach(IMPORT_PATH)
     endif()
 
+    string(TOLOWER "${CMAKE_GENERATOR}" cmake_generator_lower)
+    if(cmake_generator_lower STREQUAL "unix makefiles")
+        set(function_ARGS $(FUNCTION))
+    else()
+        set(function_ARGS "")
+    endif()
+
+    if (${ITERATIONS} GREATER 0)
+        set(ITERATIONS_STRING "-iterations" ${ITERATIONS})
+    else()
+        set(ITERATIONS_STRING "")
+    endif()
+
     set(qmltest_command
         env ${qmltest_ENVIRONMENT}
         ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
             ${qmltestrunner_imports}
-            -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
-            -o -,txt
-    )
+            ${ITERATIONS_STRING}
+            -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
+            -o -,txt
+            ${function_ARGS}
+    )
+    find_program(DPKG dpkg-architecture)
+    if(DPKG)
+        exec_program(${DPKG} ARGS "-qDEB_BUILD_MULTIARCH" OUTPUT_VARIABLE ARCH_TRIPLET )
+        set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
+    endif()
+    set(qmltest_xvfb_command
+        env ${qmltest_ENVIRONMENT} ${LD_PRELOAD_PATH}
+        xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
+        ${qmltestrunner_exe} -input ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
+        ${qmltestrunner_imports}
+            -o ${CMAKE_BINARY_DIR}/${qmltest_TARGET}.xml,xunitxml
+            -o -,txt
+            ${function_ARGS}
+    )
+
+    add_qmltest_target(${qmltest_TARGET} "${qmltest_command}" TRUE ${qmltest_NO_ADD_TEST})
+    add_qmltest_target(${qmltest_xvfb_TARGET} "${qmltest_xvfb_command}" ${qmltest_NO_TARGETS} TRUE)
+    add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})
+endmacro(add_qml_test_internal)
+
+macro(add_binary_qml_test CLASS_NAME LD_PATH DEPS)
+    set(testCommand
+          LD_LIBRARY_PATH=${LD_PATH}
+          ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
+          -o ${CMAKE_BINARY_DIR}/${CLASSNAME}Test.xml,xunitxml
+          -o -,txt)
+
+    add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
+    add_dependencies(test${CLASS_NAME} ${CLASS_NAME}TestExec ${DEPS})
+
+    find_program( HAVE_GCC gcc )
+    if (NOT ${HAVE_GCC} STREQUAL "")
+        exec_program( gcc ARGS "-dumpmachine" OUTPUT_VARIABLE ARCH_TRIPLET )
+        set(LD_PRELOAD_PATH "LD_PRELOAD=/usr/lib/${ARCH_TRIPLET}/mesa/libGL.so.1")
+    endif()
+    set(xvfbtestCommand
+          ${LD_PRELOAD_PATH}
+          LD_LIBRARY_PATH=${LD_PATH}
+          xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
+          ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
+          -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml
+          -o -,txt)
+
+    add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)
+    add_dependencies(qmluitests xvfbtest${CLASS_NAME})
+endmacro(add_binary_qml_test)
+
+macro(add_qmltest_target qmltest_TARGET qmltest_command qmltest_NO_TARGETS qmltest_NO_ADD_TEST)
     add_custom_target(${qmltest_TARGET} ${qmltest_command})
 
     if(NOT "${qmltest_PROPERTIES}" STREQUAL "")
@@ -116,5 +189,4 @@
         endif()
     endif("${qmltest_NO_TARGETS}" STREQUAL "FALSE")
 
-    add_manual_qml_test(${SUBPATH} ${COMPONENT_NAME} ${ARGN})
-endmacro(add_qml_test)
+endmacro(add_qmltest_target)

=== added directory 'examples'
=== added file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ examples/CMakeLists.txt	2014-07-31 16:42:23 +0000
@@ -0,0 +1,2 @@
+file(GLOB QML_JS_FILES *.qml *.js)
+add_custom_target( ExampleQmlFiles SOURCES ${QML_JS_FILES} )

=== added file 'examples/MessageComponents.qml'
--- examples/MessageComponents.qml	1970-01-01 00:00:00 +0000
+++ examples/MessageComponents.qml	2014-07-31 16:42:23 +0000
@@ -0,0 +1,113 @@
+/*
+ * 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/>.
+ *
+ * Authored by Andrea Cimitan <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Settings.Components 0.1
+import Ubuntu.Settings.Menus 0.1
+
+Item {
+    property string title: "MessageComponents"
+
+    ListModel {
+        id: model
+        ListElement {
+            type: "text"
+            title: "Text Message"
+            body: "I am a little teacup, short and stout. Here is my handle, and here is my spout. Who are you talking about my spout?! This should be truncated"
+            time: "Sat 31 Oct, 11:00"
+            icon: "image://theme/message"
+            avatar: "artwork/farm.jpg"
+        }
+        ListElement {
+            type: "simple"
+            title: "Simple Text Message Simple"
+            body: "I happen to be tall and thin! But let's try a new line"
+            time: "Yesterday, 10:00"
+            icon: "image://theme/message"
+            avatar: "artwork/beach.jpg"
+        }
+        ListElement {
+            type: "snap"
+            title: "Snap Decision"
+            body: "My mother says I'm handsome!"
+            time: "10:30am"
+            icon: "image://theme/missed-call"
+            avatar: "artwork/night.jpg"
+        }
+    }
+
+    ListView {
+        model: model
+        anchors.fill: parent
+
+        cacheBuffer: 10000
+
+        delegate: Loader {
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            asynchronous: true
+            sourceComponent: model.type === "simple" ? simple :
+                             model.type === "text" ? text :
+                             model.type === "snap" ? snap : undefined
+
+            Component {
+                id: simple
+                SimpleMessageMenu {
+                    avatar: model.avatar
+                    icon: model.icon
+                    title: model.title
+                    body: model.body
+                    time: model.time
+                }
+            }
+
+            Component {
+                id: text
+                TextMessageMenu {
+                    avatar: model.avatar
+                    icon: model.icon
+                    title: model.title
+                    body: model.body
+                    time: model.time
+
+                    onTriggered: {
+                        selected = !selected;
+                    }
+                }
+            }
+
+            Component {
+                id: snap
+                SnapDecisionMenu {
+                    avatar: model.avatar
+                    icon: model.icon
+                    title: model.title
+                    body: model.body
+                    time: model.time
+
+                    onTriggered: {
+                        selected = !selected;
+                    }
+                }
+            }
+        }
+    }
+}

=== added file 'examples/OtherComponents.qml'
--- examples/OtherComponents.qml	1970-01-01 00:00:00 +0000
+++ examples/OtherComponents.qml	2014-07-31 16:42:23 +0000
@@ -0,0 +1,234 @@
+/*
+ * Copyright 2013 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/>.
+ *
+ * Authored by Andrea Cimitan <[e-mail]>
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Settings.Components 0.1
+import Ubuntu.Settings.Menus 0.1
+
+Item {
+    property string title: "Settings Components"
+
+    ListModel {
+        id: mediaPlayerModel
+        ListElement { song: "Mine"; artist: "Taylor Swift"; album: "Speak Now"; albumArt: "../tests/artwork/speak-now.jpg"}
+        ListElement { song: "Stony Ground"; artist: "Richard Thompson"; album: "Electric"; albumArt: "../tests/artwork/electric.jpg"}
+        ListElement { song: "Los Robots"; artist: "Kraftwerk"; album: "The Man-Machine"; albumArt: "../tests/artwork/the-man-machine.jpg"}
+    }
+
+    ListModel {
+        id: timeZoneModel
+        ListElement { city: "San Francisco"; time: "3:00am" }
+        ListElement { city: "London"; time: "11:00am" }
+        ListElement { city: "Rome"; time: "12:00am" }
+    }
+
+    ListModel {
+        id: eventModel
+        ListElement { icon: "image://theme/calendar"; eventColor: "yellow"; text: "Lunch with Lola"; time: "1:10 PM" }
+        ListElement { icon: "image://theme/calendar"; eventColor: "green"; text: "Gym"; time: "6:30 PM" }
+        ListElement { icon: "image://theme/calendar"; eventColor: "red"; text: "Birthday Party"; time: "9:00 PM" }
+    }
+
+    Flickable {
+        id: flickable
+
+        anchors.fill: parent
+        contentWidth: column.width
+        contentHeight: column.height
+
+        Column {
+            id: column
+
+            width: flickable.width
+            height: childrenRect.height
+
+            StandardMenu {
+                text: i18n.tr("Standard Menu\nLook at me, I'm a new line.")
+            }
+
+            StandardMenu {
+                iconSource: "image://theme/calendar"
+                iconColor: "red"
+                text: i18n.tr("Standard Menu")
+                component: Component {
+                    Button {
+                        text: "Press Me"
+                    }
+                }
+                backColor: Qt.rgba(1,1,1,0.1)
+            }
+
+            SliderMenu {
+                id: slider
+                text: i18n.tr("Slider")
+                minimumValue: 0
+                maximumValue: 100
+                value: 20
+
+                minIcon: "image://theme/audio-volume-low"
+                maxIcon: "image://theme/audio-volume-high"
+            }
+
+            ProgressBarMenu {
+                text: i18n.tr("ProgressBar")
+                value: slider.value
+                minimumValue: 0
+                maximumValue: 100
+            }
+
+            ProgressValueMenu {
+                text: i18n.tr("ProgressValue")
+                value: slider.value
+            }
+
+            ButtonMenu {
+                text: i18n.tr("Button")
+                buttonText: i18n.tr("Hello world!")
+            }
+
+            CheckableMenu {
+                text: i18n.tr("Checkable")
+                checked: true
+            }
+
+            SwitchMenu {
+                text: i18n.tr("Switch")
+                checked: true
+            }
+
+            SectionMenu {
+                text: i18n.tr("Section Starts Here")
+                busy: true
+            }
+
+            SeparatorMenu {}
+
+            CalendarMenu {
+                id: calendar
+            }
+
+            UserSessionMenu {
+                name: i18n.tr("Lola Chang")
+                iconSource: Qt.resolvedUrl("../tests/artwork/avatar.png")
+                active: true
+            }
+
+            MediaPlayerMenu {
+                id: mediaPlayer
+                property int index: 0
+
+                playerName: "Rhythmbox"
+                playerIcon: Qt.resolvedUrl("../tests/artwork/rhythmbox.png")
+                song: mediaPlayerModel.get(index).song;
+                artist: mediaPlayerModel.get(index).artist;
+                album: mediaPlayerModel.get(index).album;
+                albumArt: mediaPlayerModel.get(index).albumArt;
+            }
+
+            PlaybackItemMenu {
+                canPlay: true
+                canGoNext: mediaPlayer.index < mediaPlayerModel.count - 1
+                canGoPrevious: mediaPlayer.index > 0
+                playing: mediaPlayer.running
+
+                onPrevious: mediaPlayer.index = Math.max(mediaPlayer.index - 1, 0)
+                onNext: mediaPlayer.index = Math.min(mediaPlayer.index + 1, mediaPlayerModel.count - 1)
+                onPlay: { mediaPlayer.running = !mediaPlayer.running; }
+            }
+
+            AccessPointMenu {
+                active: true
+                secure: true
+                adHoc: false
+                signalStrength: 50
+                text: "Access Point"
+
+                onTriggered: active = !active
+            }
+
+            GroupedMessageMenu {
+                text: "Group Message"
+                count: "4100"
+            }
+
+            Column {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                Repeater {
+                    model: timeZoneModel
+
+                    TimeZoneMenu {
+                        city: model.city
+                        time: model.time
+                    }
+                }
+            }
+
+            Column {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                Repeater {
+                    model: eventModel
+
+                    EventMenu {
+                        iconSource: model.icon
+                        text: model.text
+                        eventColor: model.eventColor
+                        time: model.time
+                    }
+                }
+            }
+
+            Row {
+                anchors {
+                    left: parent.left
+                    right: parent.right
+                }
+
+                spacing: units.gu(1)
+
+                Label {
+                    text: "StatusIcon"
+                    anchors.verticalCenter: parent.verticalCenter
+                }
+
+                StatusIcon {
+                    height: units.gu(5)
+                    source: "image://theme/gps"
+                }
+
+                StatusIcon {
+                    height: units.gu(5)
+                    source: "image://theme/battery-caution"
+                }
+
+                StatusIcon {
+                    height: units.gu(5)
+                    source: "image://theme/missing,gpm-battery-000-charging"
+                }
+            }
+        }
+    }
+}

=== renamed file 'SettingsComponents.qml' => 'examples/SettingsComponents.qml'
--- SettingsComponents.qml	2014-07-04 14:07:50 +0000
+++ examples/SettingsComponents.qml	2014-07-31 16:42:23 +0000
@@ -22,270 +22,45 @@
 import Ubuntu.Settings.Menus 0.1
 
 MainView {
+    id: mainView
     // Note! applicationName needs to match the .desktop filename
     applicationName: "SettingsComponents"
 
     width: units.gu(42)
     height: units.gu(75)
 
-    ListModel {
-        id: mediaPlayerModel
-        ListElement { song: "Mine"; artist: "Taylor Swift"; album: "Speak Now"; albumArt: "tests/artwork/speak-now.jpg"}
-        ListElement { song: "Stony Ground"; artist: "Richard Thompson"; album: "Electric"; albumArt: "tests/artwork/electric.jpg"}
-        ListElement { song: "Los Robots"; artist: "Kraftwerk"; album: "The Man-Machine"; albumArt: "tests/artwork/the-man-machine.jpg"}
-    }
-
-    ListModel {
-        id: timeZoneModel
-        ListElement { city: "San Francisco"; time: "3:00am" }
-        ListElement { city: "London"; time: "11:00am" }
-        ListElement { city: "Rome"; time: "12:00am" }
-    }
-
-    ListModel {
-        id: eventModel
-        ListElement { icon: "image://theme/calendar"; eventColor: "yellow"; text: "Lunch with Lola"; time: "1:10 PM" }
-        ListElement { icon: "image://theme/calendar"; eventColor: "green"; text: "Gym"; time: "6:30 PM" }
-        ListElement { icon: "image://theme/calendar"; eventColor: "red"; text: "Birthday Party"; time: "9:00 PM" }
+    Component.onCompleted: {
+        Theme.name = "Ubuntu.Components.Themes.SuruGradient"
+    }
+
+    ListModel {
+        id: pages
+        ListElement { source: "OtherComponents.qml" }
+        ListElement { source: "MessageComponents.qml" }
+        ListElement { source: "TransferComponents.qml" }
     }
 
     Page {
-        title: "SettingsComponents"
-
-        Flickable {
-            id: flickable
-
+        title: listView.currentItem ? listView.currentItem.item.title : "Components"
+        clip: true
+
+        ListView {
+            id: listView
+            model: pages
             anchors.fill: parent
-            contentWidth: column.width
-            contentHeight: column.height
-
-            Column {
-                id: column
-
-                width: flickable.width
-                height: childrenRect.height
-
-                StandardMenu {
-                    text: i18n.tr("Standard Menu\nLook at me, I'm a new line.")
-                }
-
-                StandardMenu {
-                    iconSource: "image://theme/calendar"
-                    iconColor: "red"
-                    text: i18n.tr("Standard Menu")
-                    component: Component {
-                        Button {
-                            text: "Press Me"
-                        }
-                    }
-                }
-
-
-                SliderMenu {
-                    id: slider
-                    text: i18n.tr("Slider")
-                    minimumValue: 0
-                    maximumValue: 100
-                    value: 20
-
-                    minIcon: "image://theme/audio-volume-low"
-                    maxIcon: "image://theme/audio-volume-high"
-                }
-
-                ProgressBarMenu {
-                    text: i18n.tr("ProgressBar")
-                    value: slider.value
-                    minimumValue: 0
-                    maximumValue: 100
-                }
-
-                ProgressValueMenu {
-                    text: i18n.tr("ProgressValue")
-                    value: slider.value
-                }
-
-                ButtonMenu {
-                    text: i18n.tr("Button")
-                    buttonText: i18n.tr("Hello world!")
-                }
-
-                CheckableMenu {
-                    text: i18n.tr("Checkable")
-                    checked: true
-                }
-
-                SwitchMenu {
-                    text: i18n.tr("Switch")
-                    checked: true
-                }
-
-                SectionMenu {
-                    text: i18n.tr("Section Starts Here")
-                    busy: true
-                }
-
-                SeparatorMenu {}
-
-                CalendarMenu {
-                    id: calendar
-                }
-
-                UserSessionMenu {
-                    name: i18n.tr("Lola Chang")
-                    iconSource: Qt.resolvedUrl("tests/artwork/avatar.png")
-                    active: true
-                }
-
-                MediaPlayerMenu {
-                    id: mediaPlayer
-                    property int index: 0
-
-                    playerName: "Rhythmbox"
-                    playerIcon: Qt.resolvedUrl("tests/artwork/rhythmbox.png")
-                    song: mediaPlayerModel.get(index).song;
-                    artist: mediaPlayerModel.get(index).artist;
-                    album: mediaPlayerModel.get(index).album;
-                    albumArt: mediaPlayerModel.get(index).albumArt;
-                }
-
-                PlaybackItemMenu {
-                    canPlay: true
-                    canGoNext: true
-                    canGoPrevious: true
-                    playing: mediaPlayer.running
-
-                    onPrevious: mediaPlayer.index = Math.max(mediaPlayer.index - 1, 0)
-                    onNext: mediaPlayer.index = Math.min(mediaPlayer.index + 1, mediaPlayerModel.count - 1)
-                    onPlay: { mediaPlayer.running = !mediaPlayer.running; }
-                }
-
-                TransferMenu {
-                    text: "Video Downloading"
-                    stateText: "3 minutes remaning"
-                    iconSource: "tests/artwork/speak-now.jpg"
-                    progress: 0.6
-                    active: true
-                    removable: true
-                    confirmRemoval: true
-                }
-
-                TransferMenu {
-                    text: "Video Downloading"
-                    iconSource: "tests/artwork/speak-now.jpg"
-                    progress: 0.6
-                    active: false
-                    removable: true
-                    confirmRemoval: true
-                }
-
-                AccessPointMenu {
-                    checked: true
-                    secure: true
-                    adHoc: false
-                    signalStrength: 50
-                    text: "Access Point"
-                }
-
-                GroupedMessageMenu {
-                    text: "Group Message"
-                    count: "4"
-                }
-
-                SnapDecisionMenu {
-                    title: "Snap Decision"
-                    time: "10:30am"
-                    message: "My mother says I'm handsome!"
-
-                    replyMessages: ["Yeah right", "Sure she did"]
-
-                    onTriggered: {
-                        selected = !selected;
-                    }
-                }
-
-                SimpleTextMessageMenu {
-                    title: "Simple Text Message"
-                    time: "11am"
-                    message: "I am a little teacup"
-
-                    onTriggered: {
-                        selected = !selected;
-                    }
-                }
-
-                TextMessageMenu {
-                    title: "Text Message"
-                    time: "11am"
-                    message: "I happen to be tall and thin!"
-
-                    onTriggered: {
-                        selected = !selected;
-                    }
-                }
-
-                Column {
-                    anchors {
-                        left: parent.left
-                        right: parent.right
-                    }
-
-                    Repeater {
-                        model: timeZoneModel
-
-                        TimeZoneMenu {
-                            city: model.city
-                            time: model.time
-                        }
-                    }
-                }
-
-                Column {
-                    anchors {
-                        left: parent.left
-                        right: parent.right
-                    }
-
-                    Repeater {
-                        model: eventModel
-
-                        EventMenu {
-                            iconSource: model.icon
-                            text: model.text
-                            eventColor: model.eventColor
-                            time: model.time
-                        }
-                    }
-                }
-
-                Row {
-                    anchors {
-                        left: parent.left
-                        right: parent.right
-                    }
-
-                    spacing: units.gu(1)
-
-                    Label {
-                        text: "StatusIcon"
-                        anchors.verticalCenter: parent.verticalCenter
-                    }
-
-                    StatusIcon {
-                        height: units.gu(5)
-                        source: "image://theme/gps"
-                    }
-
-                    StatusIcon {
-                        height: units.gu(5)
-                        source: "image://theme/battery-caution"
-                    }
-
-                    StatusIcon {
-                        height: units.gu(5)
-                        source: "image://theme/missing,gpm-battery-000-charging"
-                    }
-                }
+
+            orientation: ListView.Horizontal
+            snapMode: ListView.SnapOneItem
+            highlightRangeMode: ListView.StrictlyEnforceRange
+            boundsBehavior: Flickable.StopAtBounds
+
+            delegate: Loader {
+                width: ListView.view.width
+                height: ListView.view.height
+
+                source: model.source
             }
         }
+
     }
 }

=== added file 'examples/TransferComponents.qml'
--- examples/TransferComponents.qml	1970-01-01 00:00:00 +0000
+++ examples/TransferComponents.qml	2014-07-31 16:42:23 +0000
@@ -0,0 +1,81 @@
+/*
+* 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/>.
+*
+* Authored by Andrea Cimitan <[e-mail]>
+*/
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Settings.Components 0.1
+import Ubuntu.Settings.Menus 0.1
+
+Item {
+    property string title: "Transfer Components"
+
+    ListModel {
+        id: model
+        ListElement {
+            text: "File name here"
+            state: "Starting…"
+            progress: 0
+            image: "image://theme/video-x-generic-symbolic"
+            active: true
+        }
+        ListElement {
+            text: "proposition.pdf"
+            state: "10 seconds remaining"
+            progress: 0.7
+            image: "../tests/artwork/the-man-machine.jpg"
+            active: true
+        }
+        ListElement {
+            text: "electric.jpg"
+            state: "Failed, tap to retry"
+            progress: 1.0
+            image: "../tests/artwork/electric.jpg"
+            active: true
+        }
+        ListElement {
+            text: "clubbing-friday.jpg.jpg"
+            state: "no state"
+            progress: 0.4
+            image: "../tests/artwork/speak-now.jpg"
+            active: false
+        }
+    }
+
+    ListView {
+        model: model
+        anchors.fill: parent
+
+        cacheBuffer: 10000
+
+        delegate: Loader {
+            anchors {
+                left: parent.left
+                right: parent.right
+            }
+            asynchronous: true
+
+            sourceComponent: TransferMenu {
+                text: model.text
+                stateText: model.state
+                progress: model.progress
+                iconSource: model.image
+                active: model.active
+            }
+        }
+    }
+}

=== added directory 'examples/artwork'
=== added file 'examples/artwork/beach.jpg'
Binary files examples/artwork/beach.jpg	1970-01-01 00:00:00 +0000 and examples/artwork/beach.jpg	2014-07-31 16:42:23 +0000 differ
=== added file 'examples/artwork/farm.jpg'
Binary files examples/artwork/farm.jpg	1970-01-01 00:00:00 +0000 and examples/artwork/farm.jpg	2014-07-31 16:42:23 +0000 differ
=== added file 'examples/artwork/insane.jpg'
Binary files examples/artwork/insane.jpg	1970-01-01 00:00:00 +0000 and examples/artwork/insane.jpg	2014-07-31 16:42:23 +0000 differ
=== added file 'examples/artwork/night.jpg'
Binary files examples/artwork/night.jpg	1970-01-01 00:00:00 +0000 and examples/artwork/night.jpg	2014-07-31 16:42:23 +0000 differ
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-10-04 10:52:27 +0000
+++ tests/CMakeLists.txt	2014-07-31 16:42:23 +0000
@@ -8,3 +8,4 @@
 add_dependencies(qmltests qmluitests)
 
 add_subdirectory(qmltests)
+add_subdirectory(uqmlscene)

=== modified file 'tests/qmltests/CMakeLists.txt'
--- tests/qmltests/CMakeLists.txt	2014-07-04 14:07:50 +0000
+++ tests/qmltests/CMakeLists.txt	2014-07-31 16:42:23 +0000
@@ -3,7 +3,7 @@
 
 set(qmltest_DEFAULT_TARGETS qmluitests)
 set(qmltest_DEFAULT_NO_ADD_TEST TRUE)
-set(qmltest_DEFAULT_PROPERTIES "")
+set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "LC_ALL=C")
 
 set(qmltest_DEFAULT_IMPORT_PATHS
   ${CMAKE_BINARY_DIR}
@@ -24,7 +24,7 @@
 add_qml_test(Menus ProgressBarMenu)
 add_qml_test(Menus ProgressValueMenu)
 add_qml_test(Menus SectionMenu)
-add_qml_test(Menus SimpleTextMessageMenu)
+add_qml_test(Menus SimpleMessageMenu)
 add_qml_test(Menus SliderMenu)
 add_qml_test(Menus SnapDecisionMenu)
 add_qml_test(Menus SwitchMenu)
@@ -32,3 +32,4 @@
 add_qml_test(Menus TextMessageMenu)
 add_qml_test(Menus TimeZoneMenu)
 add_qml_test(Menus TransferMenu)
+

=== modified file 'tests/qmltests/Menus/tst_AccessPointMenu.qml'
--- tests/qmltests/Menus/tst_AccessPointMenu.qml	2014-03-26 17:50:59 +0000
+++ tests/qmltests/Menus/tst_AccessPointMenu.qml	2014-07-31 16:42:23 +0000
@@ -47,7 +47,7 @@
                 id: accessPoint2
                 anchors.top: accessPoint.bottom
 
-                checked: true
+                active: true
                 secure: true
                 adHoc: true
                 signalStrength: 50
@@ -67,7 +67,7 @@
         when: windowShown
 
         function init() {
-            accessPoint.checked = false;
+            accessPoint.active = false;
             accessPoint.secure = false;
             accessPoint.adHoc = false;
             accessPoint.signalStrength = 0;
@@ -124,23 +124,5 @@
             accessPoint.secure = false;
             compare(icon.visible, false, "Secure icon should not be visible when access point is not secure");
         }
-
-        function test_checkBox(data) {
-            var checkBox = UtilsJS.findChild(accessPoint, "checkBox");
-            verify(checkBox !== undefined);
-
-            accessPoint.checked = true;
-            compare(checkBox.checked, true, "Checkbox should be checked when access point is checked");
-
-            accessPoint.checked = false;
-            compare(checkBox.checked, false, "Checkbox should not be checked when access point is not checked");
-        }
-
-        function test_checkBox_on_default_checked() {
-            var checkBox = UtilsJS.findChild(accessPoint2, "checkBox");
-            verify(checkBox !== undefined);
-
-            compare(checkBox.checked, true, "Check box should be checked if default to checked")
-        }
     }
 }

=== renamed file 'tests/qmltests/Menus/tst_SimpleTextMessageMenu.qml' => 'tests/qmltests/Menus/tst_SimpleMessageMenu.qml'
--- tests/qmltests/Menus/tst_SimpleTextMessageMenu.qml	2013-12-13 17:51:57 +0000
+++ tests/qmltests/Menus/tst_SimpleMessageMenu.qml	2014-07-31 16:42:23 +0000
@@ -19,7 +19,6 @@
 import QtQuick 2.0
 import QtTest 1.0
 import Ubuntu.Test 0.1
-import Ubuntu.Components 0.1
 import Ubuntu.Settings.Menus 0.1
 import "../utils.js" as UtilsJS
 
@@ -40,22 +39,22 @@
             width: flickable.width
             height: childrenRect.height
 
-            SimpleTextMessageMenu {
+            SimpleMessageMenu {
                 id: messageMenu
                 removable: false
 
                 title: "Text Message"
+                body: "I am a little teapot"
                 time: "11:08am"
-                message: "I am a little teapot"
             }
 
-            SimpleTextMessageMenu {
+            SimpleMessageMenu {
                 id: messageMenuRemovable
                 removable: true
                 anchors.top: messageMenu.bottom
             }
 
-            TextMessageMenu {
+            SimpleMessageMenu {
                 id: messageMenuSelected
                 removable: true
                 anchors.top: messageMenuRemovable.bottom
@@ -64,8 +63,8 @@
     }
 
     SignalSpy {
-        id: signalSpyActivateApp
-        signalName: "appActivated"
+        id: signalSpyIconActivated
+        signalName: "iconActivated"
         target: messageMenuSelected
     }
 
@@ -80,7 +79,7 @@
         when: windowShown
 
         function init() {
-            signalSpyActivateApp.clear();
+            signalSpyIconActivated.clear();
             signalSpyDismiss.clear();
             messageMenuSelected.selected = false;
         }
@@ -110,54 +109,61 @@
         function test_time(data) {
             messageMenu.time = data.time;
 
-            var subtitle = UtilsJS.findChild(messageMenu, "subtitle");
-            verify(subtitle !== undefined, "No subtitle");
-            compare(subtitle.text, data.time, "Time does not match set time.");
-        }
-
-        function test_appIcon_data() {
-            return [
-                { appIcon: Qt.resolvedUrl("../../artwork/avatar.png") },
-                { appIcon: Qt.resolvedUrl("../../artwork/rhythmbox.png") },
-            ];
-        }
-
-        function test_appIcon(data) {
-            messageMenu.appIcon = data.appIcon;
-
-            var appIcon = UtilsJS.findChild(messageMenu, "appIcon");
-            verify(appIcon !== undefined, "No app icon");
-            compare(appIcon.source, data.appIcon, "App Icon does not match set icon.");
-        }
-
-        function test_message_data() {
-            return [
-                { message: "This is a test." },
-                { message: "Test is also a test." },
-            ];
-        }
-
-        function test_message(data) {
-            messageMenu.message = data.message;
+            var time = UtilsJS.findChild(messageMenu, "time");
+            verify(time !== undefined, "No time");
+            compare(time.text, data.time, "Time does not match set time.");
+        }
+
+        function test_avatar_data() {
+            return [
+                { avatar: Qt.resolvedUrl("../../artwork/avatar.png") },
+                { avatar: Qt.resolvedUrl("../../artwork/rhythmbox.png") },
+            ];
+        }
+
+        function test_avatar(data) {
+            messageMenu.avatar = data.avatar;
+
+            var avatar = UtilsJS.findChild(messageMenu, "avatar");
+            verify(avatar !== undefined, "No avatar");
+            compare(avatar.source, data.avatar, "Avatar does not match set avatar.");
+        }
+
+        function test_icon_data() {
+            return [
+                { icon: Qt.resolvedUrl("../../artwork/avatar.png") },
+                { icon: Qt.resolvedUrl("../../artwork/rhythmbox.png") },
+            ];
+        }
+
+        function test_icon(data) {
+            messageMenu.icon = data.icon;
+
+            var icon = UtilsJS.findChild(messageMenu, "icon");
+            verify(icon !== undefined, "No icon");
+            compare(icon.source, data.icon, "Icon does not match set icon.");
+        }
+
+        function test_body_data() {
+            return [
+                { body: "This is a test." },
+                { body: "Test is also a test." },
+            ];
+        }
+
+        function test_body(data) {
+            messageMenu.body = data.body;
 
             var body = UtilsJS.findChild(messageMenu, "body");
             verify(body !== undefined, "No body");
-            compare(body.text, data.message, "Message does not match set message.");
+            compare(body.text, data.body, "Message does not match set message.");
         }
 
-        function test_activateApp() {
-            var appIcon = UtilsJS.findChild(messageMenuSelected, "appIcon");
-
-            mouseClick(appIcon, appIcon.width * 2, appIcon.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
-            compare(signalSpyActivateApp.count, 0, "activate app should not have been triggered");
-
-            messageMenuSelected.selected = false;
-            mouseClick(appIcon, appIcon.width / 2, appIcon.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
-            compare(signalSpyActivateApp.count, 0, "activate app should not have been triggered when not selected");
-
-            messageMenuSelected.selected = true;
-            mouseClick(appIcon, appIcon.width / 2, appIcon.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
-            compare(signalSpyActivateApp.count > 0, true, "activate app should have been triggered when selected");
+        function test_iconActivated() {
+            var icon = UtilsJS.findChild(messageMenuSelected, "icon");
+
+            mouseClick(icon, icon.width / 2, icon.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
+            compare(signalSpyIconActivated.count > 0, true, "activate icon should have been triggered");
         }
 
         function test_dismiss() {

=== modified file 'tests/qmltests/Menus/tst_SnapDecisionMenu.qml'
--- tests/qmltests/Menus/tst_SnapDecisionMenu.qml	2013-12-16 12:14:25 +0000
+++ tests/qmltests/Menus/tst_SnapDecisionMenu.qml	2014-07-31 16:42:23 +0000
@@ -45,8 +45,8 @@
                 removable: false
 
                 title: "Text Message"
+                body: "I am a little teapot"
                 time: "11:08am"
-                message: "I am a little teapot"
             }
 
             SnapDecisionMenu {
@@ -71,8 +71,8 @@
     property string textMessageReply: ""
 
     SignalSpy {
-        id: signalSpyActivateApp
-        signalName: "appActivated"
+        id: signalSpyIconActivated
+        signalName: "iconActivated"
         target: messageMenuSelected
     }
 
@@ -83,8 +83,8 @@
     }
 
     SignalSpy {
-        id: signalSpyActivate
-        signalName: "activated"
+        id: signalSpyActionActivated
+        signalName: "actionActivated"
         target: messageMenuSelected
     }
 
@@ -99,9 +99,9 @@
         when: windowShown
 
         function init() {
-            signalSpyActivateApp.clear();
+            signalSpyIconActivated.clear();
             signalSpyDismiss.clear();
-            signalSpyActivate.clear();
+            signalSpyActionActivated.clear();
             signalSpyReply.clear();
             textMessageReply = "";
 
@@ -109,6 +109,8 @@
             messageMenuSelected.selected = false;
         }
 
+
+
         function test_title_data() {
             return [
                 { title: "title1" },
@@ -134,39 +136,71 @@
         function test_time(data) {
             messageMenu.time = data.time;
 
+            var subtitle = UtilsJS.findChild(messageMenu, "time");
+            verify(subtitle !== undefined, "No time");
+            compare(subtitle.text, data.time, "Time does not match set time.");
+        }
+
+        function test_avatar_data() {
+            return [
+                { avatar: Qt.resolvedUrl("../../artwork/avatar.png") },
+                { avatar: Qt.resolvedUrl("../../artwork/rhythmbox.png") },
+            ];
+        }
+
+        function test_avatar(data) {
+            messageMenu.avatar = data.avatar;
+
+            var avatar = UtilsJS.findChild(messageMenu, "avatar");
+            verify(avatar !== undefined, "No avatar");
+            compare(avatar.source, data.avatar, "Avatar does not match set avatar.");
+        }
+
+        function test_icon_data() {
+            return [
+                { icon: Qt.resolvedUrl("../../artwork/avatar.png") },
+                { icon: Qt.resolvedUrl("../../artwork/rhythmbox.png") },
+            ];
+        }
+
+        function test_icon(data) {
+            messageMenu.icon = data.icon;
+
+            var icon = UtilsJS.findChild(messageMenu, "icon");
+            verify(icon !== undefined, "No icon");
+            compare(icon.source, data.icon, "Icon does not match set icon.");
+        }
+
+        function test_body_data() {
+            return [
+                { body: "This is a test." },
+                { body: "Test is also a test." },
+            ];
+        }
+
+        function test_body(data) {
+            messageMenu.body = data.body;
+
             var body = UtilsJS.findChild(messageMenu, "body");
             verify(body !== undefined, "No body");
-            compare(body.text, data.time, "Time does not match set time.");
-        }
-
-        function test_appIcon_data() {
-            return [
-                { appIcon: Qt.resolvedUrl("../../artwork/avatar.png") },
-                { appIcon: Qt.resolvedUrl("../../artwork/rhythmbox.png") },
-            ];
-        }
-
-        function test_appIcon(data) {
-            messageMenu.appIcon = data.appIcon;
-
-            var appIcon = UtilsJS.findChild(messageMenu, "appIcon");
-            verify(appIcon !== undefined, "No app icon");
-            compare(appIcon.source, data.appIcon, "App Icon does not match set icon.");
-        }
-
-        function test_message_data() {
-            return [
-                { message: "This is a test." },
-                { message: "Test is also a test." },
-            ];
-        }
-
-        function test_message(data) {
-            messageMenu.message = data.message;
-
-            var subtitle = UtilsJS.findChild(messageMenu, "subtitle");
-            verify(subtitle !== undefined, "No subtitle");
-            compare(subtitle.text, data.message, "Message does not match set message.");
+            compare(body.text, data.body, "Message does not match set message.");
+        }
+
+        function test_iconActivated() {
+            var icon = UtilsJS.findChild(messageMenuSelected, "icon");
+
+            mouseClick(icon, icon.width / 2, icon.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
+            compare(signalSpyIconActivated.count > 0, true, "activate icon should have been triggered");
+        }
+
+        function test_dismiss() {
+            mouseFlick(messageMenuRemovable,
+                       messageMenuRemovable.width / 2,
+                       messageMenuRemovable.height / 2,
+                       messageMenuRemovable.width,
+                       messageMenuRemovable.height / 2,
+                       true, true, units.gu(1), 10);
+            tryCompareFunction(function() { return signalSpyDismiss.count > 0; }, true);
         }
 
         function test_replyButtonText_data() {
@@ -184,52 +218,27 @@
             compare(button.text, data.buttonText, "Button text does not match set text.");
         }
 
-        function test_activateApp() {
-            var appIcon = UtilsJS.findChild(messageMenuSelected, "appIcon");
-
-            mouseClick(appIcon, appIcon.width * 2, appIcon.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
-            compare(signalSpyActivateApp.count, 0, "activate app should not have been triggered");
-
-            messageMenuSelected.selected = false;
-            mouseClick(appIcon, appIcon.width / 2, appIcon.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
-            compare(signalSpyActivateApp.count, 0, "activate app should not have been triggered when not selected");
-
-            messageMenuSelected.selected = true;
-            mouseClick(appIcon, appIcon.width / 2, appIcon.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
-            compare(signalSpyActivateApp.count > 0, true, "activate app should have been triggered when selected");
-        }
-
-        function test_dismiss() {
-            mouseFlick(messageMenuRemovable,
-                       messageMenuRemovable.width / 2,
-                       messageMenuRemovable.height / 2,
-                       messageMenuRemovable.width,
-                       messageMenuRemovable.height / 2,
-                       true, true, units.gu(1), 10);
-            tryCompareFunction(function() { return signalSpyDismiss.count > 0; }, true);
-        }
-
         function test_activateEnabled() {
             messageMenuSelected.selected = true;
-            messageMenuSelected.activateEnabled = false;
+            messageMenuSelected.actionEnabled = false;
 
             var actionButton = UtilsJS.findChild(messageMenuSelected, "actionButton");
             verify(actionButton !== undefined, "Action button not found");
 
             compare(actionButton.enabled, false, "Action button should not be enabled when activateEnabled=false");
-            messageMenuSelected.activateEnabled = true
+            messageMenuSelected.actionEnabled = true
             compare(actionButton.enabled, true, "Action button should be enabled when activateEnabled=true");
         }
 
-        function test_activate() {
+        function test_actionActivated() {
             messageMenuSelected.selected = true;
-            messageMenuSelected.activateEnabled = true;
+            messageMenuSelected.actionEnabled = true;
 
             var actionButton = UtilsJS.findChild(messageMenuSelected, "actionButton");
             verify(actionButton !== undefined, "Action button not found");
 
             mouseClick(actionButton, actionButton.width / 2, actionButton.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
-            compare(signalSpyActivate.count > 0, true);
+            compare(signalSpyActionActivated.count > 0, true);
         }
 
         function test_replyEnabled_data() {
@@ -286,28 +295,5 @@
                 { tag: 'reply3', index: 2, expected: "reply3" }
             ]
         }
-
-        function test_reply_with_message(data) {
-            messageMenuSelected.selected = true;
-            messageMenu.replyEnabled = true;
-            messageMenuSelected.replyMessages = [ "reply1", "reply2", "reply3", "reply4" ];
-
-            var messageButton = UtilsJS.findChild(messageMenuSelected, "messageButton");
-            verify(messageButton !== undefined, "Message button not found");
-            mouseClick(messageButton, messageButton.width / 2, messageButton.height / 2, Qt.LeftButton, Qt.NoModifier, 300);
-
-            tryCompareFunction(function() { return messageMenuSelected.implicitHeight == messageMenuSelected.expandedHeight; }, true);
-
-            var replyMessage = UtilsJS.findChild(messageMenuSelected, "replyMessage"+data.index);
-            verify(replyMessage !== undefined, "Reply message not found");
-            mouseClick(replyMessage, replyMessage.width / 2, replyMessage.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
-
-            var sendButton = UtilsJS.findChild(messageMenuSelected, "sendButton");
-            verify(sendButton !== undefined, "Send button not found");
-
-            mouseClick(sendButton, sendButton.width / 2, sendButton.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
-            compare(signalSpyReply.count > 0, true);
-            compare(textMessageReply, data.expected, "Text message did not reply with correct text.");
-        }
     }
 }

=== modified file 'tests/qmltests/Menus/tst_TextMessageMenu.qml'
--- tests/qmltests/Menus/tst_TextMessageMenu.qml	2013-12-13 17:51:57 +0000
+++ tests/qmltests/Menus/tst_TextMessageMenu.qml	2014-07-31 16:42:23 +0000
@@ -45,8 +45,8 @@
                 removable: false
 
                 title: "Text Message"
+                body: "I am a little teapot"
                 time: "11:08am"
-                message: "I am a little teapot"
             }
 
             TextMessageMenu {
@@ -70,8 +70,8 @@
     property string textMessageReply: ""
 
     SignalSpy {
-        id: signalSpyActivateApp
-        signalName: "appActivated"
+        id: signalSpyIconActivated
+        signalName: "iconActivated"
         target: messageMenuSelected
     }
 
@@ -92,7 +92,7 @@
         when: windowShown
 
         function init() {
-            signalSpyActivateApp.clear();
+            signalSpyIconActivated.clear();
             signalSpyDismiss.clear();
             signalSpyReply.clear();
             textMessageReply = "";
@@ -126,39 +126,71 @@
         function test_time(data) {
             messageMenu.time = data.time;
 
-            var subtitle = UtilsJS.findChild(messageMenu, "subtitle");
-            verify(subtitle !== undefined, "No subtitle");
+            var subtitle = UtilsJS.findChild(messageMenu, "time");
+            verify(subtitle !== undefined, "No time");
             compare(subtitle.text, data.time, "Time does not match set time.");
         }
 
-        function test_appIcon_data() {
-            return [
-                { appIcon: Qt.resolvedUrl("../../artwork/avatar.png") },
-                { appIcon: Qt.resolvedUrl("../../artwork/rhythmbox.png") },
-            ];
-        }
-
-        function test_appIcon(data) {
-            messageMenu.appIcon = data.appIcon;
-
-            var appIcon = UtilsJS.findChild(messageMenu, "appIcon");
-            verify(appIcon !== undefined, "No app icon");
-            compare(appIcon.source, data.appIcon, "App Icon does not match set icon.");
-        }
-
-        function test_message_data() {
-            return [
-                { message: "This is a test." },
-                { message: "Test is also a test." },
-            ];
-        }
-
-        function test_message(data) {
-            messageMenu.message = data.message;
+        function test_avatar_data() {
+            return [
+                { avatar: Qt.resolvedUrl("../../artwork/avatar.png") },
+                { avatar: Qt.resolvedUrl("../../artwork/rhythmbox.png") },
+            ];
+        }
+
+        function test_avatar(data) {
+            messageMenu.avatar = data.avatar;
+
+            var avatar = UtilsJS.findChild(messageMenu, "avatar");
+            verify(avatar !== undefined, "No avatar");
+            compare(avatar.source, data.avatar, "Avatar does not match set avatar.");
+        }
+
+        function test_icon_data() {
+            return [
+                { icon: Qt.resolvedUrl("../../artwork/avatar.png") },
+                { icon: Qt.resolvedUrl("../../artwork/rhythmbox.png") },
+            ];
+        }
+
+        function test_icon(data) {
+            messageMenu.icon = data.icon;
+
+            var icon = UtilsJS.findChild(messageMenu, "icon");
+            verify(icon !== undefined, "No icon");
+            compare(icon.source, data.icon, "Icon does not match set icon.");
+        }
+
+        function test_body_data() {
+            return [
+                { body: "This is a test." },
+                { body: "Test is also a test." },
+            ];
+        }
+
+        function test_body(data) {
+            messageMenu.body = data.body;
 
             var body = UtilsJS.findChild(messageMenu, "body");
             verify(body !== undefined, "No body");
-            compare(body.text, data.message, "Message does not match set message.");
+            compare(body.text, data.body, "Message does not match set message.");
+        }
+
+        function test_iconActivated() {
+            var icon = UtilsJS.findChild(messageMenuSelected, "icon");
+
+            mouseClick(icon, icon.width / 2, icon.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
+            compare(signalSpyIconActivated.count > 0, true, "activate icon should have been triggered");
+        }
+
+        function test_dismiss() {
+            mouseFlick(messageMenuRemovable,
+                       messageMenuRemovable.width / 2,
+                       messageMenuRemovable.height / 2,
+                       messageMenuRemovable.width,
+                       messageMenuRemovable.height / 2,
+                       true, true, units.gu(1), 10);
+            tryCompareFunction(function() { return signalSpyDismiss.count > 0; }, true);
         }
 
         function test_replyButtonText_data() {
@@ -176,31 +208,6 @@
             compare(button.text, data.buttonText, "Button text does not match set text.");
         }
 
-        function test_activateApp() {
-            var appIcon = UtilsJS.findChild(messageMenuSelected, "appIcon");
-
-            mouseClick(appIcon, appIcon.width * 2, appIcon.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
-            compare(signalSpyActivateApp.count, 0, "activate app should not have been triggered");
-
-            messageMenuSelected.selected = false;
-            mouseClick(appIcon, appIcon.width / 2, appIcon.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
-            compare(signalSpyActivateApp.count, 0, "activate app should not have been triggered when not selected");
-
-            messageMenuSelected.selected = true;
-            mouseClick(appIcon, appIcon.width / 2, appIcon.height / 2, Qt.LeftButton, Qt.NoModifier, 0);
-            compare(signalSpyActivateApp.count > 0, true, "activate app should have been triggered when selected");
-        }
-
-        function test_dismiss() {
-            mouseFlick(messageMenuRemovable,
-                       messageMenuRemovable.width / 2,
-                       messageMenuRemovable.height / 2,
-                       messageMenuRemovable.width,
-                       messageMenuRemovable.height / 2,
-                       true, true, units.gu(1), 10);
-            tryCompareFunction(function() { return signalSpyDismiss.count > 0; }, true);
-        }
-
         function test_replyEnabled_data() {
             return [
                 { tag: 'disabledNoReply', enabled: false, reply: "", expected: false},

=== added directory 'tests/uqmlscene'
=== added file 'tests/uqmlscene/CMakeLists.txt'
--- tests/uqmlscene/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/uqmlscene/CMakeLists.txt	2014-07-31 16:42:23 +0000
@@ -0,0 +1,22 @@
+add_executable(uqmlscene
+    ${shellapplication_MOC_SRCS}
+    main.cpp
+    MouseTouchAdaptor.cpp
+    )
+
+qt5_use_modules(uqmlscene Qml Quick Test)
+pkg_check_modules(XCB REQUIRED xcb)
+
+include_directories(
+    ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
+)
+
+if (NOT "${XCB_INCLUDE_DIRS}" STREQUAL "")
+    set_target_properties(uqmlscene PROPERTIES INCLUDE_DIRECTORIES ${XCB_INCLUDE_DIRS})
+endif()
+
+target_link_libraries(uqmlscene
+    ${Qt5Qml_LIBRARIES}
+    ${Qt5Quick_LIBRARIES}
+    ${XCB_LDFLAGS}
+    )

=== added file 'tests/uqmlscene/MouseTouchAdaptor.cpp'
--- tests/uqmlscene/MouseTouchAdaptor.cpp	1970-01-01 00:00:00 +0000
+++ tests/uqmlscene/MouseTouchAdaptor.cpp	2014-07-31 16:42:23 +0000
@@ -0,0 +1,153 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ */
+
+#include "MouseTouchAdaptor.h"
+
+#include <qpa/qwindowsysteminterface.h>
+
+#include <QtGui/QMouseEvent>
+#include <QtTest/QTest>
+
+using QTest::QTouchEventSequence;
+
+namespace {
+Qt::MouseButton translateMouseButton(xcb_button_t detail)
+{
+    switch (detail) {
+        case 1: return Qt::LeftButton;
+        case 2: return Qt::MidButton;
+        case 3: return Qt::RightButton;
+        // Button values 4-7 are Wheel events
+        default: return Qt::NoButton;
+    }
+}
+} // end of anonymous namespace
+
+MouseTouchAdaptor::MouseTouchAdaptor()
+    : m_leftButtonIsPressed(false)
+{
+    m_touchDevice = new QTouchDevice;
+    m_touchDevice->setType(QTouchDevice::TouchScreen);
+    QWindowSystemInterface::registerTouchDevice(m_touchDevice);
+}
+
+bool MouseTouchAdaptor::nativeEventFilter(const QByteArray & eventType,
+                                          void * message, long * /*result*/)
+{
+    if (eventType != "xcb_generic_event_t") {
+        // wrong backend.
+        qWarning("MouseTouchAdaptor: XCB backend not in use. Adaptor inoperative!");
+        return false;
+    }
+
+    xcb_generic_event_t *xcbEvent = static_cast<xcb_generic_event_t *>(message);
+
+    switch (xcbEvent->response_type & ~0x80) {
+        case XCB_BUTTON_PRESS:
+            return handleButtonPress(reinterpret_cast<xcb_button_press_event_t *>(xcbEvent));
+            break;
+        case XCB_BUTTON_RELEASE:
+            return handleButtonRelease(reinterpret_cast<xcb_button_release_event_t *>(xcbEvent));
+            break;
+        case XCB_MOTION_NOTIFY:
+            return handleMotionNotify(reinterpret_cast<xcb_motion_notify_event_t *>(xcbEvent));
+            break;
+        default:
+            return false;
+            break;
+    };
+}
+
+bool MouseTouchAdaptor::handleButtonPress(xcb_button_press_event_t *pressEvent)
+{
+    Qt::MouseButton button = translateMouseButton(pressEvent->detail);
+
+    // Just eat the event if it wasn't a left mouse press
+    if (button != Qt::LeftButton)
+        return true;
+
+    QPoint windowPos(pressEvent->event_x, pressEvent->event_y);
+
+    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(pressEvent->event));
+
+    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
+                                                       false /* autoCommit */);
+    touchEvent.press(0 /* touchId */, windowPos);
+    touchEvent.commit(false /* processEvents */);
+
+    m_leftButtonIsPressed = true;
+    return true;
+}
+
+bool MouseTouchAdaptor::handleButtonRelease(xcb_button_release_event_t *releaseEvent)
+{
+    Qt::MouseButton button = translateMouseButton(releaseEvent->detail);
+
+    // Just eat the event if it wasn't a left mouse release
+    if (button != Qt::LeftButton)
+        return true;
+
+    QPoint windowPos(releaseEvent->event_x, releaseEvent->event_y);
+
+    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(releaseEvent->event));
+
+    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
+                                                       false /* autoCommit */);
+    touchEvent.release(0 /* touchId */, windowPos);
+    touchEvent.commit(false /* processEvents */);
+
+    m_leftButtonIsPressed = false;
+    return true;
+}
+
+bool MouseTouchAdaptor::handleMotionNotify(xcb_motion_notify_event_t *event)
+{
+    if (!m_leftButtonIsPressed) {
+        return true;
+    }
+
+    QPoint windowPos(event->event_x, event->event_y);
+
+    QWindow *targetWindow = findQWindowWithXWindowID(static_cast<WId>(event->event));
+
+    QTouchEventSequence touchEvent = QTest::touchEvent(targetWindow, m_touchDevice,
+                                                       false /* autoCommit */);
+    touchEvent.move(0 /* touchId */, windowPos);
+    touchEvent.commit(false /* processEvents */);
+
+    return true;
+}
+
+QWindow *MouseTouchAdaptor::findQWindowWithXWindowID(WId windowId)
+{
+    QWindowList windowList = QGuiApplication::topLevelWindows();
+    QWindow *foundWindow = nullptr;
+
+    int i = 0;
+    while (!foundWindow && i < windowList.count()) {
+        QWindow *window = windowList[i];
+        if (window->winId() == windowId) {
+            foundWindow = window;
+        } else {
+            ++i;
+        }
+    }
+
+    Q_ASSERT(foundWindow);
+    return foundWindow;
+}

=== added file 'tests/uqmlscene/MouseTouchAdaptor.h'
--- tests/uqmlscene/MouseTouchAdaptor.h	1970-01-01 00:00:00 +0000
+++ tests/uqmlscene/MouseTouchAdaptor.h	2014-07-31 16:42:23 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2013 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Daniel d'Andrada <[e-mail]>
+ */
+
+#ifndef MOUSE_TOUCH_ADAPTOR_H
+#define MOUSE_TOUCH_ADAPTOR_H
+
+#include <QtCore/QAbstractNativeEventFilter>
+#include <QWindow>
+#include <xcb/xcb.h>
+
+class QMouseEvent;
+class QTouchDevice;
+
+// Transforms QMouseEvents into single-finger QTouchEvents.
+class MouseTouchAdaptor : public QAbstractNativeEventFilter {
+
+public:
+    MouseTouchAdaptor();
+
+    // Filters mouse events and posts the equivalent QTouchEvents.
+    virtual bool nativeEventFilter(const QByteArray & eventType, void *message, long *result);
+
+private:
+
+    bool handleButtonPress(xcb_button_press_event_t *pressEvent);
+    bool handleButtonRelease(xcb_button_release_event_t *releaseEvent);
+    bool handleMotionNotify(xcb_motion_notify_event_t *event);
+    QWindow *findQWindowWithXWindowID(WId windowId);
+
+    QTouchDevice *m_touchDevice;
+    bool m_leftButtonIsPressed;
+};
+
+#endif // MOUSE_TOUCH_ADAPTOR_H

=== added file 'tests/uqmlscene/README'
--- tests/uqmlscene/README	1970-01-01 00:00:00 +0000
+++ tests/uqmlscene/README	2014-07-31 16:42:23 +0000
@@ -0,0 +1,1 @@
+Qt's qmlscene tool modified to use MouseTouchAdaptor. That way we can interact with touch-only components

=== added file 'tests/uqmlscene/main.cpp'
--- tests/uqmlscene/main.cpp	1970-01-01 00:00:00 +0000
+++ tests/uqmlscene/main.cpp	2014-07-31 16:42:23 +0000
@@ -0,0 +1,554 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qabstractanimation.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qmath.h>
+#include <QtCore/qdatetime.h>
+
+#include <QtGui/QGuiApplication>
+
+#include <QtQml/qqml.h>
+#include <QtQml/qqmlengine.h>
+#include <QtQml/qqmlcomponent.h>
+#include <QtQml/qqmlcontext.h>
+
+#include <QtQuick/qquickitem.h>
+#include <QtQuick/qquickview.h>
+
+#ifdef QT_WIDGETS_LIB
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QFileDialog>
+#endif
+
+#include <QtCore/QTranslator>
+#include <QtCore/QLibraryInfo>
+
+#include <MouseTouchAdaptor.h>
+
+#ifdef QML_RUNTIME_TESTING
+class RenderStatistics
+{
+public:
+    static void updateStats();
+    static void printTotalStats();
+private:
+    static QVector<qreal> timePerFrame;
+    static QVector<int> timesPerFrames;
+};
+
+QVector<qreal> RenderStatistics::timePerFrame;
+QVector<int> RenderStatistics::timesPerFrames;
+
+void RenderStatistics::updateStats()
+{
+    static QTime time;
+    static int frames;
+    static int lastTime;
+
+    if (frames == 0) {
+        time.start();
+    } else {
+        int elapsed = time.elapsed();
+        timesPerFrames.append(elapsed - lastTime);
+        lastTime = elapsed;
+
+        if (elapsed > 5000) {
+            qreal avgtime = elapsed / (qreal) frames;
+            qreal var = 0;
+            for (int i = 0; i < timesPerFrames.size(); ++i) {
+                qreal diff = timesPerFrames.at(i) - avgtime;
+                var += diff * diff;
+            }
+            var /= timesPerFrames.size();
+
+            qDebug("Average time per frame: %f ms (%i fps), std.dev: %f ms", avgtime, qRound(1000. / avgtime), qSqrt(var));
+
+            timePerFrame.append(avgtime);
+            timesPerFrames.clear();
+            time.start();
+            lastTime = 0;
+            frames = 0;
+        }
+    }
+    ++frames;
+}
+
+void RenderStatistics::printTotalStats()
+{
+    int count = timePerFrame.count();
+    if (count == 0)
+        return;
+
+    qreal minTime = 0;
+    qreal maxTime = 0;
+    qreal avg = 0;
+    for (int i = 0; i < count; ++i) {
+        minTime = minTime == 0 ? timePerFrame.at(i) : qMin(minTime, timePerFrame.at(i));
+        maxTime = qMax(maxTime, timePerFrame.at(i));
+        avg += timePerFrame.at(i);
+    }
+    avg /= count;
+
+    qDebug(" ");
+    qDebug("----- Statistics -----");
+    qDebug("Average time per frame: %f ms (%i fps)", avg, qRound(1000. / avg));
+    qDebug("Best time per frame: %f ms (%i fps)", minTime, int(1000 / minTime));
+    qDebug("Worst time per frame: %f ms (%i fps)", maxTime, int(1000 / maxTime));
+    qDebug("----------------------");
+    qDebug(" ");
+}
+#endif
+
+struct Options
+{
+    Options()
+        : originalQml(false)
+        , originalQmlRaster(false)
+        , maximized(false)
+        , fullscreen(false)
+        , transparent(false)
+        , clip(false)
+        , versionDetection(true)
+        , quitImmediately(false)
+        , resizeViewToRootItem(false)
+        , multisample(false)
+    {
+    }
+
+    QUrl file;
+    bool originalQml;
+    bool originalQmlRaster;
+    bool maximized;
+    bool fullscreen;
+    bool transparent;
+    bool scenegraphOnGraphicsview;
+    bool clip;
+    bool versionDetection;
+    bool quitImmediately;
+    bool resizeViewToRootItem;
+    bool multisample;
+    QString translationFile;
+};
+
+#if defined(QMLSCENE_BUNDLE)
+QFileInfoList findQmlFiles(const QString &dirName)
+{
+    QDir dir(dirName);
+
+    QFileInfoList ret;
+    if (dir.exists()) {
+        QFileInfoList fileInfos = dir.entryInfoList(QStringList() << "*.qml",
+                                                    QDir::Files | QDir::AllDirs | QDir::NoDotAndDotDot);
+
+        Q_FOREACH (QFileInfo fileInfo, fileInfos) {
+            if (fileInfo.isDir())
+                ret += findQmlFiles(fileInfo.filePath());
+            else if (fileInfo.fileName().length() > 0 && fileInfo.fileName().at(0).isLower())
+                ret.append(fileInfo);
+        }
+    }
+
+    return ret;
+}
+
+static int displayOptionsDialog(Options *options)
+{
+    QDialog dialog;
+
+    QFormLayout *layout = new QFormLayout(&dialog);
+
+    QComboBox *qmlFileComboBox = new QComboBox(&dialog);
+    QFileInfoList fileInfos = findQmlFiles(":/bundle") + findQmlFiles("./qmlscene-resources");
+
+    Q_FOREACH (QFileInfo fileInfo, fileInfos)
+        qmlFileComboBox->addItem(fileInfo.dir().dirName() + "/" + fileInfo.fileName(), QVariant::fromValue(fileInfo));
+
+    QCheckBox *originalCheckBox = new QCheckBox(&dialog);
+    originalCheckBox->setText("Use original QML viewer");
+    originalCheckBox->setChecked(options->originalQml);
+
+    QCheckBox *fullscreenCheckBox = new QCheckBox(&dialog);
+    fullscreenCheckBox->setText("Start fullscreen");
+    fullscreenCheckBox->setChecked(options->fullscreen);
+
+    QCheckBox *maximizedCheckBox = new QCheckBox(&dialog);
+    maximizedCheckBox->setText("Start maximized");
+    maximizedCheckBox->setChecked(options->maximized);
+
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
+                                                       Qt::Horizontal,
+                                                       &dialog);
+    QObject::connect(buttonBox, SIGNAL(accepted()), &dialog, SLOT(accept()));
+    QObject::connect(buttonBox, SIGNAL(rejected()), &dialog, SLOT(reject()));
+
+    layout->addRow("Qml file:", qmlFileComboBox);
+    layout->addWidget(originalCheckBox);
+    layout->addWidget(maximizedCheckBox);
+    layout->addWidget(fullscreenCheckBox);
+    layout->addWidget(buttonBox);
+
+    int result = dialog.exec();
+    if (result == QDialog::Accepted) {
+        QVariant variant = qmlFileComboBox->itemData(qmlFileComboBox->currentIndex());
+        QFileInfo fileInfo = variant.value<QFileInfo>();
+
+        if (fileInfo.canonicalFilePath().startsWith(":"))
+            options->file = QUrl("qrc" + fileInfo.canonicalFilePath());
+        else
+            options->file = QUrl::fromLocalFile(fileInfo.canonicalFilePath());
+        options->originalQml = originalCheckBox->isChecked();
+        options->maximized = maximizedCheckBox->isChecked();
+        options->fullscreen = fullscreenCheckBox->isChecked();
+    }
+    return result;
+}
+#endif
+
+static bool checkVersion(const QUrl &url)
+{
+    if (!qgetenv("QMLSCENE_IMPORT_NAME").isEmpty())
+        qWarning("QMLSCENE_IMPORT_NAME is no longer supported.");
+
+    QString fileName = url.toLocalFile();
+    if (fileName.isEmpty()) {
+        qWarning("qmlscene: filename required.");
+        return false;
+    }
+
+    QFile f(fileName);
+    if (!f.open(QFile::ReadOnly | QFile::Text)) {
+        qWarning("qmlscene: failed to check version of file '%s', could not open...",
+                 qPrintable(fileName));
+        return false;
+    }
+
+    QRegExp quick1("^\\s*import +QtQuick +1\\.\\w*");
+    QRegExp qt47("^\\s*import +Qt +4\\.7");
+
+    QTextStream stream(&f);
+    bool codeFound= false;
+    while (!codeFound) {
+        QString line = stream.readLine();
+        if (line.contains("{")) {
+            codeFound = true;
+        } else {
+            QString import;
+            if (quick1.indexIn(line) >= 0)
+                import = quick1.cap(0).trimmed();
+            else if (qt47.indexIn(line) >= 0)
+                import = qt47.cap(0).trimmed();
+
+            if (!import.isNull()) {
+                qWarning("qmlscene: '%s' is no longer supported.\n"
+                         "Use qmlviewer to load file '%s'.",
+                         qPrintable(import),
+                         qPrintable(fileName));
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
+
+static void displayFileDialog(Options *options)
+{
+#if defined(QT_WIDGETS_LIB) && !defined(QT_NO_FILEDIALOG)
+    QString fileName = QFileDialog::getOpenFileName(0, "Open QML file", QString(), "QML Files (*.qml)");
+    if (!fileName.isEmpty()) {
+        QFileInfo fi(fileName);
+        options->file = QUrl::fromLocalFile(fi.canonicalFilePath());
+    }
+#else
+    Q_UNUSED(options);
+    qWarning("No filename specified...");
+#endif
+}
+
+#ifndef QT_NO_TRANSLATION
+static void loadTranslationFile(QTranslator &translator, const QString& directory)
+{
+    translator.load(QLatin1String("qml_" )+QLocale::system().name(), directory + QLatin1String("/i18n"));
+    QCoreApplication::installTranslator(&translator);
+}
+#endif
+
+static void loadDummyDataFiles(QQmlEngine &engine, const QString& directory)
+{
+    QDir dir(directory+"/dummydata", "*.qml");
+    QStringList list = dir.entryList();
+    for (int i = 0; i < list.size(); ++i) {
+        QString qml = list.at(i);
+        QFile f(dir.filePath(qml));
+        f.open(QIODevice::ReadOnly);
+        QByteArray data = f.readAll();
+        QQmlComponent comp(&engine);
+        comp.setData(data, QUrl());
+        QObject *dummyData = comp.create();
+
+        if(comp.isError()) {
+            QList<QQmlError> errors = comp.errors();
+            Q_FOREACH (const QQmlError &error, errors)
+                qWarning() << error;
+        }
+
+        if (dummyData) {
+            qWarning() << "Loaded dummy data:" << dir.filePath(qml);
+            qml.truncate(qml.length()-4);
+            engine.rootContext()->setContextProperty(qml, dummyData);
+            dummyData->setParent(&engine);
+        }
+    }
+}
+
+static QObject *s_testRootObject = nullptr;
+static QObject *testRootObject(QQmlEngine *engine, QJSEngine *jsEngine)
+{
+    Q_UNUSED(jsEngine);
+    if (!s_testRootObject) {
+        s_testRootObject = new QObject(engine);
+    }
+    return s_testRootObject;
+}
+
+static void usage()
+{
+    qWarning("Usage: uqmlscene [options] <filename>");
+    qWarning(" ");
+    qWarning(" Options:");
+    qWarning("  --maximized ............................... Run maximized");
+    qWarning("  --fullscreen .............................. Run fullscreen");
+    qWarning("  --transparent ............................. Make the window transparent");
+    qWarning("  --multisample ............................. Enable multisampling (OpenGL anti-aliasing)");
+    qWarning("  --no-version-detection .................... Do not try to detect the version of the .qml file");
+    qWarning("  --resize-to-root .......................... Resize the window to the size of the root item");
+    qWarning("  --quit .................................... Quit immediately after starting");
+    qWarning("  -I <path> ................................. Add <path> to the list of import paths");
+    qWarning("  -B <name> <file> .......................... Add a named bundle");
+    qWarning("  -translation <translationfile> ............ Set the language to run in");
+
+    qWarning(" ");
+    exit(1);
+}
+
+int main(int argc, char ** argv)
+{
+    Options options;
+
+    QStringList imports;
+    QList<QPair<QString, QString> > bundles;
+    for (int i = 1; i < argc; ++i) {
+        if (*argv[i] != '-' && QFileInfo(QFile::decodeName(argv[i])).exists()) {
+            options.file = QUrl::fromLocalFile(argv[i]);
+        } else {
+            const QString lowerArgument = QString::fromLatin1(argv[i]).toLower();
+            if (lowerArgument == QLatin1String("--maximized"))
+                options.maximized = true;
+            else if (lowerArgument == QLatin1String("--fullscreen"))
+                options.fullscreen = true;
+            else if (lowerArgument == QLatin1String("--transparent"))
+                options.transparent = true;
+            else if (lowerArgument == QLatin1String("--clip"))
+                options.clip = true;
+            else if (lowerArgument == QLatin1String("--no-version-detection"))
+                options.versionDetection = false;
+            else if (lowerArgument == QLatin1String("--quit"))
+                options.quitImmediately = true;
+           else if (lowerArgument == QLatin1String("-translation"))
+                options.translationFile = QLatin1String(argv[++i]);
+            else if (lowerArgument == QLatin1String("--resize-to-root"))
+                options.resizeViewToRootItem = true;
+            else if (lowerArgument == QLatin1String("--multisample"))
+                options.multisample = true;
+            else if (lowerArgument == QLatin1String("-i") && i + 1 < argc)
+                imports.append(QString::fromLatin1(argv[++i]));
+            else if (lowerArgument == QLatin1String("-b") && i + 2 < argc) {
+                QString name = QString::fromLatin1(argv[++i]);
+                QString file = QString::fromLatin1(argv[++i]);
+                bundles.append(qMakePair(name, file));
+            } else if (lowerArgument == QLatin1String("--help")
+                     || lowerArgument == QLatin1String("-help")
+                     || lowerArgument == QLatin1String("--h")
+                     || lowerArgument == QLatin1String("-h"))
+                usage();
+        }
+    }
+
+#ifdef QT_WIDGETS_LIB
+    QApplication app(argc, argv);
+#else
+    QGuiApplication app(argc, argv);
+#endif
+    app.setApplicationName("Unity8 QtQmlViewer");
+    app.setOrganizationName("Qt Project");
+    app.setOrganizationDomain("qt-project.org");
+
+    MouseTouchAdaptor mouseTouchAdaptor;
+    app.installNativeEventFilter(&mouseTouchAdaptor);
+
+#ifndef QT_NO_TRANSLATION
+    QTranslator translator;
+    QTranslator qtTranslator;
+    QString sysLocale = QLocale::system().name();
+    if (translator.load(QLatin1String("qmlscene_") + sysLocale, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
+        app.installTranslator(&translator);
+        if (qtTranslator.load(QLatin1String("qt_") + sysLocale, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
+            app.installTranslator(&qtTranslator);
+        } else {
+            app.removeTranslator(&translator);
+        }
+    }
+
+    QTranslator qmlTranslator;
+    if (!options.translationFile.isEmpty()) {
+        if (qmlTranslator.load(options.translationFile)) {
+            app.installTranslator(&qmlTranslator);
+        } else {
+            qWarning() << "Could not load the translation file" << options.translationFile;
+        }
+    }
+#endif
+
+    if (options.file.isEmpty())
+#if defined(QMLSCENE_BUNDLE)
+        displayOptionsDialog(&options);
+#else
+        displayFileDialog(&options);
+#endif
+
+    int exitCode = 0;
+
+    if (!options.file.isEmpty()) {
+        if (!options.versionDetection || checkVersion(options.file)) {
+#ifndef QT_NO_TRANSLATION
+            QTranslator translator;
+#endif
+
+            // TODO: as soon as the engine construction completes, the debug service is
+            // listening for connections.  But actually we aren't ready to debug anything.
+            QQmlEngine engine;
+            QQmlComponent *component = new QQmlComponent(&engine);
+            for (int i = 0; i < imports.size(); ++i)
+                engine.addImportPath(imports.at(i));
+            for (int i = 0; i < bundles.size(); ++i)
+                engine.addNamedBundle(bundles.at(i).first, bundles.at(i).second);
+            if (options.file.isLocalFile()) {
+                QFileInfo fi(options.file.toLocalFile());
+#ifndef QT_NO_TRANSLATION
+                loadTranslationFile(translator, fi.path());
+#endif
+                loadDummyDataFiles(engine, fi.path());
+            }
+            QObject::connect(&engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));
+
+            qmlRegisterSingletonType<QObject>("Qt.test.qtestroot", 1, 0, "QTestRootObject", testRootObject);
+
+            component->loadUrl(options.file);
+            if ( !component->isReady() ) {
+                qWarning("%s", qPrintable(component->errorString()));
+                return -1;
+            }
+
+            QObject *topLevel = component->create();
+            QQuickWindow *window = qobject_cast<QQuickWindow *>(topLevel);
+            QQuickView* qxView = 0;
+            if (!window) {
+                QQuickItem *contentItem = qobject_cast<QQuickItem *>(topLevel);
+                if (contentItem) {
+                    qxView = new QQuickView(&engine, NULL);
+                    window = qxView;
+                    // Set window default properties; the qml can still override them
+                    QString oname = contentItem->objectName();
+                    window->setTitle(oname.isEmpty() ? QString::fromLatin1("qmlscene") : QString::fromLatin1("qmlscene: ") + oname);
+                    window->setFlags(Qt::Window | Qt::WindowSystemMenuHint | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint | Qt::WindowFullscreenButtonHint);
+                    if (options.resizeViewToRootItem)
+                        qxView->setResizeMode(QQuickView::SizeViewToRootObject);
+                    else
+                        qxView->setResizeMode(QQuickView::SizeRootObjectToView);
+                    qxView->setContent(options.file, component, contentItem);
+                }
+            }
+
+            if (window) {
+                QSurfaceFormat surfaceFormat = window->requestedFormat();
+                if (options.multisample)
+                    surfaceFormat.setSamples(16);
+                if (options.transparent) {
+                    surfaceFormat.setAlphaBufferSize(8);
+                    window->setClearBeforeRendering(true);
+                    window->setColor(QColor(Qt::transparent));
+                    window->setFlags(Qt::FramelessWindowHint);
+                }
+                window->setFormat(surfaceFormat);
+
+                if (options.fullscreen)
+                    window->showFullScreen();
+                else if (options.maximized)
+                    window->showMaximized();
+                else
+                    window->show();
+            }
+
+            if (options.quitImmediately)
+                QMetaObject::invokeMethod(QCoreApplication::instance(), "quit", Qt::QueuedConnection);
+
+            // Now would be a good time to inform the debug service to start listening.
+
+            exitCode = app.exec();
+
+#ifdef QML_RUNTIME_TESTING
+            RenderStatistics::printTotalStats();
+#endif
+            // Ready to exit.  If we created qxView, it owns the component;
+            // otherwise, the ownership is still right here.  Nobody deletes the engine
+            // (which is odd since the container constructor takes the engine pointer),
+            // but it's stack-allocated anyway.
+            if (qxView)
+                delete qxView;
+            else
+                delete component;
+        }
+    }
+
+    return exitCode;
+}