Merge lp:~zsombi/ubuntu-ui-toolkit/100-captions into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Captions component dedicated to ListItem layouts, a ColumnLayout holding two Layouts pre-configurable for fixed or rest of content filling behavior.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1429
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1492/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1576/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/219/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/222/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/219/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1574/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1492/rebuild

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

119 + Layout.fillWidth: (preset === "caption")
120 + Layout.alignment: Qt.AlignVCenter | ((preset === "summary") ? Qt.AlignRight : Qt.AlignLeft)
121 + Layout.minimumWidth: 0
122 + Layout.maximumWidth: (preset === "summary") ? units.gu(6) : parent.width
123 + Layout.preferredWidth: (preset === "summary") ? Layout.maximumWidth : 0
124 + Layout.minimumHeight: 0
125 + Layout.maximumHeight: parent ? parent.height : childrenRect.height
126 + Layout.preferredHeight: childrenRect.height

group these

[Zsombor Egri (zsombi)]

> 119 + Layout.fillWidth: (preset === "caption")
> 120 + Layout.alignment: Qt.AlignVCenter | ((preset === "summary") ?
> Qt.AlignRight : Qt.AlignLeft)
> 121 + Layout.minimumWidth: 0
> 122 + Layout.maximumWidth: (preset === "summary") ? units.gu(6) :
> parent.width
> 123 + Layout.preferredWidth: (preset === "summary") ?
> Layout.maximumWidth : 0
> 124 + Layout.minimumHeight: 0
> 125 + Layout.maximumHeight: parent ? parent.height :
> childrenRect.height
> 126 + Layout.preferredHeight: childrenRect.height
>
> group these

I would not group attached properties... I checked, not even Qt is doing that.

[Cris Dywan (kalikiana)]

I agree that attached properties aren't grouped.

I like this iteration!

review: Approve

[Tim Peeters (tpeeters)]

97 + The container only shows the labels whos text is set to a valid string. The

whos*

review: Needs Fixing

[Tim Peeters (tpeeters)]

Can you provide links for RowLayout and ColumnLayout in the docs?

[Tim Peeters (tpeeters)]

112 + Component.onCompleted: subtitle.Layout.alignment = Qt.AlignRight

can you add a comment on the line before this one saying why the Layout cannot be accessed directly?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1434
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1499/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1601
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/226
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/229
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/229/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/226
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1420
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1599
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1599/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18470

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1499/rebuild

review: Needs Fixing (continuous-integration)

[Zsombor Egri (zsombi)]

> 97 + The container only shows the labels whos text is set to a valid
> string. The
>
>
> whos*

Reformulated.

[Zsombor Egri (zsombi)]

> Can you provide links for RowLayout and ColumnLayout in the docs?

No. None of the other components are linked, doc must be able to find the link to them. I can try to search for the module so the qdoc can link to it, but...

[Zsombor Egri (zsombi)]

> 112 + Component.onCompleted: subtitle.Layout.alignment =
> Qt.AlignRight
>
> can you add a comment on the line before this one saying why the Layout cannot
> be accessed directly?

Added.

[Cris Dywan (kalikiana)]

Lovely!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/818/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/125/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/125
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/125/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/125/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1435
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1502/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1608/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/229/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/232
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/232/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/229/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1427/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1606
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1606/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18481

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1502/rebuild

review: Needs Fixing (continuous-integration)

[Cris Dywan (kalikiana)]

tst_captions.qml: FAIL! : components::CaptionsAPI::test_0_defaults() Default preset is 'titles'
tst_captions.qml: Actual (): 5000
tst_captions.qml: Expected (): undefined

There's init test failures

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1436
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1508/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1618
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/235
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/238
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/235
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1436
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1616
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1616/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18502

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1508/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/823/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/130/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/130/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/130/console

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

thanks

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-autolanding/824/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-autolanding/131
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/131
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-autolanding/131/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-autolanding/131/console

review: Needs Fixing (continuous-integration)

[Tim Peeters (tpeeters)]

failed on tst_mousefilters:

FAIL! : tst_mouseFilterTest::testCase_doubleClicked() '!selectedText.toString().isEmpty()' returned FALSE. ()
tst_mousefilters: Loc: [tst_mousefilterstest.cpp(559)]

dunno if that test is shaky. happroving again to find out.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-02-27 13:47:29 +0000
+++ components.api	2015-03-03 14:27:22 +0000
@@ -34,6 +34,11 @@
     property Gradient gradient
     property font font
     property string iconPosition
+Captions 1.2
+ColumnLayout
+    property int captionStyle
+    property Label title
+    property Label subtitle
 CheckBox 0.1 1.0
 AbstractButton
     property bool checked
@@ -1007,6 +1012,10 @@
     name: "exited"
     Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
     Parameter { name: "host"; type: "QQuickItem"; isPointer: true }
+    name: "UCNamespace"
+    prototype: "QObject"
+    exports: ["Ubuntu 1.2"]
+    name: "CaptionsStyle"
     name: "UCQQuickImageExtension"
     prototype: "QQuickImageBase"
     exports: ["QQuickImageBase 0.1", "QQuickImageBase 1.0"]

=== modified file 'debian/control'
--- debian/control	2015-02-25 14:25:59 +0000
+++ debian/control	2015-03-03 14:27:22 +0000
@@ -20,6 +20,7 @@
                qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
                qml-module-qttest | qtdeclarative5-test-plugin,
                qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
+               qml-module-qtquick-layouts,
                qtdeclarative5-qtfeedback-plugin,
                qtdeclarative5-unity-action-plugin (>= 1.1.0),
                qml-module-qtquick-localstorage | qtdeclarative5-localstorage-plugin,
@@ -62,6 +63,7 @@
          libqt5svg5,
          qml-module-qtquick2 | qtdeclarative5-qtquick2-plugin,
          qml-module-qtquick-window2 | qtdeclarative5-window-plugin,
+         qml-module-qtquick-layouts,
          qtdeclarative5-qtfeedback-plugin,
          qtdeclarative5-unity-action-plugin (>= 1.1.0),
          suru-icon-theme,

=== modified file 'documentation/overview.qdoc'
--- documentation/overview.qdoc	2014-09-15 12:59:16 +0000
+++ documentation/overview.qdoc	2015-03-03 14:27:22 +0000
@@ -117,5 +117,9 @@
      \part Unstable QML Types
      The following section lists components which will be part of future releases.
      Their interface is unstable and thus should not be used in production applications.
+     Available through:
+     \code
+         import Ubuntu.Components 1.2
+     \endcode
      \annotatedlist unstable-ubuntu-listitems
  */

=== added file 'modules/Ubuntu/Components/Captions.qml'
--- modules/Ubuntu/Components/Captions.qml	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/Captions.qml	2015-03-03 14:27:22 +0000
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtQuick.Layouts 1.1
+import Ubuntu.Components 1.2
+
+/*!
+  \qmltype Captions
+  \inqmlmodule Ubuntu.Components 1.2
+  \ingroup unstable-ubuntu-listitems
+  \since Ubuntu.Components 1.2
+  \brief Container providing captionStyles for a twin-label column that can be used in
+  RowLayout or GridLayout.
+
+  The labels are placed in a column and can be accessed through \l title and
+  \l subtitle properties. The default spacing between the labels is 0.5 grid units.
+
+  The container only shows the labels which has its text property set to a valid
+  string. The labels not having any text set are not occupying the space. When
+  embedded in a positioner or in a RowLayout, the container is aligned vertically
+  centered. It is recommended to be used in context with RowLayout or GridLayout,
+  however can be used with any component.
+
+  \qml
+  import QtQuick 2.4
+  import Ubuntu.Components 1.2
+
+  ListItem {
+      RowLayout {
+           Captions {
+               title.text: "Caption"
+               subtitle.text: "Subtitle text"
+               // attached properties of an Item type property
+               // can be changed only with assignment
+               Component.onCompleted: subtitle.Layout.alignment = Qt.AlignRight
+           }
+           Captions {
+               captionStyle: Ubuntu.SummaryCaptionStyle
+               title.text: "Text"
+               subtitle.text: "Text"
+           }
+      }
+  }
+  \endqml
+
+  Additional items can also be added to the layout after the two labels.
+  \qml
+  Captions {
+      title.text: "Caption"
+      subtitle.text: "Subtitle"
+      Label {
+          text: "third line"
+          fontSize: "xx-small"
+      }
+  }
+  \endqml
+  */
+ColumnLayout {
+    id: captions
+
+    /*!
+      \qmlproperty enumeration captionStyle
+      The property configures the arrangement and font sizes of the Labels in the
+      component. It can take the following values:
+      \list
+        \li \b Ubuntu.TitleCaptionStyle - (default) typical configuration for a left aligned
+            twin-label setup, where the text covers the remaining area on a list
+            layout.
+        \li \b Ubuntu.SummaryCaptionStyle - configuration for a right-aligned twin label setup,
+            with 6 grid units width.
+      \endlist
+      */
+    property int captionStyle: Ubuntu.TitleCaptionStyle
+
+    /*!
+      \qmlproperty Label title
+      \readonly
+      Label occupying the top area of the container.
+      */
+    property alias title: titleLabel
+
+    /*!
+      \qmlproperty Label subtitle
+      \readonly
+      Label occupying the bottom area of the container.
+      */
+    property alias subtitle: subtitleLabel
+
+    clip: true
+    spacing: units.gu(0.5)
+    Layout.fillWidth: (captionStyle == Ubuntu.TitleCaptionStyle)
+    Layout.alignment: Qt.AlignVCenter | ((captionStyle == Ubuntu.SummaryCaptionStyle) ? Qt.AlignRight : Qt.AlignLeft)
+    Layout.minimumWidth: 0
+    Layout.maximumWidth: (captionStyle == Ubuntu.SummaryCaptionStyle) ? units.gu(6) : parent.width
+    Layout.preferredWidth: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Layout.maximumWidth : 0
+    Layout.minimumHeight: 0
+    Layout.maximumHeight: parent ? parent.height : childrenRect.height
+    Layout.preferredHeight: childrenRect.height
+
+    // handle visibility, do not override visible property!
+    // 'hide' column if title and subtitle is an empty string and
+    // there's no more children added
+    states: State {
+        name: "__q_invisible"
+        when: (title.text === "" && subtitle.text === "") && (captions.children.length == 2)
+        PropertyChanges {
+            target: captions
+            visible: false
+        }
+    }
+
+    Label {
+        id: titleLabel
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        fontSize: (captionStyle == Ubuntu.SummaryCaptionStyle) ? "small" : "medium"
+        horizontalAlignment: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Text.AlignRight : Text.AlignLeft
+        visible: text !== ""
+        elide: (captionStyle == Ubuntu.TitleCaptionStyle) ? Text.ElideRight : Text.ElideNone
+    }
+    Label {
+        id: subtitleLabel
+        anchors {
+            left: parent.left
+            right: parent.right
+        }
+        fontSize: "small"
+        horizontalAlignment: (captionStyle == Ubuntu.SummaryCaptionStyle) ? Text.AlignRight : Text.AlignLeft
+        visible: text !== ""
+        maximumLineCount: (captionStyle == Ubuntu.TitleCaptionStyle) ? 2 : 1
+        wrapMode: (captionStyle == Ubuntu.TitleCaptionStyle) ? Text.Wrap : Text.NoWrap
+        elide: (captionStyle == Ubuntu.TitleCaptionStyle) ? Text.ElideRight : Text.ElideNone
+    }
+}

=== modified file 'modules/Ubuntu/Components/plugin/plugin.cpp'
--- modules/Ubuntu/Components/plugin/plugin.cpp	2015-02-27 13:47:29 +0000
+++ modules/Ubuntu/Components/plugin/plugin.cpp	2015-03-03 14:27:22 +0000
@@ -57,6 +57,7 @@
 #include "uclistitemactions.h"
 #include "uclistitemstyle.h"
 #include "ucserviceproperties.h"
+#include "ucnamespace.h"
 
 #include <sys/types.h>
 #include <unistd.h>
@@ -95,6 +96,14 @@
     return uriHandler;
 }
 
+static QObject *registerUbuntuNamespace(QQmlEngine *engine, QJSEngine *scriptEngine)
+{
+    Q_UNUSED(engine)
+    Q_UNUSED(scriptEngine)
+
+    return new UCNamespace();
+}
+
 void UbuntuComponentsPlugin::registerWindowContextProperty()
 {
     setWindowContextProperty(QGuiApplication::focusWindow());
@@ -176,6 +185,7 @@
     qmlRegisterUncreatableType<UCDragEvent>(uri, 1, 2, "ListItemDrag", "This is an event object");
     qmlRegisterType<UCListItemActions>(uri, 1, 2, "ListItemActions");
     qmlRegisterUncreatableType<UCViewItemsAttached>(uri, 1, 2, "ViewItems", "Not instantiable");
+    qmlRegisterSingletonType<UCNamespace>(uri, 1, 2, "Ubuntu", registerUbuntuNamespace);
     qmlRegisterType<UCUbuntuShape, 1>(uri, 1, 2, "UbuntuShape");
 }
 

=== modified file 'modules/Ubuntu/Components/plugin/plugin.pro'
--- modules/Ubuntu/Components/plugin/plugin.pro	2015-02-27 13:47:29 +0000
+++ modules/Ubuntu/Components/plugin/plugin.pro	2015-03-03 14:27:22 +0000
@@ -77,7 +77,8 @@
     ucserviceproperties.h \
     ucserviceproperties_p.h \
     privates/listitemdragarea.h \
-    privates/listitemdraghandler.h
+    privates/listitemdraghandler.h \
+    ucnamespace.h
 
 SOURCES += plugin.cpp \
     uctheme.cpp \
@@ -122,7 +123,8 @@
     ucviewitemsattached.cpp \
     ucserviceproperties.cpp \
     privates/listitemdragarea.cpp \
-    privates/listitemdraghandler.cpp
+    privates/listitemdraghandler.cpp \
+    ucnamespace.cpp
 
 # adapters
 SOURCES += adapters/alarmsadapter_organizer.cpp

=== added file 'modules/Ubuntu/Components/plugin/ucnamespace.cpp'
--- modules/Ubuntu/Components/plugin/ucnamespace.cpp	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/ucnamespace.cpp	2015-03-03 14:27:22 +0000
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2015 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/>.
+ *
+ */
+
+#include "ucnamespace.h"
+
+/*!
+ * \qmltype Ubuntu
+ * \instantiates UCNamespace
+ * \inqmlmodule Ubuntu.Components 1.2
+ * \ingroup ubuntu
+ * \since Ubuntu.Components 1.2
+ * \brief Provides global object with different enums.
+ *
+ * \section2 Enums
+ *
+ * \section4 CaptionStyle enum
+ * The enumeration configures the Captions component style.
+ * \table
+ *  \header
+ *      \li Enum
+ *      \li Description
+ *  \row
+ *      \li TitleCaptionStyle
+ *      \li The Captions labels are configured to represent caption behavior.
+ *  \row
+ *      \li SummaryCaptionStyle
+ *      \li The Captions labels are configured to represent a summary-like description.
+ * \endtable
+ */
+UCNamespace::UCNamespace(QObject *parent) :
+    QObject(parent)
+{
+}
+

=== added file 'modules/Ubuntu/Components/plugin/ucnamespace.h'
--- modules/Ubuntu/Components/plugin/ucnamespace.h	1970-01-01 00:00:00 +0000
+++ modules/Ubuntu/Components/plugin/ucnamespace.h	2015-03-03 14:27:22 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2015 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/>.
+ *
+ */
+
+#ifndef UCNAMESPACE_H
+#define UCNAMESPACE_H
+
+#include <QObject>
+
+class UCNamespace : public QObject
+{
+    Q_OBJECT
+    Q_ENUMS(CaptionsStyle)
+public:
+    enum CaptionsStyle {
+        TitleCaptionStyle = 5000,
+        SummaryCaptionStyle
+    };
+    explicit UCNamespace(QObject *parent = 0);
+
+};
+
+#endif // UCNAMESPACE_H

=== modified file 'modules/Ubuntu/Components/qmldir'
--- modules/Ubuntu/Components/qmldir	2015-02-18 12:37:47 +0000
+++ modules/Ubuntu/Components/qmldir	2015-03-03 14:27:22 +0000
@@ -110,3 +110,4 @@
 
 #version 1.2
 MainView 1.2 MainView12.qml
+Captions 1.2 Captions.qml

=== modified file 'tests/resources/listitems/ListItemDragging.qml'
--- tests/resources/listitems/ListItemDragging.qml	2015-02-25 16:05:18 +0000
+++ tests/resources/listitems/ListItemDragging.qml	2015-03-03 14:27:22 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.4
 import Ubuntu.Components 1.2
+import QtQuick.Layouts 1.1
 import Ubuntu.Components.ListItems 1.0
 import QtQml.Models 2.1
 
@@ -133,19 +134,22 @@
                             actions: contextualActions
                         }
 
-                        Rectangle {
-                            anchors.fill: parent
-                            color: item.dragging ? UbuntuColors.blue : "#69aa69"
-                        }
-                        Column {
-                            anchors.fill: parent
-                            Label {
-                                text: label + " from index #" + index
-                                anchors.left: parent.left
-                            }
-                            Label {
-                                text: "Click to turn LTR<->RTL"
-                                anchors.right: parent.right
+                        RowLayout {
+                            anchors {
+                                fill: parent
+                                margins: units.gu(0.5)
+                                leftMargin: anchors.rightMargin
+                                rightMargin: units.gu(2)
+                            }
+                            Captions {
+                                id: captions
+                                title.text: label
+                                subtitle.text: "from index #" + index
+                            }
+                            Captions {
+                                captionStyle: Ubuntu.Summary
+                                title.text: "LTR"
+                                subtitle.text: "RTL"
                             }
                         }
 

=== modified file 'tests/resources/listitems/ListItemTest.qml'
--- tests/resources/listitems/ListItemTest.qml	2015-02-19 11:56:56 +0000
+++ tests/resources/listitems/ListItemTest.qml	2015-03-03 14:27:22 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 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
@@ -14,9 +14,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.2
+import QtQuick 2.4
 import Ubuntu.Components 1.2
 import Ubuntu.Components.Styles 1.2
+import QtQuick.Layouts 1.1
 
 MainView {
     id: main
@@ -110,13 +111,23 @@
                 units.gridUnit += 2;
             }
             onPressAndHold: print("pressAndHold", objectName)
-            Label {
-                anchors.fill: parent
-                text: units.gridUnit + "PX/unit"
-            }
-            Button {
-                text: "Press me"
-                anchors.centerIn: parent
+            RowLayout {
+                anchors {
+                    fill: parent
+                    margins: units.gu(0.5)
+                    leftMargin: anchors.rightMargin
+                    rightMargin: units.gu(2)
+                }
+                Label {
+                    anchors.fill: parent
+                    text: units.gridUnit + "PX/unit"
+                    Layout.preferredWidth: paintedWidth
+                }
+                Button {
+                    text: "Press me"
+                    anchors.centerIn: parent
+                    onClicked: units.gridUnit -= 2
+                }
             }
 
             leadingActions: ListItemActions {
@@ -184,15 +195,20 @@
                 trailingActions: trailing
                 contentItem.anchors.margins: units.gu(1)
 
-                Label {
-                    anchors.fill: parent
-                    verticalAlignment: Text.AlignVCenter
-                    text: "This is one Label split in two lines.\n" +
-                          "The second line - item #" + modelData
-                }
-                Button {
-                    text: "Pressme..."
-                    anchors.centerIn: parent
+                RowLayout {
+                    anchors {
+                        fill: parent
+                        margins: units.gu(0.5)
+                        leftMargin: anchors.rightMargin
+                        rightMargin: units.gu(2)
+                    }
+                    Captions {
+                        title.text: "This is one Label split in two lines.\n" +
+                              "The second line - item #" + modelData
+                    }
+                    Button {
+                        text: "Pressme..."
+                    }
                 }
 
                 states: State {
@@ -238,6 +254,10 @@
                         trailingActions: ListItemActions {
                             actions: trailingArray
                         }
+                        contentItem.anchors {
+                            leftMargin: units.gu(2)
+                            rightMargin: units.gu(2)
+                        }
 
                         Label {
                             text: modelData + " Flickable item"

=== modified file 'tests/unit/tst_performance/ListItemList.qml'
--- tests/unit/tst_performance/ListItemList.qml	2014-09-15 17:33:35 +0000
+++ tests/unit/tst_performance/ListItemList.qml	2015-03-03 14:27:22 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2015 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
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import QtQuick 2.0
+import QtQuick 2.3
 import Ubuntu.Components 1.2
 
 Column {

=== added file 'tests/unit/tst_performance/ListOfCaptions.qml'
--- tests/unit/tst_performance/ListOfCaptions.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_performance/ListOfCaptions.qml	2015-03-03 14:27:22 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.3
+import Ubuntu.Components 1.2
+import QtQuick.Layouts 1.1
+
+Column {
+    width: 800
+    height: 600
+    Repeater {
+        id: repeater
+        model: 5000
+        ListItem {
+            RowLayout {
+                anchors.fill: parent
+                Captions {
+                }
+            }
+        }
+    }
+}

=== modified file 'tests/unit/tst_performance/tst_performance.cpp'
--- tests/unit/tst_performance/tst_performance.cpp	2015-02-12 07:31:08 +0000
+++ tests/unit/tst_performance/tst_performance.cpp	2015-03-03 14:27:22 +0000
@@ -80,6 +80,7 @@
         QTest::newRow("list with new ListItem") << "ListItemList.qml" << QUrl();
         QTest::newRow("list with new ListItem with actions") << "ListItemWithActionsList.qml" << QUrl();
         QTest::newRow("list with new ListItem with inline actions") << "ListItemWithInlineActionsList.qml" << QUrl();
+        QTest::newRow("list with Captions, preset: caption") << "ListOfCaptions.qml" << QUrl();
         QTest::newRow("list with ListItems.Empty (equivalent to the new ListItem") << "ListItemsEmptyList.qml" << QUrl();
         // disable this test as it takes >20 seconds. Kept still for measurements to be done during development
 //        QTest::newRow("list with ListItems.Base (one icon, one label and one chevron)") << "ListItemsBaseList.qml" << QUrl();

=== added file 'tests/unit_x11/tst_components/tst_captions.qml'
--- tests/unit_x11/tst_components/tst_captions.qml	1970-01-01 00:00:00 +0000
+++ tests/unit_x11/tst_components/tst_captions.qml	2015-03-03 14:27:22 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2015 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import QtTest 1.0
+import Ubuntu.Test 1.0
+import Ubuntu.Components 1.2
+import QtQuick.Layouts 1.1
+
+Item {
+    width: units.gu(40)
+    height: units.gu(71)
+
+    Column {
+        width: parent.width
+        ListItem {
+            RowLayout {
+                anchors.fill: parent
+                Captions {
+                    id: defaults
+                }
+            }
+        }
+        ListItem {
+            RowLayout {
+                anchors.fill: parent
+                Captions {
+                    id: testCaptions
+                }
+            }
+        }
+    }
+
+    UbuntuTestCase {
+        name: "CaptionsAPI"
+        when: windowShown
+
+        function test_0_defaults() {
+            compare(defaults.captionStyle, Ubuntu.TitleCaptionStyle, "Default preset is 'titles'");
+            compare(defaults.height, 0, "default height is 0");
+            compare(defaults.width, 0, "default width is 0")
+            compare(defaults.spacing, units.gu(0.5), "default spacing failure");
+            compare(defaults.visible, false, "default should be invisible")
+            compare(defaults.Layout.alignment, Qt.AlignVCenter | Qt.AlignLeft, "center vertically and left horizontally by default");
+        }
+
+        function test_captions_data() {
+            return [
+                {tag: "caption, title.fontSize", captionStyle: Ubuntu.TitleCaptionStyle, label: "title", property: "fontSize", value: "medium"},
+                {tag: "caption, title.horizontalAlignment", captionStyle: Ubuntu.TitleCaptionStyle, label: "title", property: "horizontalAlignment", value: Text.AlignLeft},
+                {tag: "caption, title.elide", captionStyle: Ubuntu.TitleCaptionStyle, label: "title", property: "elide", value: Text.ElideRight},
+                {tag: "caption, subtitle.fontSize", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "fontSize", value: "small"},
+                {tag: "caption, subtitle.horizontalAlignment", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "horizontalAlignment", value: Text.AlignLeft},
+                {tag: "caption, subtitle.maximumLineCount", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "maximumLineCount", value: 2},
+                {tag: "caption, subtitle.wrapMode", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "wrapMode", value: Text.Wrap},
+                {tag: "caption, subtitle.elide", captionStyle: Ubuntu.TitleCaptionStyle, label: "subtitle", property: "elide", value: Text.ElideRight},
+
+                {tag: "summary, title.fontSize", captionStyle: Ubuntu.SummaryCaptionStyle, label: "title", property: "fontSize", value: "small"},
+                {tag: "summary, title.horizontalAlignment", captionStyle: Ubuntu.SummaryCaptionStyle, label: "title", property: "horizontalAlignment", value: Text.AlignRight},
+                {tag: "summary, title.elide", captionStyle: Ubuntu.SummaryCaptionStyle, label: "title", property: "elide", value: Text.ElideNone},
+                {tag: "summary, subtitle.fontSize", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "fontSize", value: "small"},
+                {tag: "summary, subtitle.horizontalAlignment", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "horizontalAlignment", value: Text.AlignRight},
+                {tag: "summary, subtitle.maximumLineCount", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "maximumLineCount", value: 1},
+                {tag: "summary, subtitle.wrapMode", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "wrapMode", value: Text.NoWrap},
+                {tag: "summary, subtitle.elide", captionStyle: Ubuntu.SummaryCaptionStyle, label: "subtitle", property: "elide", value: Text.ElideNone},
+            ];
+        }
+        function test_captions(data) {
+            testCaptions.captionStyle = data.captionStyle;
+            compare(testCaptions[data.label][data.property], data.value, data.tag + " values differ");
+        }
+    }
+}