Merge into trunk : unity8.previews_textSummary : Code : Unity 8

Status:	Merged
Approved by:	Michał Sawicz on 2014-02-06
Approved revision:	680
Merged at revision:	690
Proposed branch:	lp:~unity-team/unity8/unity8.previews_textSummary
Merge into:	lp:unity8
Prerequisite:	lp:~unity-team/unity8/unity8.previews_audioPlayer
Diff against target:	549 lines (+358/-40) 6 files modified po/unity8.pot (+52/-40) qml/Components/SeeMore.qml (+68/-0) qml/Dash/Previews/PreviewTextSummary.qml (+83/-0) tests/qmltests/CMakeLists.txt (+2/-0) tests/qmltests/Components/tst_SeeMore.qml (+52/-0) tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml (+101/-0)
To merge this branch:	bzr merge lp:~unity-team/unity8/unity8.previews_textSummary
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-02-06
Michał Sawicz			Approve on 2014-02-06
Albert Astals Cid (community)		2014-01-31	Approve on 2014-02-04
Review via email: mp+204177@code.launchpad.net

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-01-31:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2190/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2215/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2216/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-02-04:

#

run "make pot_file" in the builddir to update the .pot with your new strings.

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-02-04:

#

"This widget shows an array"

should it be something more like

"This widget shows text contained in widgetData["text"] along with a title that comes from widgetData["title"]. In case the text does not fit in 7 lines a See More / Less widget is also shown "

?

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-02-04:

#

Doesn't seem you need
import Ubuntu.Components.ListItems 0.1
in SeeMore.qml, no?

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2217/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2219/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2221/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-02-04:

#

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes, used the test/try targets since it's not integrated in main codebase yet

* Did CI run pass? If not, please explain why.
No, network tests still broken

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2225/rebuild

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/unity8.previews_textSummary updated on 2014-02-04

677. By Andrea Cimitan on 2014-02-04: Added comments to seemore and moved variable

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-02-04:

#

319 + readonly property int __maximumCollapsedLineCount: 7

Please hide it lower in the hierarchy.

=====

254 + height: parent.height

anchors, please.

=====

231 + property bool more: false

I wonder, shouldn't this be read only?

=====

253 + Row {
254 + height: parent.height
255 +
256 + Rectangle {
257 + width: units.dp(1)
258 + height: parent.height
259 + opacity: 0.2
260 + color: Theme.palette.selected.backgroundText
261 + }
262 + Rectangle {
263 + width: units.dp(1)
264 + height: parent.height
265 + color: Qt.rgba(1.0, 1.0, 1.0, 0.1)
266 + }
267 + }

Oh my, why isn't this an image?

=====

321 + implicitHeight: titleLabel.visible ? titleLabel.height + textLabel.height : textLabel.height

childrenRect.height no good?

=====

329 + top: parent.top

Not needed, is it?

=====

514 + var mappedTextLabel = root.mapFromItem(textLabel, 0, 0)
515 + compare(mappedTextLabel.y, titleLabel.height)

They're in the same geometry, do we really need the mapFromItem?

=====

Add cleanup() method to revert widgetData to default after each test, instead of setting it explicitly.

=====

Add init() method with verify(typeof textLabel === "object", "TextLabel object could not be found.").

review: Needs Fixing

lp:~unity-team/unity8/unity8.previews_textSummary updated on 2014-02-04

678. By Andrea Cimitan on 2014-02-04: Changes according to review

Revision history for this message

Andrea Cimitan (cimi) wrote on 2014-02-04:

#

> 319 + readonly property int __maximumCollapsedLineCount: 7
>
> Please hide it lower in the hierarchy.

Done

>
> =====
>
> 254 + height: parent.height
>
> anchors, please.
>

Used anchors top and bottom

> =====
>
> 231 + property bool more: false
>
> I wonder, shouldn't this be read only?
>

Thought about the case someone wants to start the widget with the text already expanded, so setting this to true

> =====
>
> 253 + Row {
> 254 + height: parent.height
> 255 +
> 256 + Rectangle {
> 257 + width: units.dp(1)
> 258 + height: parent.height
> 259 + opacity: 0.2
> 260 + color: Theme.palette.selected.backgroundText
> 261 + }
> 262 + Rectangle {
> 263 + width: units.dp(1)
> 264 + height: parent.height
> 265 + color: Qt.rgba(1.0, 1.0, 1.0, 0.1)
> 266 + }
> 267 + }
>
> Oh my, why isn't this an image?

Done
>
> =====
>
> 321 + implicitHeight: titleLabel.visible ? titleLabel.height +
> textLabel.height : textLabel.height
>
> childrenRect.height no good?
>

Visibility doesn't affect childrenRect

> =====
>
> 329 + top: parent.top
>
> Not needed, is it?
>

I always specify all dimensions, or three anchors and relative remaining dimension
> =====
>
> 514 + var mappedTextLabel = root.mapFromItem(textLabel, 0, 0)
> 515 + compare(mappedTextLabel.y, titleLabel.height)
>
> They're in the same geometry, do we really need the mapFromItem?
>

We're testing the placement now, and then when it disappears and moves on top. Comment added

> =====
>
> Add cleanup() method to revert widgetData to default after each test, instead
> of setting it explicitly.
>

Ok
> =====
>
> Add init() method with verify(typeof textLabel === "object", "TextLabel object
> could not be found.").

ok

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-02-04:

#

On 04.02.2014 18:56, Andrea Cimitan wrote:
>> =====
>>
>> 231 + property bool more: false
>>
>> I wonder, shouldn't this be read only?
>>
>
> Thought about the case someone wants to start the widget with the text already expanded, so setting this to true

Makes sense.

>> =====
>>
>> 321 + implicitHeight: titleLabel.visible ? titleLabel.height +
>> textLabel.height : textLabel.height
>>
>> childrenRect.height no good?
>>
>
> Visibility doesn't affect childrenRect

Visibility doesn't, but you're changing anchors based on visibility, and
that does affect childrenRect.

>> =====
>>
>> 329 + top: parent.top
>>
>> Not needed, is it?
>>
>
> I always specify all dimensions, or three anchors and relative remaining dimension

Not sure that helps readability a lot, but definitely costs us more
memory and CPU cycles.

>> =====
>>
>> 514 + var mappedTextLabel = root.mapFromItem(textLabel, 0, 0)
>> 515 + compare(mappedTextLabel.y, titleLabel.height)
>>
>> They're in the same geometry, do we really need the mapFromItem?
>>
>
> We're testing the placement now, and then when it disappears and moves on top. Comment added

> 515 + // verify titleLabel is visible and textLabel is anchored below it

Why isn't that simply textLabel.y == titleLabel.height?

http://paste.ubuntu.com/6874503/

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2227/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-04:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2229/rebuild

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/unity8.previews_textSummary updated on 2014-02-05

679. By Andrea Cimitan on 2014-02-05: Moar fixes

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-05:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2237/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-02-06:

#

Still needs reply:

>> =====
>>
>> 321 + implicitHeight: titleLabel.visible ? titleLabel.height +
>> textLabel.height : textLabel.height
>>
>> childrenRect.height no good?
>>
>
> Visibility doesn't affect childrenRect

Visibility doesn't, but you're changing anchors based on visibility, and
that does affect childrenRect.

>> =====
>>
>> 514 + var mappedTextLabel = root.mapFromItem(textLabel, 0, 0)
>> 515 + compare(mappedTextLabel.y, titleLabel.height)
>>
>> They're in the same geometry, do we really need the mapFromItem?
>>
>
> We're testing the placement now, and then when it disappears and moves on top. Comment added

> 515 + // verify titleLabel is visible and textLabel is anchored below it

Why isn't that simply textLabel.y == titleLabel.height?

http://paste.ubuntu.com/6874503/

review: Needs Fixing

lp:~unity-team/unity8/unity8.previews_textSummary updated on 2014-02-06

680. By Andrea Cimitan on 2014-02-06: review stuff

Revision history for this message

Andrea Cimitan (cimi) wrote on 2014-02-06:

#

> Still needs reply:
>
> >> =====
> >>
> >> 321 + implicitHeight: titleLabel.visible ? titleLabel.height +
> >> textLabel.height : textLabel.height
> >>
> >> childrenRect.height no good?
> >>
> >
> > Visibility doesn't affect childrenRect
>
> Visibility doesn't, but you're changing anchors based on visibility, and
> that does affect childrenRect.
>
> >> =====
> >>
> >> 514 + var mappedTextLabel = root.mapFromItem(textLabel, 0, 0)
> >> 515 + compare(mappedTextLabel.y, titleLabel.height)
> >>
> >> They're in the same geometry, do we really need the mapFromItem?
> >>
> >
> > We're testing the placement now, and then when it disappears and moves on
> top. Comment added
>
> > 515 + // verify titleLabel is visible and textLabel is anchored below it
>
> Why isn't that simply textLabel.y == titleLabel.height?
>
> http://paste.ubuntu.com/6874503/

did all of that with the difference of compare instead trycompare because it's not meant to animate

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-06:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2244/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-02-06:

#

* Did you perform an exploratory manual test run of the code change and any related functionality?
Yes. Works as expected.

* Did CI run pass? If not, please explain why.
No, unrelated issues (LP failures and such). Have restarted the job.

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-06:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2247/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-02-06:

#

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/2258/rebuild

review: Approve (continuous-integration)

Unity 8

Merge lp:~unity-team/unity8/unity8.previews_textSummary into lp:unity8

Commit message

Description of the change

Preview Diff

Subscribers

 === modified file 'po/unity8.pot'
 --- po/unity8.pot	2013-11-29 08:32:05 +0000
 +++ po/unity8.pot	2014-02-06 10:23:19 +0000
@@ -8,7 +8,7 @@
  msgstr ""
  "Project-Id-Version: unity8\n"
  "Report-Msgid-Bugs-To: \n"
--"POT-Creation-Date: 2013-11-29 09:21+0100\n"
++"POT-Creation-Date: 2014-02-04 15:43+0000\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,141 +18,153 @@
  "Content-Transfer-Encoding: 8bit\n"
  "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
--#: Components/EdgeDemoOverlay.qml:151
++#: plugins/Unity/Launcher/launcheritem.cpp:43
++#: plugins/Unity/Launcher/launcheritem.cpp:73
++msgid "Lock to Launcher"
++msgstr ""
++
++#: plugins/Unity/Launcher/launcheritem.cpp:73
++msgid "Unlock from Launcher"
++msgstr ""
++
++#: qml/Components/EdgeDemoOverlay.qml:151
  msgid "Skip intro"
  msgstr ""
--#: Components/EdgeDemo.qml:112
++#: qml/Components/EdgeDemo.qml:113
  msgid "Right edge"
  msgstr ""
--#: Components/EdgeDemo.qml:113
++#: qml/Components/EdgeDemo.qml:114
  msgid "Try swiping from the right edge to unlock the phone"
  msgstr ""
--#: Components/EdgeDemo.qml:144
++#: qml/Components/EdgeDemo.qml:145
  msgid "Top edge"
  msgstr ""
--#: Components/EdgeDemo.qml:145
++#: qml/Components/EdgeDemo.qml:146
  msgid "Try swiping from the top edge to access the indicators"
  msgstr ""
--#: Components/EdgeDemo.qml:170
++#: qml/Components/EdgeDemo.qml:171
  msgid "Close"
  msgstr ""
--#: Components/EdgeDemo.qml:171
++#: qml/Components/EdgeDemo.qml:172
  msgid "Swipe up again to close the settings screen"
  msgstr ""
--#: Components/EdgeDemo.qml:198
++#: qml/Components/EdgeDemo.qml:199
  msgid "Left edge"
  msgstr ""
--#: Components/EdgeDemo.qml:199
++#: qml/Components/EdgeDemo.qml:200
  msgid "Swipe from the left to reveal the launcher for quick access to apps"
  msgstr ""
--#: Components/EdgeDemo.qml:226
++#: qml/Components/EdgeDemo.qml:227
  msgid "Well done"
  msgstr ""
--#: Components/EdgeDemo.qml:227
++#: qml/Components/EdgeDemo.qml:228
  msgid ""
  "You have now mastered the edge gestures and can start using the "
  "phone<br><br>Tap anywhere to start"
  msgstr ""
--#: Components/PageHeader.qml:364
++#: qml/Components/PageHeader.qml:339
  msgid "Recent searches"
  msgstr ""
--#: Dash/Apps/AppPreview.qml:135
++#: qml/Components/SeeMore.qml:32
++msgid "See more"
++msgstr ""
++
++#: qml/Components/SeeMore.qml:61
++msgid "See less"
++msgstr ""
++
++#: qml/Dash/Apps/AppPreview.qml:136
  msgid "Rate this"
  msgstr ""
  #. TRANSLATORS: Number of persons who rated this app/video/whatever
--#: Dash/Previews/Header.qml:93
++#: qml/Dash/Previews/Header.qml:93
  #, qt-format
  msgid "(%1)"
  msgstr ""
  #. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever
--#: Dash/Previews/Header.qml:105
++#: qml/Dash/Previews/Header.qml:105
  #, qt-format
  msgid "%1 review"
  msgid_plural "%1 reviews"
  msgstr[0] ""
  msgstr[1] ""
--#: Dash/Previews/Reviews.qml:74
++#: qml/Dash/Previews/Reviews.qml:74
  msgid "Add a review"
  msgstr ""
--#: Dash/Previews/Reviews.qml:86
++#: qml/Dash/Previews/Reviews.qml:86
  msgid "Review"
  msgstr ""
--#: Dash/Previews/Reviews.qml:121
++#: qml/Dash/Previews/Reviews.qml:121
  msgid "Send"
  msgstr ""
--#: Dash/Previews/Reviews.qml:139
++#: qml/Dash/Previews/Reviews.qml:139
  msgid "Comments:"
  msgstr ""
--#: Greeter/Lockscreen.qml:149
++#: qml/Greeter/Lockscreen.qml:149
  msgid "Emergency Call"
  msgstr ""
--#: Greeter/PassphraseLockscreen.qml:59
++#: qml/Greeter/PassphraseLockscreen.qml:59
  #, qt-format
  msgid "Hello %1"
  msgstr ""
--#: Greeter/PassphraseLockscreen.qml:59
++#: qml/Greeter/PassphraseLockscreen.qml:59
  msgid "Hello"
  msgstr ""
--#: Hud/HudParametrizedActionsPage.qml:132
++#: qml/Hud/HudParametrizedActionsPage.qml:132
  msgid "Confirm"
  msgstr ""
--#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372
++#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
  msgid "Type or say a command"
  msgstr ""
--#: Hud/Hud.qml:84
++#: qml/Hud/Hud.qml:84
  msgid "Loading. Please Wait..."
  msgstr ""
--#: Hud/Hud.qml:89
++#: qml/Hud/Hud.qml:89
  msgid "Speak Now..."
  msgstr ""
--#: Hud/Hud.qml:94
++#: qml/Hud/Hud.qml:94
  msgid "Speaking..."
  msgstr ""
--#: Notifications/NotificationMenuItemFactory.qml:89
++#: qml/Notifications/NotificationMenuItemFactory.qml:91
  msgid "Show password"
  msgstr ""
--#: Panel/SearchIndicator.qml:27
++#: qml/Notifications/NotificationMenuItemFactory.qml:103
++msgid "Please enter SIM PIN"
++msgstr ""
++
++#: qml/Panel/SearchIndicator.qml:27
  msgid "Search"
  msgstr ""
--#: plugins/Unity/Launcher/launcheritem.cpp:43
--#: plugins/Unity/Launcher/launcheritem.cpp:73
--msgid "Lock to Launcher"
--msgstr ""
--
--#: plugins/Unity/Launcher/launcheritem.cpp:73
--msgid "Unlock from Launcher"
--msgstr ""
--
--#: Shell.qml:439
++#: qml/Shell.qml:440
  #, qt-format
  msgid "Please enter %1"
  msgstr ""
 === added file 'qml/Components/SeeMore.qml'
 --- qml/Components/SeeMore.qml	1970-01-01 00:00:00 +0000
 +++ qml/Components/SeeMore.qml	2014-02-06 10:23:19 +0000
@@ -0,0 +1,68 @@
++/*
++ * Copyright (C) 2014 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/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++
++/*! Widget that can be used in combination with a text area to allow easy 'expand/collapse' functionality. */
++
++Item {
++    //! Boolean set to true when it suggests expanded functionality
++    property bool more: false
++
++    implicitHeight: seeMoreLabel.height + units.gu(2)
++
++    Row {
++        anchors.centerIn: parent
++        spacing: units.gu(2)
++
++        Label {
++            id: seeMoreLabel
++            objectName: "seeMoreLabel"
++            text: i18n.tr("See more")
++            opacity: !more ? 0.8 : 0.4
++            color: Theme.palette.selected.backgroundText
++            font.weight: Font.Bold
++
++            MouseArea {
++                anchors.fill: parent
++                onClicked: more = true
++            }
++        }
++
++        Image {
++            anchors {
++                top: parent.top
++                bottom: parent.bottom
++            }
++            width: units.dp(2)
++            source: "ListItems/graphics/ListItemDividerVertical.png"
++        }
++
++        Label {
++            objectName: "seeLessLabel"
++            text: i18n.tr("See less")
++            opacity: more ? 0.8 : 0.4
++            color: Theme.palette.selected.backgroundText
++            font.weight: Font.Bold
++
++            MouseArea {
++                anchors.fill: parent
++                onClicked: more = false
++            }
++        }
++    }
++}
 === added file 'qml/Dash/Previews/PreviewTextSummary.qml'
 --- qml/Dash/Previews/PreviewTextSummary.qml	1970-01-01 00:00:00 +0000
 +++ qml/Dash/Previews/PreviewTextSummary.qml	2014-02-06 10:23:19 +0000
@@ -0,0 +1,83 @@
++/*
++ * Copyright (C) 2014 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/>.
++ */
++
++import QtQuick 2.0
++import Ubuntu.Components 0.1
++import "../../Components"
++
++/*! \brief Preview widget for text.
++
++    This widget shows text contained in widgetData["text"]
++    along with a title that comes from widgetData["title"].
++
++    In case the text does not fit in 7 lines a See More / Less widget is also shown.
++ */
++
++PreviewWidget {
++    id: root
++    implicitHeight: childrenRect.height
++
++    Label {
++        id: titleLabel
++        objectName: "titleLabel"
++        anchors {
++            left: parent.left
++            right: parent.right
++        }
++        fontSize: "large"
++        color: Theme.palette.selected.backgroundText
++        visible: text !== ""
++        opacity: .8
++        text: widgetData["title"] || ""
++        wrapMode: Text.Wrap
++    }
++
++    Label {
++        id: textLabel
++        objectName: "textLabel"
++
++        readonly property int maximumCollapsedLineCount: 7
++
++        anchors {
++            left: parent.left
++            right: parent.right
++            top: titleLabel.visible ? titleLabel.bottom : parent.top
++        }
++        height: (!seeMore.visible || seeMore.more) ? contentHeight : contentHeight / lineCount * (maximumCollapsedLineCount - 2)
++        clip: true
++        fontSize: "medium"
++        color: Theme.palette.selected.backgroundText
++        opacity: .8
++        text: widgetData["text"]
++        wrapMode: Text.Wrap
++
++        Behavior on height {
++            UbuntuNumberAnimation {}
++        }
++    }
++
++    SeeMore {
++        id: seeMore
++        objectName: "seeMore"
++        anchors {
++            left: parent.left
++            right: parent.right
++            top: textLabel.bottom
++            topMargin: units.gu(1)
++        }
++        visible: textLabel.lineCount > textLabel.maximumCollapsedLineCount
++    }
++}
 === modified file 'tests/qmltests/CMakeLists.txt'
 --- tests/qmltests/CMakeLists.txt	2014-02-06 10:23:18 +0000
 +++ tests/qmltests/CMakeLists.txt	2014-02-06 10:23:19 +0000
@@ -32,6 +32,7 @@
  add_qml_test(Components ResponsiveFlowView)
  add_qml_test(Components ResponsiveGridView)
  add_qml_test(Components Revealer)
++add_qml_test(Components SeeMore)
  add_qml_test(Components Showable)
  add_qml_test(Components Stage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
                                             ${CMAKE_BINARY_DIR}/tests/mocks
@@ -55,6 +56,7 @@
  add_qml_test(Dash/Movie MoviePreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
  add_qml_test(Dash/Music MusicPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
  add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
++add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
  add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
                               PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
  add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
 === added file 'tests/qmltests/Components/tst_SeeMore.qml'
 --- tests/qmltests/Components/tst_SeeMore.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Components/tst_SeeMore.qml	2014-02-06 10:23:19 +0000
@@ -0,0 +1,52 @@
++/*
++ * Copyright 2014 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/>.
++ */
++
++import QtQuick 2.0
++import QtTest 1.0
++import Ubuntu.Components 0.1
++import "../../../qml/Components"
++import Unity.Test 0.1 as UT
++
++Rectangle {
++    id: root
++    width: units.gu(40)
++    height: units.gu(10)
++    color: Theme.palette.selected.background
++
++    SeeMore {
++        id: seeMore
++        anchors.fill: parent
++        more: false
++    }
++
++    UT.UnityTestCase {
++        name: "SeeMoreTest"
++        when: windowShown
++
++        function test_interaction() {
++            var seeMoreLabel = findChild(seeMore, "seeMoreLabel")
++            var seeLessLabel = findChild(seeMore, "seeLessLabel")
++
++            compare(seeMore.more, false)
++
++            mouseClick(seeMoreLabel, seeMoreLabel.width / 2, seeMoreLabel.height / 2)
++            compare(seeMore.more, true)
++
++            mouseClick(seeLessLabel, seeLessLabel.width / 2, seeLessLabel.height / 2)
++            compare(seeMore.more, false)
++        }
++    }
++}
 === added file 'tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml'
 --- tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml	1970-01-01 00:00:00 +0000
 +++ tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml	2014-02-06 10:23:19 +0000
@@ -0,0 +1,101 @@
++/*
++ * Copyright 2014 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/>.
++ */
++
++import QtQuick 2.0
++import QtTest 1.0
++import Ubuntu.Components 0.1
++import "../../../../qml/Dash/Previews"
++import Unity.Test 0.1 as UT
++
++Rectangle {
++    id: root
++    width: units.gu(40)
++    height: units.gu(80)
++    color: Theme.palette.selected.background
++
++    property var widgetDataComplete: {
++        "title": "Title here",
++        "text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh."
++    }
++
++    property var widgetDataNoTitle: {
++        "text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh.\n\nLorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh."
++    }
++
++    property var widgetDataShortText: {
++        "title": "Title here",
++        "text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit.\nPhasellus a mi vitae augue rhoncus lobortis ut rutrum metus.\nCurabitur tortor leo, tristique sed mollis quis, condimentum venenatis nibh."
++    }
++
++    PreviewTextSummary {
++        id: previewTextSummary
++        anchors.fill: parent
++        widgetData: widgetDataComplete
++    }
++
++    UT.UnityTestCase {
++        name: "PreviewTextSummaryTest"
++        when: windowShown
++
++        property var textLabel: findChild(previewTextSummary, "textLabel")
++
++        function init() {
++            verify(typeof textLabel === "object", "TextLabel object could not be found.")
++        }
++
++        function cleanup() {
++            previewTextSummary.widgetData = widgetDataComplete
++        }
++
++        function test_optional_title() {
++            var titleLabel = findChild(previewTextSummary, "titleLabel")
++
++            // verify titleLabel is visible and textLabel is anchored below it
++            compare(titleLabel.visible, true)
++            compare(textLabel.y, titleLabel.height)
++
++            // verify titleLabel disappears and textLabel moves up
++            previewTextSummary.widgetData = widgetDataNoTitle
++            compare(titleLabel.visible, false)
++            compare(textLabel.y, 0)
++        }
++
++        function test_see_more() {
++            var seeMore = findChild(previewTextSummary, "seeMore")
++
++            // when it's more than textLabel.maximumCollapsedLineCount lines of text, show SeeMore component
++            verify(textLabel.lineCount > textLabel.maximumCollapsedLineCount)
++            compare(seeMore.visible, true)
++            verify(seeMore.more === false)
++            verify(textLabel.height < textLabel.contentHeight)
++
++            // test interactions with SeeMore
++            var seeMoreLabel = findChild(seeMore, "seeMoreLabel")
++            var seeLessLabel = findChild(seeMore, "seeLessLabel")
++            var initialTextLabelHeight = textLabel.height
++            mouseClick(seeMoreLabel, seeMoreLabel.width / 2, seeMoreLabel.height / 2)
++            tryCompare(textLabel, "height", textLabel.contentHeight)
++            mouseClick(seeLessLabel, seeLessLabel.width / 2, seeLessLabel.height / 2)
++            tryCompare(textLabel, "height", initialTextLabelHeight)
++
++            // text SeeMore automatic hiding
++            previewTextSummary.widgetData = widgetDataShortText
++            verify(textLabel.lineCount <= textLabel.maximumCollapsedLineCount)
++            compare(seeMore.visible, false)
++            tryCompare(textLabel, "height", textLabel.contentHeight)
++        }
++    }
++}