1
=== modified file 'po/unity8.pot'
2
--- po/unity8.pot	2013-11-29 08:32:05 +0000
3
+++ po/unity8.pot	2014-02-06 10:23:19 +0000
4
@@ -8,7 +8,7 @@
5
8
msgstr ""
8
msgstr ""
6
9
"Project-Id-Version: unity8\n"
9
"Project-Id-Version: unity8\n"
7
10
"Report-Msgid-Bugs-To: \n"
10
"Report-Msgid-Bugs-To: \n"
9
11
"POT-Creation-Date: 2013-11-29 09:21+0100\n"
11
"POT-Creation-Date: 2014-02-04 15:43+0000\n"
10
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
11
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12
14
"Language-Team: LANGUAGE <LL@li.org>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
13
@@ -18,141 +18,153 @@
14
18
"Content-Transfer-Encoding: 8bit\n"
18
"Content-Transfer-Encoding: 8bit\n"
15
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
16
20
20
18
21
#: Components/EdgeDemoOverlay.qml:151
21
#: plugins/Unity/Launcher/launcheritem.cpp:43
19
22
#: plugins/Unity/Launcher/launcheritem.cpp:73
20
23
msgid "Lock to Launcher"
21
24
msgstr ""
22
25
23
26
#: plugins/Unity/Launcher/launcheritem.cpp:73
24
27
msgid "Unlock from Launcher"
25
28
msgstr ""
26
29
27
30
#: qml/Components/EdgeDemoOverlay.qml:151
28
22
msgid "Skip intro"
31
msgid "Skip intro"
29
23
msgstr ""
32
msgstr ""
30
24
33
32
25
#: Components/EdgeDemo.qml:112
34
#: qml/Components/EdgeDemo.qml:113
33
26
msgid "Right edge"
35
msgid "Right edge"
34
27
msgstr ""
36
msgstr ""
35
28
37
37
29
#: Components/EdgeDemo.qml:113
38
#: qml/Components/EdgeDemo.qml:114
38
30
msgid "Try swiping from the right edge to unlock the phone"
39
msgid "Try swiping from the right edge to unlock the phone"
39
31
msgstr ""
40
msgstr ""
40
32
41
42
33
#: Components/EdgeDemo.qml:144
42
#: qml/Components/EdgeDemo.qml:145
43
34
msgid "Top edge"
43
msgid "Top edge"
44
35
msgstr ""
44
msgstr ""
45
36
45
47
37
#: Components/EdgeDemo.qml:145
46
#: qml/Components/EdgeDemo.qml:146
48
38
msgid "Try swiping from the top edge to access the indicators"
47
msgid "Try swiping from the top edge to access the indicators"
49
39
msgstr ""
48
msgstr ""
50
40
49
52
41
#: Components/EdgeDemo.qml:170
50
#: qml/Components/EdgeDemo.qml:171
53
42
msgid "Close"
51
msgid "Close"
54
43
msgstr ""
52
msgstr ""
55
44
53
57
45
#: Components/EdgeDemo.qml:171
54
#: qml/Components/EdgeDemo.qml:172
58
46
msgid "Swipe up again to close the settings screen"
55
msgid "Swipe up again to close the settings screen"
59
47
msgstr ""
56
msgstr ""
60
48
57
62
49
#: Components/EdgeDemo.qml:198
58
#: qml/Components/EdgeDemo.qml:199
63
50
msgid "Left edge"
59
msgid "Left edge"
64
51
msgstr ""
60
msgstr ""
65
52
61
67
53
#: Components/EdgeDemo.qml:199
62
#: qml/Components/EdgeDemo.qml:200
68
54
msgid "Swipe from the left to reveal the launcher for quick access to apps"
63
msgid "Swipe from the left to reveal the launcher for quick access to apps"
69
55
msgstr ""
64
msgstr ""
70
56
65
72
57
#: Components/EdgeDemo.qml:226
66
#: qml/Components/EdgeDemo.qml:227
73
58
msgid "Well done"
67
msgid "Well done"
74
59
msgstr ""
68
msgstr ""
75
60
69
77
61
#: Components/EdgeDemo.qml:227
70
#: qml/Components/EdgeDemo.qml:228
78
62
msgid ""
71
msgid ""
79
63
"You have now mastered the edge gestures and can start using the "
72
"You have now mastered the edge gestures and can start using the "
80
64
"phone<br><br>Tap anywhere to start"
73
"phone<br><br>Tap anywhere to start"
81
65
msgstr ""
74
msgstr ""
82
66
75
84
67
#: Components/PageHeader.qml:364
76
#: qml/Components/PageHeader.qml:339
85
68
msgid "Recent searches"
77
msgid "Recent searches"
86
69
msgstr ""
78
msgstr ""
87
70
79
89
71
#: Dash/Apps/AppPreview.qml:135
80
#: qml/Components/SeeMore.qml:32
90
81
msgid "See more"
91
82
msgstr ""
92
83
93
84
#: qml/Components/SeeMore.qml:61
94
85
msgid "See less"
95
86
msgstr ""
96
87
97
88
#: qml/Dash/Apps/AppPreview.qml:136
98
72
msgid "Rate this"
89
msgid "Rate this"
99
73
msgstr ""
90
msgstr ""
100
74
91
101
75
#. TRANSLATORS: Number of persons who rated this app/video/whatever
92
#. TRANSLATORS: Number of persons who rated this app/video/whatever
103
76
#: Dash/Previews/Header.qml:93
93
#: qml/Dash/Previews/Header.qml:93
104
77
#, qt-format
94
#, qt-format
105
78
msgid "(%1)"
95
msgid "(%1)"
106
79
msgstr ""
96
msgstr ""
107
80
97
108
81
#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever
98
#. TRANSLATORS: Number of persons who wrote reviews for this app/video/whatever
110
82
#: Dash/Previews/Header.qml:105
99
#: qml/Dash/Previews/Header.qml:105
111
83
#, qt-format
100
#, qt-format
112
84
msgid "%1 review"
101
msgid "%1 review"
113
85
msgid_plural "%1 reviews"
102
msgid_plural "%1 reviews"
114
86
msgstr[0] ""
103
msgstr[0] ""
115
87
msgstr[1] ""
104
msgstr[1] ""
116
88
105
118
89
#: Dash/Previews/Reviews.qml:74
106
#: qml/Dash/Previews/Reviews.qml:74
119
90
msgid "Add a review"
107
msgid "Add a review"
120
91
msgstr ""
108
msgstr ""
121
92
109
123
93
#: Dash/Previews/Reviews.qml:86
110
#: qml/Dash/Previews/Reviews.qml:86
124
94
msgid "Review"
111
msgid "Review"
125
95
msgstr ""
112
msgstr ""
126
96
113
128
97
#: Dash/Previews/Reviews.qml:121
114
#: qml/Dash/Previews/Reviews.qml:121
129
98
msgid "Send"
115
msgid "Send"
130
99
msgstr ""
116
msgstr ""
131
100
117
133
101
#: Dash/Previews/Reviews.qml:139
118
#: qml/Dash/Previews/Reviews.qml:139
134
102
msgid "Comments:"
119
msgid "Comments:"
135
103
msgstr ""
120
msgstr ""
136
104
121
138
105
#: Greeter/Lockscreen.qml:149
122
#: qml/Greeter/Lockscreen.qml:149
139
106
msgid "Emergency Call"
123
msgid "Emergency Call"
140
107
msgstr ""
124
msgstr ""
141
108
125
143
109
#: Greeter/PassphraseLockscreen.qml:59
126
#: qml/Greeter/PassphraseLockscreen.qml:59
144
110
#, qt-format
127
#, qt-format
145
111
msgid "Hello %1"
128
msgid "Hello %1"
146
112
msgstr ""
129
msgstr ""
147
113
130
149
114
#: Greeter/PassphraseLockscreen.qml:59
131
#: qml/Greeter/PassphraseLockscreen.qml:59
150
115
msgid "Hello"
132
msgid "Hello"
151
116
msgstr ""
133
msgstr ""
152
117
134
154
118
#: Hud/HudParametrizedActionsPage.qml:132
135
#: qml/Hud/HudParametrizedActionsPage.qml:132
155
119
msgid "Confirm"
136
msgid "Confirm"
156
120
msgstr ""
137
msgstr ""
157
121
138
159
122
#: Hud/Hud.qml:61 Hud/Hud.qml:99 Hud/Hud.qml:372
139
#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
160
123
msgid "Type or say a command"
140
msgid "Type or say a command"
161
124
msgstr ""
141
msgstr ""
162
125
142
164
126
#: Hud/Hud.qml:84
143
#: qml/Hud/Hud.qml:84
165
127
msgid "Loading. Please Wait..."
144
msgid "Loading. Please Wait..."
166
128
msgstr ""
145
msgstr ""
167
129
146
169
130
#: Hud/Hud.qml:89
147
#: qml/Hud/Hud.qml:89
170
131
msgid "Speak Now..."
148
msgid "Speak Now..."
171
132
msgstr ""
149
msgstr ""
172
133
150
174
134
#: Hud/Hud.qml:94
151
#: qml/Hud/Hud.qml:94
175
135
msgid "Speaking..."
152
msgid "Speaking..."
176
136
msgstr ""
153
msgstr ""
177
137
154
179
138
#: Notifications/NotificationMenuItemFactory.qml:89
155
#: qml/Notifications/NotificationMenuItemFactory.qml:91
180
139
msgid "Show password"
156
msgid "Show password"
181
140
msgstr ""
157
msgstr ""
182
141
158
184
142
#: Panel/SearchIndicator.qml:27
159
#: qml/Notifications/NotificationMenuItemFactory.qml:103
185
160
msgid "Please enter SIM PIN"
186
161
msgstr ""
187
162
188
163
#: qml/Panel/SearchIndicator.qml:27
189
143
msgid "Search"
164
msgid "Search"
190
144
msgstr ""
165
msgstr ""
191
145
166
202
146
#: plugins/Unity/Launcher/launcheritem.cpp:43
167
#: qml/Shell.qml:440
193
147
#: plugins/Unity/Launcher/launcheritem.cpp:73
194
148
msgid "Lock to Launcher"
195
149
msgstr ""
196
150
197
151
#: plugins/Unity/Launcher/launcheritem.cpp:73
198
152
msgid "Unlock from Launcher"
199
153
msgstr ""
200
154
201
155
#: Shell.qml:439
203
156
#, qt-format
168
#, qt-format
204
157
msgid "Please enter %1"
169
msgid "Please enter %1"
205
158
msgstr ""
170
msgstr ""
206
159
171
207
=== added file 'qml/Components/SeeMore.qml'
208
--- qml/Components/SeeMore.qml	1970-01-01 00:00:00 +0000
209
+++ qml/Components/SeeMore.qml	2014-02-06 10:23:19 +0000
210
@@ -0,0 +1,68 @@
211
1
/*
212
2
 * Copyright (C) 2014 Canonical, Ltd.
213
3
 *
214
4
 * This program is free software; you can redistribute it and/or modify
215
5
 * it under the terms of the GNU General Public License as published by
216
6
 * the Free Software Foundation; version 3.
217
7
 *
218
8
 * This program is distributed in the hope that it will be useful,
219
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
220
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
221
11
 * GNU General Public License for more details.
222
12
 *
223
13
 * You should have received a copy of the GNU General Public License
224
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
225
15
 */
226
16
227
17
import QtQuick 2.0
228
18
import Ubuntu.Components 0.1
229
19
230
20
/*! Widget that can be used in combination with a text area to allow easy 'expand/collapse' functionality. */
231
21
232
22
Item {
233
23
    //! Boolean set to true when it suggests expanded functionality
234
24
    property bool more: false
235
25
236
26
    implicitHeight: seeMoreLabel.height + units.gu(2)
237
27
238
28
    Row {
239
29
        anchors.centerIn: parent
240
30
        spacing: units.gu(2)
241
31
242
32
        Label {
243
33
            id: seeMoreLabel
244
34
            objectName: "seeMoreLabel"
245
35
            text: i18n.tr("See more")
246
36
            opacity: !more ? 0.8 : 0.4
247
37
            color: Theme.palette.selected.backgroundText
248
38
            font.weight: Font.Bold
249
39
250
40
            MouseArea {
251
41
                anchors.fill: parent
252
42
                onClicked: more = true
253
43
            }
254
44
        }
255
45
256
46
        Image {
257
47
            anchors {
258
48
                top: parent.top
259
49
                bottom: parent.bottom
260
50
            }
261
51
            width: units.dp(2)
262
52
            source: "ListItems/graphics/ListItemDividerVertical.png"
263
53
        }
264
54
265
55
        Label {
266
56
            objectName: "seeLessLabel"
267
57
            text: i18n.tr("See less")
268
58
            opacity: more ? 0.8 : 0.4
269
59
            color: Theme.palette.selected.backgroundText
270
60
            font.weight: Font.Bold
271
61
272
62
            MouseArea {
273
63
                anchors.fill: parent
274
64
                onClicked: more = false
275
65
            }
276
66
        }
277
67
    }
278
68
}
279
0
69
280
=== added file 'qml/Dash/Previews/PreviewTextSummary.qml'
281
--- qml/Dash/Previews/PreviewTextSummary.qml	1970-01-01 00:00:00 +0000
282
+++ qml/Dash/Previews/PreviewTextSummary.qml	2014-02-06 10:23:19 +0000
283
@@ -0,0 +1,83 @@
284
1
/*
285
2
 * Copyright (C) 2014 Canonical, Ltd.
286
3
 *
287
4
 * This program is free software; you can redistribute it and/or modify
288
5
 * it under the terms of the GNU General Public License as published by
289
6
 * the Free Software Foundation; version 3.
290
7
 *
291
8
 * This program is distributed in the hope that it will be useful,
292
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
293
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
294
11
 * GNU General Public License for more details.
295
12
 *
296
13
 * You should have received a copy of the GNU General Public License
297
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
298
15
 */
299
16
300
17
import QtQuick 2.0
301
18
import Ubuntu.Components 0.1
302
19
import "../../Components"
303
20
304
21
/*! \brief Preview widget for text.
305
22
306
23
    This widget shows text contained in widgetData["text"]
307
24
    along with a title that comes from widgetData["title"].
308
25
309
26
    In case the text does not fit in 7 lines a See More / Less widget is also shown.
310
27
 */
311
28
312
29
PreviewWidget {
313
30
    id: root
314
31
    implicitHeight: childrenRect.height
315
32
316
33
    Label {
317
34
        id: titleLabel
318
35
        objectName: "titleLabel"
319
36
        anchors {
320
37
            left: parent.left
321
38
            right: parent.right
322
39
        }
323
40
        fontSize: "large"
324
41
        color: Theme.palette.selected.backgroundText
325
42
        visible: text !== ""
326
43
        opacity: .8
327
44
        text: widgetData["title"] || ""
328
45
        wrapMode: Text.Wrap
329
46
    }
330
47
331
48
    Label {
332
49
        id: textLabel
333
50
        objectName: "textLabel"
334
51
335
52
        readonly property int maximumCollapsedLineCount: 7
336
53
337
54
        anchors {
338
55
            left: parent.left
339
56
            right: parent.right
340
57
            top: titleLabel.visible ? titleLabel.bottom : parent.top
341
58
        }
342
59
        height: (!seeMore.visible || seeMore.more) ? contentHeight : contentHeight / lineCount * (maximumCollapsedLineCount - 2)
343
60
        clip: true
344
61
        fontSize: "medium"
345
62
        color: Theme.palette.selected.backgroundText
346
63
        opacity: .8
347
64
        text: widgetData["text"]
348
65
        wrapMode: Text.Wrap
349
66
350
67
        Behavior on height {
351
68
            UbuntuNumberAnimation {}
352
69
        }
353
70
    }
354
71
355
72
    SeeMore {
356
73
        id: seeMore
357
74
        objectName: "seeMore"
358
75
        anchors {
359
76
            left: parent.left
360
77
            right: parent.right
361
78
            top: textLabel.bottom
362
79
            topMargin: units.gu(1)
363
80
        }
364
81
        visible: textLabel.lineCount > textLabel.maximumCollapsedLineCount
365
82
    }
366
83
}
367
0
84
368
=== modified file 'tests/qmltests/CMakeLists.txt'
369
--- tests/qmltests/CMakeLists.txt	2014-02-06 10:23:18 +0000
370
+++ tests/qmltests/CMakeLists.txt	2014-02-06 10:23:19 +0000
371
@@ -32,6 +32,7 @@
372
32
add_qml_test(Components ResponsiveFlowView)
32
add_qml_test(Components ResponsiveFlowView)
373
33
add_qml_test(Components ResponsiveGridView)
33
add_qml_test(Components ResponsiveGridView)
374
34
add_qml_test(Components Revealer)
34
add_qml_test(Components Revealer)
375
35
add_qml_test(Components SeeMore)
376
35
add_qml_test(Components Showable)
36
add_qml_test(Components Showable)
377
36
add_qml_test(Components Stage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
37
add_qml_test(Components Stage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
378
37
                                           ${CMAKE_BINARY_DIR}/tests/mocks
38
                                           ${CMAKE_BINARY_DIR}/tests/mocks
379
@@ -55,6 +56,7 @@
380
55
add_qml_test(Dash/Movie MoviePreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
56
add_qml_test(Dash/Movie MoviePreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
381
56
add_qml_test(Dash/Music MusicPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
57
add_qml_test(Dash/Music MusicPreview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
382
57
add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
58
add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
383
59
add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
384
58
add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
60
add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
385
59
                             PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
61
                             PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
386
60
add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
62
add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
387
61
63
388
=== added file 'tests/qmltests/Components/tst_SeeMore.qml'
389
--- tests/qmltests/Components/tst_SeeMore.qml	1970-01-01 00:00:00 +0000
390
+++ tests/qmltests/Components/tst_SeeMore.qml	2014-02-06 10:23:19 +0000
391
@@ -0,0 +1,52 @@
392
1
/*
393
2
 * Copyright 2014 Canonical Ltd.
394
3
 *
395
4
 * This program is free software; you can redistribute it and/or modify
396
5
 * it under the terms of the GNU General Public License as published by
397
6
 * the Free Software Foundation; version 3.
398
7
 *
399
8
 * This program is distributed in the hope that it will be useful,
400
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
401
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
402
11
 * GNU General Public License for more details.
403
12
 *
404
13
 * You should have received a copy of the GNU General Public License
405
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
406
15
 */
407
16
408
17
import QtQuick 2.0
409
18
import QtTest 1.0
410
19
import Ubuntu.Components 0.1
411
20
import "../../../qml/Components"
412
21
import Unity.Test 0.1 as UT
413
22
414
23
Rectangle {
415
24
    id: root
416
25
    width: units.gu(40)
417
26
    height: units.gu(10)
418
27
    color: Theme.palette.selected.background
419
28
420
29
    SeeMore {
421
30
        id: seeMore
422
31
        anchors.fill: parent
423
32
        more: false
424
33
    }
425
34
426
35
    UT.UnityTestCase {
427
36
        name: "SeeMoreTest"
428
37
        when: windowShown
429
38
430
39
        function test_interaction() {
431
40
            var seeMoreLabel = findChild(seeMore, "seeMoreLabel")
432
41
            var seeLessLabel = findChild(seeMore, "seeLessLabel")
433
42
434
43
            compare(seeMore.more, false)
435
44
436
45
            mouseClick(seeMoreLabel, seeMoreLabel.width / 2, seeMoreLabel.height / 2)
437
46
            compare(seeMore.more, true)
438
47
439
48
            mouseClick(seeLessLabel, seeLessLabel.width / 2, seeLessLabel.height / 2)
440
49
            compare(seeMore.more, false)
441
50
        }
442
51
    }
443
52
}
444
0
53
445
=== added file 'tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml'
446
--- tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml	1970-01-01 00:00:00 +0000
447
+++ tests/qmltests/Dash/Previews/tst_PreviewTextSummary.qml	2014-02-06 10:23:19 +0000
448
@@ -0,0 +1,101 @@
449
1
/*
450
2
 * Copyright 2014 Canonical Ltd.
451
3
 *
452
4
 * This program is free software; you can redistribute it and/or modify
453
5
 * it under the terms of the GNU General Public License as published by
454
6
 * the Free Software Foundation; version 3.
455
7
 *
456
8
 * This program is distributed in the hope that it will be useful,
457
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
458
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
459
11
 * GNU General Public License for more details.
460
12
 *
461
13
 * You should have received a copy of the GNU General Public License
462
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
463
15
 */
464
16
465
17
import QtQuick 2.0
466
18
import QtTest 1.0
467
19
import Ubuntu.Components 0.1
468
20
import "../../../../qml/Dash/Previews"
469
21
import Unity.Test 0.1 as UT
470
22
471
23
Rectangle {
472
24
    id: root
473
25
    width: units.gu(40)
474
26
    height: units.gu(80)
475
27
    color: Theme.palette.selected.background
476
28
477
29
    property var widgetDataComplete: {
478
30
        "title": "Title here",
479
31
        "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."
480
32
    }
481
33
482
34
    property var widgetDataNoTitle: {
483
35
        "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."
484
36
    }
485
37
486
38
    property var widgetDataShortText: {
487
39
        "title": "Title here",
488
40
        "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."
489
41
    }
490
42
491
43
    PreviewTextSummary {
492
44
        id: previewTextSummary
493
45
        anchors.fill: parent
494
46
        widgetData: widgetDataComplete
495
47
    }
496
48
497
49
    UT.UnityTestCase {
498
50
        name: "PreviewTextSummaryTest"
499
51
        when: windowShown
500
52
501
53
        property var textLabel: findChild(previewTextSummary, "textLabel")
502
54
503
55
        function init() {
504
56
            verify(typeof textLabel === "object", "TextLabel object could not be found.")
505
57
        }
506
58
507
59
        function cleanup() {
508
60
            previewTextSummary.widgetData = widgetDataComplete
509
61
        }
510
62
511
63
        function test_optional_title() {
512
64
            var titleLabel = findChild(previewTextSummary, "titleLabel")
513
65
514
66
            // verify titleLabel is visible and textLabel is anchored below it
515
67
            compare(titleLabel.visible, true)
516
68
            compare(textLabel.y, titleLabel.height)
517
69
518
70
            // verify titleLabel disappears and textLabel moves up
519
71
            previewTextSummary.widgetData = widgetDataNoTitle
520
72
            compare(titleLabel.visible, false)
521
73
            compare(textLabel.y, 0)
522
74
        }
523
75
524
76
        function test_see_more() {
525
77
            var seeMore = findChild(previewTextSummary, "seeMore")
526
78
527
79
            // when it's more than textLabel.maximumCollapsedLineCount lines of text, show SeeMore component
528
80
            verify(textLabel.lineCount > textLabel.maximumCollapsedLineCount)
529
81
            compare(seeMore.visible, true)
530
82
            verify(seeMore.more === false)
531
83
            verify(textLabel.height < textLabel.contentHeight)
532
84
533
85
            // test interactions with SeeMore
534
86
            var seeMoreLabel = findChild(seeMore, "seeMoreLabel")
535
87
            var seeLessLabel = findChild(seeMore, "seeLessLabel")
536
88
            var initialTextLabelHeight = textLabel.height
537
89
            mouseClick(seeMoreLabel, seeMoreLabel.width / 2, seeMoreLabel.height / 2)
538
90
            tryCompare(textLabel, "height", textLabel.contentHeight)
539
91
            mouseClick(seeLessLabel, seeLessLabel.width / 2, seeLessLabel.height / 2)
540
92
            tryCompare(textLabel, "height", initialTextLabelHeight)
541
93
542
94
            // text SeeMore automatic hiding
543
95
            previewTextSummary.widgetData = widgetDataShortText
544
96
            verify(textLabel.lineCount <= textLabel.maximumCollapsedLineCount)
545
97
            compare(seeMore.visible, false)
546
98
            tryCompare(textLabel, "height", textLabel.contentHeight)
547
99
        }
548
100
    }
549
101
}
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