1
=== modified file 'cmake/modules/QmlTest.cmake'
2
--- cmake/modules/QmlTest.cmake	2014-12-11 15:48:35 +0000
3
+++ cmake/modules/QmlTest.cmake	2015-02-23 15:44:00 +0000
4
@@ -28,7 +28,7 @@
5
28
28
6
29
set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)
29
set(qmlscene_exe ${CMAKE_BINARY_DIR}/tests/uqmlscene/uqmlscene)
7
30
30
9
31
set(test_env UNITY_TESTING=1)
31
set(test_env LC_ALL=C UNITY_TESTING=1)
10
32
32
11
33
macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
33
macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
12
34
    set(options NO_ADD_TEST NO_TARGETS)
34
    set(options NO_ADD_TEST NO_TARGETS)
13
35
35
14
=== modified file 'qml/Components/DelayedLockscreen.qml'
15
--- qml/Components/DelayedLockscreen.qml	2014-09-16 00:00:06 +0000
16
+++ qml/Components/DelayedLockscreen.qml	2015-02-23 15:44:00 +0000
17
@@ -20,11 +20,13 @@
18
20
20
19
21
Item {
21
Item {
20
22
    id: root
22
    id: root
21
23
    anchors.fill: parent
22
24
23
23
25
    property int delayMinutes
24
    property int delayMinutes
24
26
    property bool alphaNumeric
25
    property bool alphaNumeric
25
27
26
26
27
    signal entered(string passphrase) // unused
27
28
    signal cancel() // unused
28
29
29
28
    function clear(playAnimation) {}
30
    function clear(playAnimation) {}
30
29
31
31
30
    Column {
32
    Column {
32
31
33
33
=== modified file 'qml/Components/PassphraseLockscreen.qml'
34
--- qml/Components/PassphraseLockscreen.qml	2014-10-23 13:23:07 +0000
35
+++ qml/Components/PassphraseLockscreen.qml	2015-02-23 15:44:00 +0000
36
@@ -1,5 +1,5 @@
37
1
/*
1
/*
39
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013,2014,2015 Canonical, Ltd.
40
3
 *
3
 *
41
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
42
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
43
@@ -20,8 +20,7 @@
44
20
20
45
21
Item {
21
Item {
46
22
    id: root
22
    id: root
49
23
    anchors.top: parent.top
23
    y: units.gu(4)
48
24
    anchors.topMargin: units.gu(4)
50
25
    height: shakeContainer.height
24
    height: shakeContainer.height
51
26
25
52
27
    property string infoText
26
    property string infoText
53
28
27
54
=== modified file 'qml/Components/PinLockscreen.qml'
55
--- qml/Components/PinLockscreen.qml	2014-10-23 13:23:07 +0000
56
+++ qml/Components/PinLockscreen.qml	2015-02-23 15:44:00 +0000
57
@@ -21,9 +21,7 @@
58
21
21
59
22
Column {
22
Column {
60
23
    id: root
23
    id: root
64
24
    anchors.top: parent.top
24
    y: units.gu(4)
62
25
    anchors.topMargin: units.gu(4)
63
26
    anchors.horizontalCenter: parent.horizontalCenter
65
27
    spacing: units.gu(2)
25
    spacing: units.gu(2)
66
28
26
67
29
    property string infoText
27
    property string infoText
68
@@ -123,6 +121,7 @@
69
123
                objectName: "backspaceIcon"
121
                objectName: "backspaceIcon"
70
124
                anchors { right: parent.right; top: parent.top; bottom: parent.bottom }
122
                anchors { right: parent.right; top: parent.top; bottom: parent.bottom }
71
125
                width: height
123
                width: height
72
124
                enabled: root.entryEnabled
73
126
125
74
127
                Icon {
126
                Icon {
75
128
                    anchors.fill: parent
127
                    anchors.fill: parent
76
@@ -130,7 +129,7 @@
77
130
                    color: "#f3f3e7"
129
                    color: "#f3f3e7"
78
131
                }
130
                }
79
132
131
81
133
                opacity: (pinentryField.text.length && !pinentryField.incorrectOverride) > 0 ? 1 : 0
132
                opacity: (pinentryField.text.length > 0 && !pinentryField.incorrectOverride) ? 1 : 0
82
134
133
83
135
                Behavior on opacity {
134
                Behavior on opacity {
84
136
                    UbuntuNumberAnimation {}
135
                    UbuntuNumberAnimation {}
85
137
136
86
=== renamed file 'qml/Greeter/GreeterContent.qml' => 'qml/Greeter/CoverPage.qml'
87
--- qml/Greeter/GreeterContent.qml	2015-02-11 16:04:13 +0000
88
+++ qml/Greeter/CoverPage.qml	2015-02-23 15:44:00 +0000
89
@@ -1,5 +1,5 @@
90
1
/*
1
/*
92
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013,2014,2015 Canonical, Ltd.
93
3
 *
3
 *
94
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
95
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
96
@@ -14,34 +14,48 @@
97
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
98
15
 */
15
 */
99
16
16
104
17
import QtQuick 2.0
17
import QtQuick 2.3
105
18
import AccountsService 0.1
18
import Ubuntu.Components 1.1
106
19
import Ubuntu.Components 0.1
19
import Ubuntu.Gestures 0.1
103
20
import LightDM 0.1 as LightDM
107
21
import "../Components"
20
import "../Components"
108
22
21
110
23
Item {
22
Showable {
111
24
    id: root
23
    id: root
132
25
    anchors.fill: parent
24
133
26
25
    property real dragHandleLeftMargin
134
27
    property var inputMethod
26
    property real launcherOffset
135
28
27
    property alias background: greeterBackground.source
136
29
    property bool ready: background.source == "" || background.status == Image.Ready || background.status == Image.Error
28
    property real backgroundTopMargin
137
30
29
    property var infographicModel
138
31
    signal selected(int uid)
30
    property bool draggable: true
139
32
    signal unlocked(int uid)
31
140
33
32
    property alias infographics: infographics
141
34
    function tryToUnlock() {
33
142
35
        if (loginLoader.item) {
34
    readonly property real showProgress: MathUtils.clamp((width - Math.abs(x)) / width, 0, 1)
143
36
            loginLoader.item.tryToUnlock()
35
144
37
        }
36
    signal tease()
145
38
    }
37
146
39
38
    function hideRight() {
147
40
    function reset() {
39
        d.forceRightOnNextHideAnimation = true;
148
41
        if (loginLoader.item) {
40
        hide();
149
42
            loginLoader.item.reset()
41
    }
150
43
        }
42
151
44
    }
43
    QtObject {
152
44
        id: d
153
45
        property bool forceRightOnNextHideAnimation: false
154
46
    }
155
47
156
48
    prepareToHide: function () {
157
49
        hideTranslation.from = root.x + translation.x
158
50
        hideTranslation.to = root.x > 0 || d.forceRightOnNextHideAnimation ? root.width : -root.width;
159
51
        d.forceRightOnNextHideAnimation = false;
160
52
    }
161
53
162
54
    // We don't directly bind "x" because that's owned by the DragHandle. So
163
55
    // instead, we can get a little extra horizontal push by using transforms.
164
56
    transform: Translate { id: translation; x: root.draggable ? launcherOffset : 0 }
165
57
166
58
    MouseArea { anchors.fill: parent; }
167
45
59
168
46
    Rectangle {
60
    Rectangle {
169
47
        // In case background fails to load
61
        // In case background fails to load
170
@@ -51,17 +65,16 @@
171
51
    }
65
    }
172
52
66
173
53
    CrossFadeImage {
67
    CrossFadeImage {
175
54
        id: background
68
        id: greeterBackground
176
55
        objectName: "greeterBackground"
69
        objectName: "greeterBackground"
177
56
        anchors {
70
        anchors {
178
57
            fill: parent
71
            fill: parent
180
58
            topMargin: backgroundTopMargin
72
            topMargin: root.backgroundTopMargin
181
59
        }
73
        }
182
60
        fillMode: Image.PreserveAspectCrop
74
        fillMode: Image.PreserveAspectCrop
183
61
        // Limit how much memory we'll reserve for this image
75
        // Limit how much memory we'll reserve for this image
184
62
        sourceSize.height: height
76
        sourceSize.height: height
185
63
        sourceSize.width: width
77
        sourceSize.width: width
186
64
        source: greeter.background
187
65
    }
78
    }
188
66
79
189
67
    Rectangle {
80
    Rectangle {
190
@@ -70,94 +83,134 @@
191
70
        opacity: 0.4
83
        opacity: 0.4
192
71
    }
84
    }
193
72
85
194
73
    Loader {
195
74
        id: loginLoader
196
75
        objectName: "loginLoader"
197
76
        anchors {
198
77
            left: parent.left
199
78
            leftMargin: Math.min(parent.width * 0.16, units.gu(20))
200
79
            top: parent.top
201
80
        }
202
81
        width: units.gu(29)
203
82
        height: inputMethod && inputMethod.visible ? parent.height - inputMethod.keyboardRectangle.height
204
83
                                                   : parent.height
205
84
        Behavior on height { UbuntuNumberAnimation {} }
206
85
207
86
        // TODO: Once we have a system API for determining which mode we are
208
87
        // in, tablet/phone/desktop, that should be used instead of narrowMode.
209
88
        source: greeter.narrowMode ? "" : "LoginList.qml"
210
89
211
90
        onLoaded: {
212
91
            item.currentIndex = greeterContentLoader.currentIndex;
213
92
        }
214
93
215
94
        Binding {
216
95
            target: loginLoader.item
217
96
            property: "model"
218
97
            value: greeterContentLoader.model
219
98
        }
220
99
221
100
        Connections {
222
101
            target: loginLoader.item
223
102
224
103
            onSelected: {
225
104
                root.selected(uid);
226
105
            }
227
106
228
107
            onUnlocked: {
229
108
                root.unlocked(uid);
230
109
            }
231
110
232
111
            onCurrentIndexChanged: {
233
112
                if (greeterContentLoader.currentIndex !== loginLoader.item.currentIndex) {
234
113
                    greeterContentLoader.currentIndex = loginLoader.item.currentIndex;
235
114
                }
236
115
            }
237
116
        }
238
117
    }
239
118
240
119
    Infographics {
86
    Infographics {
241
120
        id: infographics
87
        id: infographics
242
121
        objectName: "infographics"
88
        objectName: "infographics"
245
122
        height: narrowMode ? parent.height : 0.75 * parent.height
89
        height: parent.height
246
123
        model: greeterContentLoader.infographicModel
90
        model: root.infographicModel
247
124
        clip: true // clip large data bubbles
91
        clip: true // clip large data bubbles
248
125
92
249
126
        property string selectedUser
250
127
        property string infographicUser: AccountsService.statsWelcomeScreen ? selectedUser : ""
251
128
        onInfographicUserChanged: greeterContentLoader.infographicModel.username = infographicUser
252
129
253
130
        Component.onCompleted: {
254
131
            selectedUser = greeterContentLoader.model.data(greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
255
132
            greeterContentLoader.infographicModel.username = infographicUser
256
133
            greeterContentLoader.infographicModel.readyForDataChange()
257
134
        }
258
135
259
136
        Connections {
260
137
            target: root
261
138
            onSelected: infographics.selectedUser = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)
262
139
        }
263
140
264
141
        Connections {
265
142
            target: i18n
266
143
            onLanguageChanged: greeterContentLoader.infographicModel.readyForDataChange()
267
144
        }
268
145
269
146
        anchors {
93
        anchors {
270
147
            verticalCenter: parent.verticalCenter
94
            verticalCenter: parent.verticalCenter
284
148
            left: narrowMode ? root.left : loginLoader.right
95
            left: parent.left
285
149
            right: root.right
96
            right: parent.right
286
150
        }
97
        }
287
151
    }
98
    }
288
152
99
289
153
    Clock {
100
    Label {
290
154
        id: clock
101
        id: swipeHint
291
155
        visible: narrowMode
102
        property real baseOpacity: 0.5
292
156
103
        opacity: 0.0
293
157
        anchors {
104
        anchors.horizontalCenter: parent.horizontalCenter
294
158
            top: parent.top
105
        anchors.bottom: parent.bottom
295
159
            topMargin: units.gu(2)
106
        anchors.bottomMargin: units.gu(5)
296
160
            horizontalCenter: parent.horizontalCenter
107
        text: "《    " + i18n.tr("Unlock") + "    》"
297
108
        color: "white"
298
109
        font.weight: Font.Light
299
110
300
111
        SequentialAnimation on opacity {
301
112
            id: showLabelAnimation
302
113
            running: false
303
114
            loops: 2
304
115
305
116
            StandardAnimation {
306
117
                from: 0.0
307
118
                to: swipeHint.baseOpacity
308
119
                duration: UbuntuAnimation.SleepyDuration
309
120
            }
310
121
            PauseAnimation { duration: UbuntuAnimation.BriskDuration }
311
122
            StandardAnimation {
312
123
                from: swipeHint.baseOpacity
313
124
                to: 0.0
314
125
                duration: UbuntuAnimation.SleepyDuration
315
126
            }
316
127
        }
317
128
    }
318
129
319
130
    DragHandle {
320
131
        id: dragHandle
321
132
        anchors.fill: parent
322
133
        anchors.leftMargin: root.dragHandleLeftMargin
323
134
        enabled: root.draggable
324
135
        direction: Direction.Horizontal
325
136
326
137
        onDraggingChanged: {
327
138
            if (dragging) {
328
139
                root.tease();
329
140
                showLabelAnimation.start();
330
141
            }
331
142
        }
332
143
    }
333
144
334
145
    // right side shadow
335
146
    Image {
336
147
        anchors.left: parent.right
337
148
        anchors.top: parent.top
338
149
        anchors.bottom: parent.bottom
339
150
        fillMode: Image.Tile
340
151
        source: "../graphics/dropshadow_right.png"
341
152
    }
342
153
343
154
    // left side shadow
344
155
    Image {
345
156
        anchors.right: parent.left
346
157
        anchors.top: parent.top
347
158
        anchors.bottom: parent.bottom
348
159
        fillMode: Image.Tile
349
160
        source: "../graphics/dropshadow_left.png"
350
161
    }
351
162
352
163
    Binding {
353
164
        id: positionLock
354
165
355
166
        property bool enabled: false
356
167
        onEnabledChanged: {
357
168
            if (enabled === __enabled) {
358
169
                return;
359
170
            }
360
171
361
172
            if (enabled) {
362
173
                if (root.x > 0) {
363
174
                    value = Qt.binding(function() { return root.width; })
364
175
                } else {
365
176
                    value = Qt.binding(function() { return -root.width; })
366
177
                }
367
178
            }
368
179
369
180
            __enabled = enabled;
370
181
        }
371
182
372
183
        property bool __enabled: false
373
184
374
185
        target: root
375
186
        when: __enabled
376
187
        property: "x"
377
188
    }
378
189
379
190
    hideAnimation: SequentialAnimation {
380
191
        id: hideAnimation
381
192
        objectName: "hideAnimation"
382
193
        property var target // unused, here to silence Showable warning
383
194
        StandardAnimation {
384
195
            id: hideTranslation
385
196
            property: "x"
386
197
            target: root
387
198
        }
388
199
        PropertyAction { target: root; property: "visible"; value: false }
389
200
        PropertyAction { target: positionLock; property: "enabled"; value: true }
390
201
    }
391
202
392
203
    showAnimation: SequentialAnimation {
393
204
        id: showAnimation
394
205
        objectName: "showAnimation"
395
206
        property var target // unused, here to silence Showable warning
396
207
        PropertyAction { target: root; property: "visible"; value: true }
397
208
        PropertyAction { target: positionLock; property: "enabled"; value: false }
398
209
        StandardAnimation {
399
210
            property: "x"
400
211
            target: root
401
212
            to: 0
402
213
            duration: UbuntuAnimation.FastDuration
403
161
        }
214
        }
404
162
    }
215
    }
405
163
}
216
}
406
164
217
407
=== modified file 'qml/Greeter/Greeter.qml'
408
--- qml/Greeter/Greeter.qml	2015-01-23 19:47:37 +0000
409
+++ qml/Greeter/Greeter.qml	2015-02-23 15:44:00 +0000
410
@@ -1,5 +1,5 @@
411
1
/*
1
/*
413
2
 * Copyright (C) 2013 Canonical, Ltd.
2
 * Copyright (C) 2013,2014,2015 Canonical, Ltd.
414
3
 *
3
 *
415
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
416
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
417
@@ -14,66 +14,185 @@
418
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
419
15
 */
15
 */
420
16
16
424
17
import QtQuick 2.0
17
import QtQuick 2.3
425
18
import Ubuntu.Components 0.1
18
import AccountsService 0.1
423
19
import Ubuntu.Gestures 0.1
426
20
import LightDM 0.1 as LightDM
19
import LightDM 0.1 as LightDM
427
20
import Ubuntu.Components 1.1
428
21
import Ubuntu.SystemImage 0.1
429
22
import Unity.Connectivity 0.1
430
23
import Unity.Launcher 0.1
431
21
import "../Components"
24
import "../Components"
432
22
25
433
23
Showable {
26
Showable {
437
24
    id: greeter
27
    id: root
438
25
    enabled: shown
28
    created: loader.status == Loader.Ready
436
26
    created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
439
27
29
440
28
    property real dragHandleLeftMargin: 0
30
    property real dragHandleLeftMargin: 0
441
29
    property alias dragging: dragHandle.dragging
442
30
31
443
31
    property url background
32
    property url background
444
32
33
451
33
    // so that it can be replaced in tests with a mock object
34
    // How far to offset the top greeter layer during a launcher left-drag
452
34
    property var inputMethod: Qt.inputMethod
35
    property real launcherOffset
453
35
36
454
36
    prepareToHide: function () {
37
    readonly property bool active: shown || hasLockedApp
455
37
        hideTranslation.to = greeter.x > 0 || d.forceRightOnNextHideAnimation ? greeter.width : -greeter.width;
38
    readonly property bool fullyShown: loader.item ? loader.item.fullyShown : false
456
38
        d.forceRightOnNextHideAnimation = false;
39
457
40
    // True when the greeter is waiting for PAM or other setup process
458
41
    readonly property alias waiting: d.waiting
459
42
460
43
    property string lockedApp: ""
461
44
    readonly property bool hasLockedApp: lockedApp !== ""
462
45
463
46
    property bool forcedUnlock
464
47
    readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
465
48
466
49
    property bool tabletMode
467
50
    property url viewSource // only used for testing
468
51
469
52
    property int maxFailedLogins: -1 // disabled by default for now, will enable via settings in future
470
53
    property int failedLoginsDelayAttempts: 7 // number of failed logins
471
54
    property int failedLoginsDelayMinutes: 5 // minutes of forced waiting
472
55
473
56
    signal tease()
474
57
    signal sessionStarted()
475
58
    signal emergencyCall()
476
59
477
60
    function forceShow() {
478
61
        showNow();
479
62
        loader.item.reset();
480
63
    }
481
64
482
65
    function notifyAppFocused(appId) {
483
66
        if (!active) {
484
67
            return;
485
68
        }
486
69
487
70
        if (hasLockedApp) {
488
71
            if (appId === lockedApp) {
489
72
                hide(); // show locked app
490
73
            } else {
491
74
                show();
492
75
                d.startUnlock(false /* toTheRight */);
493
76
            }
494
77
        } else if (appId !== "unity8-dash") { // dash isn't started by user
495
78
            d.startUnlock(false /* toTheRight */);
496
79
        }
497
80
    }
498
81
499
82
    function notifyAboutToFocusApp(appId) {
500
83
        if (!active) {
501
84
            return;
502
85
        }
503
86
504
87
        // A hint that we're about to focus an app.  This way we can look
505
88
        // a little more responsive, rather than waiting for the above
506
89
        // notifyAppFocused call.  We also need this in case we have a locked
507
90
        // app, in order to show lockscreen instead of new app.
508
91
        d.startUnlock(false /* toTheRight */);
509
92
    }
510
93
511
94
    // This is a just a glorified notifyAboutToFocusApp(), but it does one
512
95
    // other thing: it hides any cover pages to the RIGHT, because the user
513
96
    // just came from a launcher drag starting on the left.
514
97
    // It also returns a boolean value, indicating whether there was a visual
515
98
    // change or not (the shell only wants to hide the launcher if there was
516
99
    // a change).
517
100
    function notifyShowingDashFromDrag() {
518
101
        if (!active) {
519
102
            return false;
520
103
        }
521
104
522
105
        return d.startUnlock(true /* toTheRight */);
523
39
    }
106
    }
524
40
107
525
41
    QtObject {
108
    QtObject {
526
42
        id: d
109
        id: d
561
43
        property bool forceRightOnNextHideAnimation: false
110
562
44
    }
111
        readonly property bool multiUser: LightDM.Users.count > 1
563
45
112
        property int currentIndex
564
46
    property bool loadContent: required
113
        property int delayMinutes
565
47
114
        property bool waiting
566
48
    // 1 when fully shown and 0 when fully hidden
115
567
49
    property real showProgress: visible ? MathUtils.clamp((width - Math.abs(x)) / width, 0, 1) : 0
116
        // We want 'launcherOffset' to animate down to zero.  But not to animate
568
50
117
        // while being dragged.  So ideally we change this only when the user
569
51
    property alias model: greeterContentLoader.model
118
        // lets go and launcherOffset drops to zero.  But we need to wait for
570
52
    property bool locked: true
119
        // the behavior to be enabled first.  So we cache the last known good
571
53
120
        // launcherOffset value to cover us during that brief gap between
572
54
    readonly property bool narrowMode: !multiUser && height > width
121
        // release and the behavior turning on.
573
55
    readonly property bool multiUser: LightDM.Users.count > 1
122
        property real lastKnownPositiveOffset // set in a launcherOffsetChanged below
574
56
123
        property real launcherOffsetProxy: (shown && !launcherOffsetProxyBehavior.enabled) ? lastKnownPositiveOffset : 0
575
57
    readonly property int currentIndex: greeterContentLoader.currentIndex
124
        Behavior on launcherOffsetProxy {
576
58
125
            id: launcherOffsetProxyBehavior
577
59
    signal selected(int uid)
126
            enabled: launcherOffset === 0
578
60
    signal unlocked(int uid)
127
            UbuntuNumberAnimation {}
579
61
    signal tapped()
128
        }
580
62
129
581
63
    function hideRight() {
130
        function selectUser(uid, reset) {
582
64
        d.forceRightOnNextHideAnimation = true;
131
            d.waiting = true;
583
65
        hide();
132
            if (reset) {
584
66
    }
133
                loader.item.reset();
585
67
134
            }
586
68
    function tryToUnlock() {
135
            currentIndex = uid;
587
69
        if (created) {
136
            var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
588
70
            greeterContentLoader.item.tryToUnlock()
137
            AccountsService.user = user;
589
71
        }
138
            LauncherModel.setUser(user);
590
72
    }
139
            LightDM.Greeter.authenticate(user); // always resets auth state
591
73
140
        }
592
74
    function reset() {
141
593
75
        if (created) {
142
        function login() {
594
76
            greeterContentLoader.item.reset()
143
            enabled = false;
595
144
            if (LightDM.Greeter.startSessionSync()) {
596
145
                sessionStarted();
597
146
                loader.item.notifyAuthenticationSucceeded();
598
147
            } else {
599
148
                loader.item.notifyAuthenticationFailed();
600
149
            }
601
150
            enabled = true;
602
151
        }
603
152
604
153
        function startUnlock(toTheRight) {
605
154
            if (loader.item) {
606
155
                return loader.item.tryToUnlock(toTheRight);
607
156
            } else {
608
157
                return false;
609
158
            }
610
159
        }
611
160
    }
612
161
613
162
    onLauncherOffsetChanged: {
614
163
        if (launcherOffset > 0) {
615
164
            d.lastKnownPositiveOffset = launcherOffset;
616
165
        }
617
166
    }
618
167
619
168
    onForcedUnlockChanged: {
620
169
        if (forcedUnlock && shown) {
621
170
            // pretend we were just authenticated
622
171
            loader.item.notifyAuthenticationSucceeded();
623
172
        }
624
173
    }
625
174
626
175
    onRequiredChanged: {
627
176
        if (required) {
628
177
            d.waiting = true;
629
178
            lockedApp = "";
630
179
        }
631
180
    }
632
181
633
182
    Component.onCompleted: {
634
183
        Connectivity.unlockAllModems();
635
184
    }
636
185
637
186
    Timer {
638
187
        id: forcedDelayTimer
639
188
        interval: 1000 * 60
640
189
        onTriggered: {
641
190
            if (d.delayMinutes > 0) {
642
191
                d.delayMinutes -= 1;
643
192
                if (d.delayMinutes > 0) {
644
193
                    start(); // go again
645
194
                }
646
195
            }
647
77
        }
196
        }
648
78
    }
197
    }
649
79
198
650
@@ -82,152 +201,205 @@
651
82
    MouseArea { anchors.fill: parent }
201
    MouseArea { anchors.fill: parent }
652
83
202
653
84
    Loader {
203
    Loader {
656
85
        id: greeterContentLoader
204
        id: loader
657
86
        objectName: "greeterContentLoader"
205
        objectName: "loader"
658
206
659
87
        anchors.fill: parent
207
        anchors.fill: parent
660
88
        property var model: LightDM.Users
661
89
        property int currentIndex: 0
662
90
        property var infographicModel: LightDM.Infographic
663
91
        readonly property int backgroundTopMargin: -greeter.y
664
92
208
666
93
        source: loadContent ? "GreeterContent.qml" : ""
209
        active: root.required
667
210
        source: root.viewSource.toString() ? root.viewSource :
668
211
                (d.multiUser || root.tabletMode) ? "WideView.qml" : "NarrowView.qml"
669
94
212
670
95
        onLoaded: {
213
        onLoaded: {
672
96
            selected(currentIndex);
214
            root.lockedApp = "";
673
215
            root.forceActiveFocus();
674
216
            d.selectUser(d.currentIndex, true);
675
217
            LightDM.Infographic.readyForDataChange();
676
97
        }
218
        }
677
98
219
678
99
        Connections {
220
        Connections {
681
100
            target: greeterContentLoader.item
221
            target: loader.item
680
101
682
102
            onSelected: {
222
            onSelected: {
774
103
                greeter.selected(uid);
223
                d.selectUser(index, true);
775
104
                greeterContentLoader.currentIndex = uid;
224
            }
776
105
            }
225
            onResponded: {
777
106
            onUnlocked: greeter.unlocked(uid);
226
                if (root.locked) {
778
107
        }
227
                    LightDM.Greeter.respond(response);
688
108
        Binding {
689
109
            target: greeterContentLoader.item
690
110
            property: "inputMethod"
691
111
            value: greeter.inputMethod
692
112
        }
693
113
    }
694
114
695
115
    DragHandle {
696
116
        id: dragHandle
697
117
        anchors.fill: parent
698
118
        anchors.leftMargin: greeter.dragHandleLeftMargin
699
119
        enabled: (greeter.narrowMode || !greeter.locked) && greeter.enabled && greeter.shown
700
120
        direction: Direction.Horizontal
701
121
702
122
        onTapped: {
703
123
            greeter.tapped();
704
124
            showLabelAnimation.start();
705
125
        }
706
126
707
127
        onDraggingChanged: {
708
128
            if (dragging) {
709
129
                showLabelAnimation.start();
710
130
            }
711
131
        }
712
132
    }
713
133
714
134
    Label {
715
135
        id: swipeHint
716
136
        property real baseOpacity: 0.5
717
137
        opacity: 0.0
718
138
        anchors.horizontalCenter: parent.horizontalCenter
719
139
        anchors.bottom: parent.bottom
720
140
        anchors.bottomMargin: units.gu(5)
721
141
        text: "《    " + i18n.tr("Unlock") + "    》"
722
142
        color: "white"
723
143
        font.weight: Font.Light
724
144
725
145
        SequentialAnimation on opacity {
726
146
            id: showLabelAnimation
727
147
            running: false
728
148
            loops: 2
729
149
730
150
            StandardAnimation {
731
151
                from: 0.0
732
152
                to: swipeHint.baseOpacity
733
153
                duration: UbuntuAnimation.SleepyDuration
734
154
            }
735
155
            PauseAnimation { duration: UbuntuAnimation.BriskDuration }
736
156
            StandardAnimation {
737
157
                from: swipeHint.baseOpacity
738
158
                to: 0.0
739
159
                duration: UbuntuAnimation.SleepyDuration
740
160
            }
741
161
        }
742
162
    }
743
163
744
164
    // right side shadow
745
165
    Image {
746
166
        anchors.left: parent.right
747
167
        anchors.top: parent.top
748
168
        anchors.bottom: parent.bottom
749
169
        fillMode: Image.Tile
750
170
        source: "../graphics/dropshadow_right.png"
751
171
    }
752
172
753
173
    // left side shadow
754
174
    Image {
755
175
        anchors.right: parent.left
756
176
        anchors.top: parent.top
757
177
        anchors.bottom: parent.bottom
758
178
        fillMode: Image.Tile
759
179
        source: "../graphics/dropshadow_left.png"
760
180
    }
761
181
762
182
    Binding {
763
183
        id: positionLock
764
184
765
185
        property bool enabled: false
766
186
        onEnabledChanged: {
767
187
            if (enabled === __enabled) {
768
188
                return;
769
189
            }
770
190
771
191
            if (enabled) {
772
192
                if (greeter.x > 0) {
773
193
                    value = Qt.binding(function() { return greeter.width; })
779
194
                } else {
228
                } else {
817
195
                    value = Qt.binding(function() { return -greeter.width; })
229
                    if (LightDM.Greeter.active && !LightDM.Greeter.authenticated) { // could happen if forcedUnlock
818
196
                }
230
                        d.login();
819
197
            }
231
                    }
820
198
232
                    loader.item.hide();
821
199
            __enabled = enabled;
233
                }
822
200
        }
234
            }
823
201
235
            onTease: root.tease()
824
202
        property bool __enabled: false
236
            onEmergencyCall: root.emergencyCall()
825
203
237
            onRequiredChanged: {
826
204
        target: greeter
238
                if (!loader.item.required) {
827
205
        when: __enabled
239
                    root.hide();
828
206
        property: "x"
240
                }
829
207
    }
241
            }
830
208
242
        }
831
209
    hideAnimation: SequentialAnimation {
243
832
210
        id: hideAnimation
244
        Binding {
833
211
        objectName: "hideAnimation"
245
            target: loader.item
834
212
        StandardAnimation {
246
            property: "backgroundTopMargin"
835
213
            id: hideTranslation
247
            value: -root.y
836
214
            property: "x"
248
        }
837
215
            target: greeter
249
838
216
        }
250
        Binding {
839
217
        PropertyAction { target: greeter; property: "visible"; value: false }
251
            target: loader.item
840
218
        PropertyAction { target: positionLock; property: "enabled"; value: true }
252
            property: "launcherOffset"
841
219
    }
253
            value: d.launcherOffsetProxy
842
220
254
        }
843
221
    showAnimation: SequentialAnimation {
255
844
222
        id: showAnimation
256
        Binding {
845
223
        objectName: "showAnimation"
257
            target: loader.item
846
224
        PropertyAction { target: greeter; property: "visible"; value: true }
258
            property: "dragHandleLeftMargin"
847
225
        PropertyAction { target: positionLock; property: "enabled"; value: false }
259
            value: root.dragHandleLeftMargin
848
226
        StandardAnimation {
260
        }
849
227
            property: "x"
261
850
228
            target: greeter
262
        Binding {
851
229
            to: 0
263
            target: loader.item
852
230
            duration: UbuntuAnimation.FastDuration
264
            property: "delayMinutes"
853
231
        }
265
            value: d.delayMinutes
854
266
        }
855
267
856
268
        Binding {
857
269
            target: loader.item
858
270
            property: "background"
859
271
            value: root.background
860
272
        }
861
273
862
274
        Binding {
863
275
            target: loader.item
864
276
            property: "locked"
865
277
            value: root.locked
866
278
        }
867
279
868
280
        Binding {
869
281
            target: loader.item
870
282
            property: "alphanumeric"
871
283
            value: AccountsService.passwordDisplayHint === AccountsService.Keyboard
872
284
        }
873
285
874
286
        Binding {
875
287
            target: loader.item
876
288
            property: "currentIndex"
877
289
            value: d.currentIndex
878
290
        }
879
291
880
292
        Binding {
881
293
            target: loader.item
882
294
            property: "userModel"
883
295
            value: LightDM.Users
884
296
        }
885
297
886
298
        Binding {
887
299
            target: loader.item
888
300
            property: "infographicModel"
889
301
            value: LightDM.Infographic
890
302
        }
891
303
    }
892
304
893
305
    Connections {
894
306
        target: LightDM.Greeter
895
307
896
308
        onShowGreeter: root.forceShow()
897
309
898
310
        onHideGreeter: {
899
311
            d.login();
900
312
            loader.item.hide();
901
313
        }
902
314
903
315
        onShowMessage: {
904
316
            if (!LightDM.Greeter.active) {
905
317
                return; // could happen if hideGreeter() comes in before we prompt
906
318
            }
907
319
908
320
            // inefficient, but we only rarely deal with messages
909
321
            var html = text.replace(/&/g, "&amp;")
910
322
                           .replace(/</g, "&lt;")
911
323
                           .replace(/>/g, "&gt;")
912
324
                           .replace(/\n/g, "<br>");
913
325
            if (isError) {
914
326
                html = "<font color=\"#df382c\">" + html + "</font>";
915
327
            }
916
328
917
329
            loader.item.showMessage(html);
918
330
        }
919
331
920
332
        onShowPrompt: {
921
333
            d.waiting = false;
922
334
923
335
            if (!LightDM.Greeter.active) {
924
336
                return; // could happen if hideGreeter() comes in before we prompt
925
337
            }
926
338
927
339
            loader.item.showPrompt(text, isSecret, isDefaultPrompt);
928
340
        }
929
341
930
342
        onAuthenticationComplete: {
931
343
            d.waiting = false;
932
344
933
345
            if (LightDM.Greeter.authenticated) {
934
346
                AccountsService.failedLogins = 0;
935
347
                d.login();
936
348
                if (!LightDM.Greeter.promptless) {
937
349
                    loader.item.hide();
938
350
                }
939
351
            } else {
940
352
                if (!LightDM.Greeter.promptless) {
941
353
                    AccountsService.failedLogins++;
942
354
                }
943
355
944
356
                // Check if we should initiate a factory reset
945
357
                if (maxFailedLogins >= 2) { // require at least a warning
946
358
                    if (AccountsService.failedLogins === maxFailedLogins - 1) {
947
359
                        loader.item.showLastChance();
948
360
                    } else if (AccountsService.failedLogins >= maxFailedLogins) {
949
361
                        SystemImage.factoryReset(); // Ouch!
950
362
                    }
951
363
                }
952
364
953
365
                // Check if we should initiate a forced login delay
954
366
                if (failedLoginsDelayAttempts > 0 && AccountsService.failedLogins % failedLoginsDelayAttempts == 0) {
955
367
                    d.delayMinutes = failedLoginsDelayMinutes;
956
368
                    forcedDelayTimer.start();
957
369
                }
958
370
959
371
                loader.item.notifyAuthenticationFailed();
960
372
                if (!LightDM.Greeter.promptless) {
961
373
                    d.selectUser(d.currentIndex, false);
962
374
                }
963
375
            }
964
376
        }
965
377
966
378
        onRequestAuthenticationUser: {
967
379
            // Find index for requested user, if it exists
968
380
            for (var i = 0; i < LightDM.Users.count; i++) {
969
381
                if (user === LightDM.Users.data(i, LightDM.UserRoles.NameRole)) {
970
382
                    d.selectUser(i, true);
971
383
                    return;
972
384
                }
973
385
            }
974
386
        }
975
387
    }
976
388
977
389
    Binding {
978
390
        target: LightDM.Greeter
979
391
        property: "active"
980
392
        value: root.active
981
393
    }
982
394
983
395
    Binding {
984
396
        target: LightDM.Infographic
985
397
        property: "username"
986
398
        value: AccountsService.statsWelcomeScreen ? LightDM.Users.data(d.currentIndex, LightDM.UserRoles.NameRole) : ""
987
399
    }
988
400
989
401
    Connections {
990
402
        target: i18n
991
403
        onLanguageChanged: LightDM.Infographic.readyForDataChange()
992
232
    }
404
    }
993
233
}
405
}
994
234
406
995
=== modified file 'qml/Greeter/Infographics.qml'
996
--- qml/Greeter/Infographics.qml	2015-01-09 10:41:28 +0000
997
+++ qml/Greeter/Infographics.qml	2015-02-23 15:44:00 +0000
998
@@ -38,6 +38,7 @@
999
38
38
1000
39
    Connections {
39
    Connections {
1001
40
        target: model
40
        target: model
1002
41
        ignoreUnknownSignals: model === undefined
1003
41
42
1004
42
        onDataAboutToAppear: startHideAnimation() // hide "no data" label
43
        onDataAboutToAppear: startHideAnimation() // hide "no data" label
1005
43
        onDataAppeared: startShowAnimation()
44
        onDataAppeared: startShowAnimation()
1006
44
45
1007
=== modified file 'qml/Greeter/LoginList.qml'
1008
--- qml/Greeter/LoginList.qml	2014-11-04 12:52:49 +0000
1009
+++ qml/Greeter/LoginList.qml	2015-02-23 15:44:00 +0000
1010
@@ -14,44 +14,76 @@
1011
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1012
15
 */
15
 */
1013
16
16
1017
17
import QtQuick 2.0
17
import QtQuick 2.3
1018
18
import Ubuntu.Components 0.1
18
import Ubuntu.Components 1.1
1016
19
import LightDM 0.1 as LightDM
1019
20
import "../Components"
19
import "../Components"
1020
21
20
1021
22
Item {
21
Item {
1022
23
    id: root
22
    id: root
1023
24
23
1024
25
    property alias userList: userList
1025
26
    property alias model: userList.model
24
    property alias model: userList.model
1027
27
    property alias currentIndex: userList.currentIndex
25
    property int currentIndex
1028
26
    property bool locked
1029
28
27
1030
29
    readonly property int numAboveBelow: 4
28
    readonly property int numAboveBelow: 4
1031
30
    readonly property int cellHeight: units.gu(5)
29
    readonly property int cellHeight: units.gu(5)
1032
31
    readonly property int highlightedHeight: units.gu(10)
30
    readonly property int highlightedHeight: units.gu(10)
1033
32
    readonly property int moveDuration: 200
31
    readonly property int moveDuration: 200
1034
32
    readonly property string currentUser: userList.currentItem.username
1035
33
    property bool wasPrompted: false
33
    property bool wasPrompted: false
1036
34
34
1039
35
    signal selected(int uid)
35
    signal selected(int index)
1040
36
    signal unlocked(int uid)
36
    signal responded(string response)
1041
37
37
1042
38
    function tryToUnlock() {
38
    function tryToUnlock() {
1046
39
        if (LightDM.Greeter.promptless) {
39
        if (wasPrompted) {
1047
40
            if (LightDM.Greeter.authenticated) {
40
            passwordInput.forceActiveFocus();
1048
41
                root.unlocked(userList.currentIndex)
41
        } else {
1049
42
            if (root.locked) {
1050
43
                root.selected(currentIndex);
1051
42
            } else {
44
            } else {
1053
43
                root.resetAuthentication()
45
                root.responded("");
1054
44
            }
46
            }
1055
47
        }
1056
48
    }
1057
49
1058
50
    function showMessage(html) {
1059
51
        if (infoLabel.text === "") {
1060
52
            infoLabel.text = html;
1061
45
        } else {
53
        } else {
1063
46
            passwordInput.forceActiveFocus()
54
            infoLabel.text += "<br>" + html;
1064
55
        }
1065
56
    }
1066
57
1067
58
    function showPrompt(text, isSecret, isDefaultPrompt) {
1068
59
        passwordInput.text = "";
1069
60
        passwordInput.promptText = text;
1070
61
        passwordInput.enabled = true;
1071
62
        passwordInput.echoMode = isSecret ? TextInput.Password : TextInput.Normal;
1072
63
        if (wasPrompted) // stay in text field if second prompt
1073
64
            passwordInput.focus = true;
1074
65
        wasPrompted = true;
1075
66
    }
1076
67
1077
68
    function showError() {
1078
69
        wrongPasswordAnimation.start();
1079
70
        root.resetAuthentication();
1080
71
        if (wasPrompted) {
1081
72
            passwordInput.focus = true;
1082
47
        }
73
        }
1083
48
    }
74
    }
1084
49
75
1085
50
    function reset() {
76
    function reset() {
1090
51
        root.resetAuthentication()
77
        root.resetAuthentication();
1091
52
    }
78
    }
1092
53
79
1093
54
    Keys.onEscapePressed: root.resetAuthentication()
80
    Keys.onEscapePressed: {
1094
81
        selected(currentIndex);
1095
82
    }
1096
83
1097
84
    onCurrentIndexChanged: {
1098
85
        userList.currentIndex = currentIndex;
1099
86
    }
1100
55
87
1101
56
    Rectangle {
88
    Rectangle {
1102
57
        id: highlightItem
89
        id: highlightItem
1103
@@ -81,26 +113,24 @@
1104
81
        flickDeceleration: 10000
113
        flickDeceleration: 10000
1105
82
114
1106
83
        readonly property bool movingInternally: moveTimer.running || userList.moving
115
        readonly property bool movingInternally: moveTimer.running || userList.moving
1107
84
1108
85
        onCurrentIndexChanged: {
1109
86
            if (LightDM.Greeter.authenticationUser != userList.model.data(currentIndex, LightDM.UserRoles.NameRole)) {
1110
87
                root.resetAuthentication();
1111
88
            }
1112
89
        }
1113
90
1114
91
        onMovingInternallyChanged: {
116
        onMovingInternallyChanged: {
1115
92
            // Only emit the selected signal once we stop moving to avoid frequent background changes
1116
93
            if (!movingInternally) {
117
            if (!movingInternally) {
1118
94
                root.selected(userList.currentIndex);
118
                root.selected(currentIndex);
1119
95
            }
119
            }
1120
96
        }
120
        }
1121
97
121
1122
122
        onCurrentIndexChanged: {
1123
123
            root.resetAuthentication();
1124
124
            moveTimer.start();
1125
125
        }
1126
126
1127
98
        delegate: Item {
127
        delegate: Item {
1128
99
            width: parent.width
128
            width: parent.width
1129
100
            height: root.cellHeight
129
            height: root.cellHeight
1130
101
130
1131
102
            readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) || (userList.currentIndex >= 0 && index > userList.currentIndex)
131
            readonly property bool belowHighlight: (userList.currentIndex < 0 && index > 0) || (userList.currentIndex >= 0 && index > userList.currentIndex)
1132
103
            readonly property int belowOffset: root.highlightedHeight - root.cellHeight
132
            readonly property int belowOffset: root.highlightedHeight - root.cellHeight
1133
133
            readonly property string username: name
1134
104
134
1135
105
            opacity: {
135
            opacity: {
1136
106
                // The goal here is to make names less and less opaque as they
136
                // The goal here is to make names less and less opaque as they
1137
@@ -148,11 +178,8 @@
1138
148
                    topMargin: parent.belowHighlight ? parent.belowOffset : 0
178
                    topMargin: parent.belowHighlight ? parent.belowOffset : 0
1139
149
                }
179
                }
1140
150
                height: parent.height
180
                height: parent.height
1146
151
                enabled: userList.currentIndex !== index
181
                enabled: userList.currentIndex !== index && parent.opacity > 0
1147
152
                onClicked: {
182
                onClicked: root.selected(index)
1143
153
                    moveTimer.start();
1144
154
                    userList.currentIndex = index;
1145
155
                }
1148
156
183
1149
157
                Behavior on anchors.topMargin { NumberAnimation { duration: root.moveDuration; easing.type: Easing.InOutQuad; } }
184
                Behavior on anchors.topMargin { NumberAnimation { duration: root.moveDuration; easing.type: Easing.InOutQuad; } }
1150
158
            }
185
            }
1151
@@ -204,6 +231,11 @@
1152
204
        width: parent.width - anchors.margins * 2
231
        width: parent.width - anchors.margins * 2
1153
205
        opacity: userList.movingInternally ? 0 : 1
232
        opacity: userList.movingInternally ? 0 : 1
1154
206
233
1155
234
        property string promptText
1156
235
        placeholderText: root.wasPrompted ? promptText
1157
236
                                          : (root.locked ? i18n.tr("Retry")
1158
237
                                                         : i18n.tr("Tap to unlock"))
1159
238
1160
207
        Behavior on opacity {
239
        Behavior on opacity {
1161
208
            NumberAnimation { duration: 100 }
240
            NumberAnimation { duration: 100 }
1162
209
        }
241
        }
1163
@@ -213,9 +245,11 @@
1164
213
                return;
245
                return;
1165
214
            root.focus = true; // so that it can handle Escape presses for us
246
            root.focus = true; // so that it can handle Escape presses for us
1166
215
            enabled = false;
247
            enabled = false;
1170
216
            LightDM.Greeter.respond(text);
248
            root.responded(text);
1171
217
        }
249
        }
1172
218
        Keys.onEscapePressed: root.resetAuthentication()
250
        Keys.onEscapePressed: {
1173
251
            root.selected(currentIndex);
1174
252
        }
1175
219
253
1176
220
        Image {
254
        Image {
1177
221
            anchors {
255
            anchors {
1178
@@ -223,7 +257,7 @@
1179
223
                rightMargin: units.gu(2)
257
                rightMargin: units.gu(2)
1180
224
                verticalCenter: parent.verticalCenter
258
                verticalCenter: parent.verticalCenter
1181
225
            }
259
            }
1183
226
            visible: LightDM.Greeter.promptless
260
            visible: !root.wasPrompted
1184
227
            source: "graphics/icon_arrow.png"
261
            source: "graphics/icon_arrow.png"
1185
228
        }
262
        }
1186
229
263
1187
@@ -247,7 +281,7 @@
1188
247
        id: passwordMouseArea
281
        id: passwordMouseArea
1189
248
        objectName: "passwordMouseArea"
282
        objectName: "passwordMouseArea"
1190
249
        anchors.fill: passwordInput
283
        anchors.fill: passwordInput
1192
250
        enabled: LightDM.Greeter.promptless
284
        enabled: !root.wasPrompted
1193
251
        onClicked: root.tryToUnlock()
285
        onClicked: root.tryToUnlock()
1194
252
    }
286
    }
1195
253
287
1196
@@ -256,62 +290,10 @@
1197
256
            return;
290
            return;
1198
257
        }
291
        }
1199
258
        infoLabel.text = "";
292
        infoLabel.text = "";
1201
259
        passwordInput.placeholderText = "";
293
        passwordInput.promptText = "";
1202
260
        passwordInput.text = "";
294
        passwordInput.text = "";
1203
261
        passwordInput.focus = false;
295
        passwordInput.focus = false;
1204
262
        passwordInput.enabled = true;
296
        passwordInput.enabled = true;
1205
263
        root.wasPrompted = false;
297
        root.wasPrompted = false;
1206
264
        LightDM.Greeter.authenticate(userList.model.data(currentIndex, LightDM.UserRoles.NameRole));
1207
265
    }
1208
266
1209
267
    Connections {
1210
268
        target: LightDM.Greeter
1211
269
1212
270
        onShowMessage: {
1213
271
            // inefficient, but we only rarely deal with messages
1214
272
            var html = text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br>")
1215
273
            if (isError)
1216
274
                html = "<font color=\"#df382c\">" + html + "</font>"
1217
275
            if (infoLabel.text == "")
1218
276
                infoLabel.text = html
1219
277
            else
1220
278
                infoLabel.text = infoLabel.text + "<br>" + html
1221
279
        }
1222
280
1223
281
        onShowPrompt: {
1224
282
            passwordInput.text = "";
1225
283
            passwordInput.placeholderText = text;
1226
284
            passwordInput.enabled = true;
1227
285
            passwordInput.echoMode = isSecret ? TextInput.Password : TextInput.Normal;
1228
286
            if (root.wasPrompted) // stay in text field if second prompt
1229
287
                passwordInput.focus = true;
1230
288
            root.wasPrompted = true;
1231
289
        }
1232
290
1233
291
        onAuthenticationComplete: {
1234
292
            if (LightDM.Greeter.promptless) {
1235
293
                passwordInput.placeholderText = LightDM.Greeter.authenticated ? "Tap to unlock" : "Retry";
1236
294
                return;
1237
295
            }
1238
296
            if (LightDM.Greeter.authenticated) {
1239
297
                root.unlocked(userList.currentIndex);
1240
298
            } else {
1241
299
                wrongPasswordAnimation.start();
1242
300
                root.resetAuthentication();
1243
301
                passwordInput.focus = true;
1244
302
            }
1245
303
            passwordInput.text = "";
1246
304
        }
1247
305
1248
306
        onRequestAuthenticationUser: {
1249
307
            // Find index for requested user, if it exists
1250
308
            for (var i = 0; i < userList.model.count; i++) {
1251
309
                if (user == userList.model.data(i, LightDM.UserRoles.NameRole)) {
1252
310
                    moveTimer.start();
1253
311
                    userList.currentIndex = i;
1254
312
                    return;
1255
313
                }
1256
314
            }
1257
315
        }
1258
316
    }
298
    }
1259
317
}
299
}
1260
318
300
1261
=== added file 'qml/Greeter/NarrowView.qml'
1262
--- qml/Greeter/NarrowView.qml	1970-01-01 00:00:00 +0000
1263
+++ qml/Greeter/NarrowView.qml	2015-02-23 15:44:00 +0000
1264
@@ -0,0 +1,170 @@
1265
1
/*
1266
2
 * Copyright (C) 2015 Canonical, Ltd.
1267
3
 *
1268
4
 * This program is free software; you can redistribute it and/or modify
1269
5
 * it under the terms of the GNU General Public License as published by
1270
6
 * the Free Software Foundation; version 3.
1271
7
 *
1272
8
 * This program is distributed in the hope that it will be useful,
1273
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1274
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1275
11
 * GNU General Public License for more details.
1276
12
 *
1277
13
 * You should have received a copy of the GNU General Public License
1278
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1279
15
 */
1280
16
1281
17
import QtQuick 2.3
1282
18
import Ubuntu.Components 1.1
1283
19
import "../Components"
1284
20
1285
21
FocusScope {
1286
22
    id: root
1287
23
1288
24
    property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
1289
25
    property alias launcherOffset: coverPage.launcherOffset
1290
26
    property int currentIndex // unused
1291
27
    property alias delayMinutes: lockscreen.delayMinutes
1292
28
    property alias backgroundTopMargin: coverPage.backgroundTopMargin
1293
29
    property url background
1294
30
    property bool locked
1295
31
    property bool alphanumeric
1296
32
    property var userModel // unused
1297
33
    property alias infographicModel: coverPage.infographicModel
1298
34
    readonly property bool fullyShown: coverPage.showProgress === 1 || lockscreen.shown
1299
35
    readonly property bool required: coverPage.required || lockscreen.required
1300
36
1301
37
    signal selected(int index) // unused
1302
38
    signal responded(string response)
1303
39
    signal tease()
1304
40
    signal emergencyCall()
1305
41
1306
42
    function showMessage(html) {
1307
43
        // TODO
1308
44
    }
1309
45
1310
46
    function showPrompt(text, isSecret, isDefaultPrompt) {
1311
47
        lockscreen.promptText = isDefaultPrompt ? "" : text.toLowerCase();
1312
48
        lockscreen.maybeShow();
1313
49
    }
1314
50
1315
51
    function showLastChance() {
1316
52
        var title = lockscreen.alphaNumeric ?
1317
53
                    i18n.tr("Sorry, incorrect passphrase.") :
1318
54
                    i18n.tr("Sorry, incorrect passcode.");
1319
55
        var text = i18n.tr("This will be your last attempt.") + " " +
1320
56
                   (lockscreen.alphaNumeric ?
1321
57
                    i18n.tr("If passphrase is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted.") :
1322
58
                    i18n.tr("If passcode is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted."));
1323
59
        lockscreen.showInfoPopup(title, text);
1324
60
    }
1325
61
1326
62
    function hide() {
1327
63
        lockscreen.hide();
1328
64
        coverPage.hide();
1329
65
    }
1330
66
1331
67
    function notifyAuthenticationSucceeded() {
1332
68
        lockscreen.hide();
1333
69
    }
1334
70
1335
71
    function notifyAuthenticationFailed() {
1336
72
        lockscreen.clear(true);
1337
73
    }
1338
74
1339
75
    function reset() {
1340
76
        coverPage.show();
1341
77
    }
1342
78
1343
79
    function tryToUnlock(toTheRight) {
1344
80
        var coverChanged = coverPage.shown;
1345
81
        lockscreen.maybeShow();
1346
82
        if (toTheRight) {
1347
83
            coverPage.hideRight();
1348
84
        } else {
1349
85
            coverPage.hide();
1350
86
        }
1351
87
        return coverChanged;
1352
88
    }
1353
89
1354
90
    onLockedChanged: {
1355
91
        if (locked) {
1356
92
            lockscreen.maybeShow();
1357
93
        } else {
1358
94
            lockscreen.hide();
1359
95
        }
1360
96
    }
1361
97
1362
98
    Lockscreen {
1363
99
        id: lockscreen
1364
100
        objectName: "lockscreen"
1365
101
1366
102
        shown: false
1367
103
        showAnimation: StandardAnimation { property: "opacity"; to: 1 }
1368
104
        hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
1369
105
        anchors.fill: parent
1370
106
        visible: required
1371
107
        enabled: !coverPage.shown
1372
108
        background: root.background
1373
109
        darkenBackground: 0.4
1374
110
        alphaNumeric: root.alphanumeric
1375
111
        minPinLength: 4
1376
112
        maxPinLength: 4
1377
113
1378
114
        property string promptText
1379
115
        infoText: promptText !== "" ? i18n.tr("Enter %1").arg(promptText) :
1380
116
                  alphaNumeric ? i18n.tr("Enter passphrase") :
1381
117
                                 i18n.tr("Enter passcode")
1382
118
        errorText: promptText !== "" ? i18n.tr("Sorry, incorrect %1").arg(promptText) :
1383
119
                   alphaNumeric ? i18n.tr("Sorry, incorrect passphrase") + "\n" +
1384
120
                                  i18n.tr("Please re-enter") :
1385
121
                                  i18n.tr("Sorry, incorrect passcode")
1386
122
1387
123
        onEntered: root.responded(passphrase)
1388
124
        onCancel: coverPage.show()
1389
125
        onEmergencyCall: root.emergencyCall()
1390
126
1391
127
        function maybeShow() {
1392
128
            if (root.locked && !shown) {
1393
129
                showNow();
1394
130
            }
1395
131
        }
1396
132
    }
1397
133
1398
134
    Rectangle {
1399
135
        anchors.fill: parent
1400
136
        color: "black"
1401
137
        opacity: coverPage.showProgress * 0.8
1402
138
    }
1403
139
1404
140
    CoverPage {
1405
141
        id: coverPage
1406
142
        objectName: "coverPage"
1407
143
        height: parent.height
1408
144
        width: parent.width
1409
145
        background: root.background
1410
146
        onTease: root.tease()
1411
147
1412
148
        onShowProgressChanged: {
1413
149
            if (showProgress === 1) {
1414
150
                lockscreen.reset();
1415
151
            }
1416
152
1417
153
            if (showProgress === 0) {
1418
154
                if (root.locked) {
1419
155
                    lockscreen.clear(false); // to reset focus if necessary
1420
156
                } else {
1421
157
                    root.responded("");
1422
158
                }
1423
159
            }
1424
160
        }
1425
161
1426
162
        Clock {
1427
163
            anchors {
1428
164
                top: parent.top
1429
165
                topMargin: units.gu(2)
1430
166
                horizontalCenter: parent.horizontalCenter
1431
167
            }
1432
168
        }
1433
169
    }
1434
170
}
1435
0
171
1436
=== added file 'qml/Greeter/WideView.qml'
1437
--- qml/Greeter/WideView.qml	1970-01-01 00:00:00 +0000
1438
+++ qml/Greeter/WideView.qml	2015-02-23 15:44:00 +0000
1439
@@ -0,0 +1,134 @@
1440
1
/*
1441
2
 * Copyright (C) 2015 Canonical, Ltd.
1442
3
 *
1443
4
 * This program is free software; you can redistribute it and/or modify
1444
5
 * it under the terms of the GNU General Public License as published by
1445
6
 * the Free Software Foundation; version 3.
1446
7
 *
1447
8
 * This program is distributed in the hope that it will be useful,
1448
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1449
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1450
11
 * GNU General Public License for more details.
1451
12
 *
1452
13
 * You should have received a copy of the GNU General Public License
1453
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
1454
15
 */
1455
16
1456
17
import QtQuick 2.3
1457
18
import Ubuntu.Components 1.1
1458
19
1459
20
FocusScope {
1460
21
    id: root
1461
22
1462
23
    property alias dragHandleLeftMargin: coverPage.dragHandleLeftMargin
1463
24
    property alias launcherOffset: coverPage.launcherOffset
1464
25
    property alias currentIndex: loginList.currentIndex
1465
26
    property int delayMinutes // TODO
1466
27
    property alias backgroundTopMargin: coverPage.backgroundTopMargin
1467
28
    property alias background: coverPage.background
1468
29
    property bool locked
1469
30
    property bool alphanumeric // unused
1470
31
    property alias userModel: loginList.model
1471
32
    property alias infographicModel: coverPage.infographicModel
1472
33
    readonly property bool fullyShown: coverPage.showProgress === 1
1473
34
    readonly property bool required: coverPage.required
1474
35
1475
36
    // so that it can be replaced in tests with a mock object
1476
37
    property var inputMethod: Qt.inputMethod
1477
38
1478
39
    signal selected(int index)
1479
40
    signal responded(string response)
1480
41
    signal tease()
1481
42
    signal emergencyCall() // unused
1482
43
1483
44
    function showMessage(html) {
1484
45
        loginList.showMessage(html);
1485
46
    }
1486
47
1487
48
    function showPrompt(text, isSecret, isDefaultPrompt) {
1488
49
        loginList.showPrompt(text, isSecret, isDefaultPrompt);
1489
50
    }
1490
51
1491
52
    function showLastChance() {
1492
53
        // TODO
1493
54
    }
1494
55
1495
56
    function hide() {
1496
57
        coverPage.hide();
1497
58
    }
1498
59
1499
60
    function notifyAuthenticationSucceeded() {
1500
61
        // Nothing needed
1501
62
    }
1502
63
1503
64
    function notifyAuthenticationFailed() {
1504
65
        loginList.showError();
1505
66
    }
1506
67
1507
68
    function reset() {
1508
69
        loginList.reset();
1509
70
    }
1510
71
1511
72
    function tryToUnlock(toTheRight) {
1512
73
        if (root.locked) {
1513
74
            coverPage.show();
1514
75
            loginList.tryToUnlock();
1515
76
            return false;
1516
77
        } else {
1517
78
            var coverChanged = coverPage.shown;
1518
79
            if (toTheRight) {
1519
80
                coverPage.hideRight();
1520
81
            } else {
1521
82
                coverPage.hide();
1522
83
            }
1523
84
            return coverChanged;
1524
85
        }
1525
86
    }
1526
87
1527
88
    Rectangle {
1528
89
        anchors.fill: parent
1529
90
        color: "black"
1530
91
        opacity: coverPage.showProgress * 0.8
1531
92
    }
1532
93
1533
94
    CoverPage {
1534
95
        id: coverPage
1535
96
        objectName: "coverPage"
1536
97
        height: parent.height
1537
98
        width: parent.width
1538
99
        draggable: !root.locked
1539
100
1540
101
        infographics {
1541
102
            height: 0.75 * parent.height
1542
103
            anchors.leftMargin: loginList.x + loginList.width
1543
104
        }
1544
105
1545
106
        onTease: root.tease()
1546
107
1547
108
        onShowProgressChanged: {
1548
109
            if (showProgress === 0 && !root.locked) {
1549
110
                root.responded("");
1550
111
            }
1551
112
        }
1552
113
1553
114
        LoginList {
1554
115
            id: loginList
1555
116
            objectName: "loginList"
1556
117
1557
118
            anchors {
1558
119
                left: parent.left
1559
120
                leftMargin: Math.min(parent.width * 0.16, units.gu(20))
1560
121
                top: parent.top
1561
122
            }
1562
123
            width: units.gu(29)
1563
124
            height: inputMethod && inputMethod.visible ? parent.height - inputMethod.keyboardRectangle.height
1564
125
                                                       : parent.height
1565
126
            Behavior on height { UbuntuNumberAnimation {} }
1566
127
1567
128
            locked: root.locked
1568
129
1569
130
            onSelected: root.selected(index)
1570
131
            onResponded: root.responded(response)
1571
132
        }
1572
133
    }
1573
134
}
1574
0
135
1575
=== modified file 'qml/Shell.qml'
1576
--- qml/Shell.qml	2015-02-11 17:12:49 +0000
1577
+++ qml/Shell.qml	2015-02-23 15:44:00 +0000
1578
@@ -22,9 +22,7 @@
1579
22
import Ubuntu.Components 0.1
22
import Ubuntu.Components 0.1
1580
23
import Ubuntu.Components.Popups 1.0
23
import Ubuntu.Components.Popups 1.0
1581
24
import Ubuntu.Gestures 0.1
24
import Ubuntu.Gestures 0.1
1582
25
import Ubuntu.SystemImage 0.1
1583
26
import Ubuntu.Telephony 0.1 as Telephony
25
import Ubuntu.Telephony 0.1 as Telephony
1584
27
import Unity.Connectivity 0.1
1585
28
import Unity.Launcher 0.1
26
import Unity.Launcher 0.1
1586
29
import Utils 0.1
27
import Utils 0.1
1587
30
import LightDM 0.1 as LightDM
28
import LightDM 0.1 as LightDM
1588
@@ -46,9 +44,9 @@
1589
46
Item {
44
Item {
1590
47
    id: shell
45
    id: shell
1591
48
46
1595
49
    // Disable everything so that user can't swipe greeter or launcher until
47
    // Disable everything while greeter is waiting, so that the user can't swipe
1596
50
    // we get first prompt/authenticate, which will re-enable the shell.
48
    // the greeter or launcher until we know whether the session is locked.
1597
51
    enabled: false
49
    enabled: !greeter.waiting
1598
52
50
1599
53
    // this is only here to select the width / height of the window if not running fullscreen
51
    // this is only here to select the width / height of the window if not running fullscreen
1600
54
    property bool tablet: false
52
    property bool tablet: false
1601
@@ -61,18 +59,9 @@
1602
61
                             : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground
59
                             : gsImageTester.status == Image.Ready ? gsImageTester.source : defaultBackground
1603
62
    readonly property real panelHeight: panel.panelHeight
60
    readonly property real panelHeight: panel.panelHeight
1604
63
61
1605
64
    readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated && !forcedUnlock
1606
65
    readonly property alias hasLockedApp: greeter.hasLockedApp
1607
66
    readonly property bool forcedUnlock: tutorial.running
1608
67
    onForcedUnlockChanged: if (forcedUnlock) lockscreen.hide()
1609
68
1610
69
    property bool sideStageEnabled: shell.width >= units.gu(100)
62
    property bool sideStageEnabled: shell.width >= units.gu(100)
1611
70
    readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
63
    readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
1612
71
64
1613
72
    property int maxFailedLogins: -1 // disabled by default for now, will enable via settings in future
1614
73
    property int failedLoginsDelayAttempts: 7 // number of failed logins
1615
74
    property int failedLoginsDelayMinutes: 5 // minutes of forced waiting
1616
75
1617
76
    property int orientation
65
    property int orientation
1618
77
    readonly property int deviceOrientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
66
    readonly property int deviceOrientationAngle: Screen.angleBetween(Screen.primaryOrientation, Screen.orientation)
1619
78
    onDeviceOrientationAngleChanged: {
67
    onDeviceOrientationAngleChanged: {
1620
@@ -99,7 +88,7 @@
1621
99
    }
88
    }
1622
100
89
1623
101
    function startLockedApp(app) {
90
    function startLockedApp(app) {
1625
102
        if (shell.locked) {
91
        if (greeter.locked) {
1626
103
            greeter.lockedApp = app;
92
            greeter.lockedApp = app;
1627
104
        }
93
        }
1628
105
        shell.activateApplication(app);
94
        shell.activateApplication(app);
1629
@@ -117,6 +106,7 @@
1630
117
106
1631
118
    GSettings {
107
    GSettings {
1632
119
        id: backgroundSettings
108
        id: backgroundSettings
1633
109
        objectName: "backgroundSettings"
1634
120
        schema.id: "org.gnome.desktop.background"
110
        schema.id: "org.gnome.desktop.background"
1635
121
    }
111
    }
1636
122
112
1637
@@ -222,53 +212,32 @@
1638
222
212
1639
223
        Connections {
213
        Connections {
1640
224
            target: ApplicationManager
214
            target: ApplicationManager
1641
225
            onFocusRequested: {
1642
226
                if (greeter.narrowMode) {
1643
227
                    if (appId === "dialer-app" && callManager.hasCalls && shell.locked) {
1644
228
                        // If we are in the middle of a call, make dialer lockedApp and show it.
1645
229
                        // This can happen if user backs out of dialer back to greeter, then
1646
230
                        // launches dialer again.
1647
231
                        greeter.lockedApp = appId;
1648
232
                    }
1649
233
                    if (greeter.hasLockedApp) {
1650
234
                        if (appId === greeter.lockedApp) {
1651
235
                            lockscreen.hide() // show locked app
1652
236
                        } else {
1653
237
                            greeter.startUnlock() // show lockscreen if necessary
1654
238
                        }
1655
239
                    }
1656
240
                    greeter.hide();
1657
241
                } else {
1658
242
                    if (LightDM.Greeter.active) {
1659
243
                        greeter.startUnlock()
1660
244
                    }
1661
245
                }
1662
246
            }
1663
247
215
1664
216
            // This signal is also fired when we try to focus the current app
1665
217
            // again.  We rely on this!
1666
248
            onFocusedApplicationIdChanged: {
218
            onFocusedApplicationIdChanged: {
1679
249
                if (greeter.hasLockedApp && greeter.lockedApp !== ApplicationManager.focusedApplicationId) {
219
                var appId = ApplicationManager.focusedApplicationId;
1680
250
                    greeter.startUnlock()
220
1681
251
                }
221
                if (tutorial.running && appId != "unity8-dash") {
1670
252
                panel.indicators.hide();
1671
253
            }
1672
254
1673
255
            onApplicationAdded: {
1674
256
                if (appId != "unity8-dash") {
1675
257
                    if (greeter.shown) {
1676
258
                        greeter.startUnlock();
1677
259
                    }
1678
260
1682
261
                    // If this happens on first boot, we may be in edge
222
                    // If this happens on first boot, we may be in edge
1683
262
                    // tutorial or wizard while receiving a call.  But a call
223
                    // tutorial or wizard while receiving a call.  But a call
1684
263
                    // is more important than wizard so just bail out of those.
224
                    // is more important than wizard so just bail out of those.
1693
264
                    if (tutorial.running) {
225
                    tutorial.finish();
1694
265
                        tutorial.finish();
226
                    wizard.hide();
1695
266
                        wizard.hide();
227
                }
1696
267
                    }
228
1697
268
                }
229
                if (appId === "dialer-app" && callManager.hasCalls && greeter.locked) {
1698
269
                if (greeter.narrowMode && greeter.hasLockedApp && appId === greeter.lockedApp) {
230
                    // If we are in the middle of a call, make dialer lockedApp and show it.
1699
270
                    lockscreen.hide() // show locked app
231
                    // This can happen if user backs out of dialer back to greeter, then
1700
271
                }
232
                    // launches dialer again.
1701
233
                    greeter.lockedApp = appId;
1702
234
                }
1703
235
                greeter.notifyAppFocused(appId);
1704
236
1705
237
                panel.indicators.hide();
1706
238
            }
1707
239
1708
240
            onApplicationAdded: {
1709
272
                launcher.hide();
241
                launcher.hide();
1710
273
            }
242
            }
1711
274
        }
243
        }
1712
@@ -292,7 +261,6 @@
1713
292
261
1714
293
            property bool interactive: tutorial.spreadEnabled
262
            property bool interactive: tutorial.spreadEnabled
1715
294
                    && !greeter.shown
263
                    && !greeter.shown
1716
295
                    && !lockscreen.shown
1717
296
                    && panel.indicators.fullyClosed
264
                    && panel.indicators.fullyClosed
1718
297
                    && launcher.progress == 0
265
                    && launcher.progress == 0
1719
298
                    && !notifications.useModal
266
                    && !notifications.useModal
1720
@@ -328,7 +296,7 @@
1721
328
            Binding {
296
            Binding {
1722
329
                target: applicationsDisplayLoader.item
297
                target: applicationsDisplayLoader.item
1723
330
                property: "inverseProgress"
298
                property: "inverseProgress"
1725
331
                value: launcher.progress
299
                value: greeter.locked ? 0 : launcher.progress
1726
332
            }
300
            }
1727
333
            Binding {
301
            Binding {
1728
334
                target: applicationsDisplayLoader.item
302
                target: applicationsDisplayLoader.item
1729
@@ -379,299 +347,50 @@
1730
379
        }
347
        }
1731
380
    }
348
    }
1732
381
349
1736
382
    Lockscreen {
350
    Greeter {
1737
383
        id: lockscreen
351
        id: greeter
1738
384
        objectName: "lockscreen"
352
        objectName: "greeter"
1739
385
353
1740
386
        hides: [launcher, panel.indicators]
354
        hides: [launcher, panel.indicators]
1749
387
        shown: false
355
        tabletMode: shell.sideStageEnabled
1750
388
        enabled: true
356
        launcherOffset: launcher.progress
1751
389
        showAnimation: StandardAnimation { property: "opacity"; to: 1 }
357
        forcedUnlock: tutorial.running
1744
390
        hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
1745
391
        y: panel.panelHeight
1746
392
        visible: required
1747
393
        width: parent.width
1748
394
        height: parent.height - panel.panelHeight
1752
395
        background: shell.background
358
        background: shell.background
1778
396
        darkenBackground: 0.4
359
1779
397
        alphaNumeric: AccountsService.passwordDisplayHint === AccountsService.Keyboard
360
        anchors.fill: parent
1780
398
        minPinLength: 4
361
        anchors.topMargin: panel.panelHeight
1781
399
        maxPinLength: 4
362
1782
400
363
        // avoid overlapping with Launcher's edge drag area
1783
401
        property string promptText
364
        // FIXME: Fix TouchRegistry & friends and remove this workaround
1784
402
        infoText: promptText !== "" ? i18n.tr("Enter %1").arg(promptText) :
365
        //        Issue involves launcher's DDA getting disabled on a long
1785
403
                  alphaNumeric ? i18n.tr("Enter passphrase") :
366
        //        left-edge drag
1786
404
                                 i18n.tr("Enter passcode")
367
        dragHandleLeftMargin: launcher.available ? launcher.dragAreaWidth + 1 : 0
1787
405
        errorText: promptText !== "" ? i18n.tr("Sorry, incorrect %1").arg(promptText) :
368
1788
406
                   alphaNumeric ? i18n.tr("Sorry, incorrect passphrase") + "\n" +
369
        onSessionStarted: {
1789
407
                                  i18n.tr("Please re-enter") :
370
            launcher.hide();
1790
408
                                  i18n.tr("Sorry, incorrect passcode")
371
        }
1791
409
372
1792
410
        // FIXME: We *should* show emergency dialer if there is a SIM present,
373
        onTease: {
1793
411
        // regardless of whether the side stage is enabled.  But right now,
374
            if (!tutorial.running) {
1794
412
        // the assumption is that narrow screens are phones which have SIMs
375
                launcher.tease();
1795
413
        // and wider screens are tablets which don't.  When we do allow this
376
            }
1796
414
        // on devices with a side stage and a SIM, work should be done to
377
        }
1797
415
        // ensure that the main stage is disabled while the dialer is present
378
1773
416
        // in the side stage.  See the FIXME in the stage loader in this file.
1774
417
        showEmergencyCallButton: !shell.sideStageEnabled
1775
418
1776
419
        onEntered: LightDM.Greeter.respond(passphrase);
1777
420
        onCancel: greeter.show()
1798
421
        onEmergencyCall: startLockedApp("dialer-app")
379
        onEmergencyCall: startLockedApp("dialer-app")
1799
422
380
1800
423
        onShownChanged: if (shown) greeter.lockedApp = ""
1801
424
1802
425
        function maybeShow() {
1803
426
            if (!shell.forcedUnlock && !shown) {
1804
427
                showNow();
1805
428
            }
1806
429
        }
1807
430
1808
431
        Timer {
381
        Timer {
1811
432
            id: forcedDelayTimer
382
            // See powerConnection for why this is useful
1812
433
            interval: 1000 * 60
383
            id: showGreeterDelayed
1813
384
            interval: 1
1814
434
            onTriggered: {
385
            onTriggered: {
2055
435
                if (lockscreen.delayMinutes > 0) {
386
                greeter.forceShow();
2056
436
                    lockscreen.delayMinutes -= 1
387
            }
2057
437
                    if (lockscreen.delayMinutes > 0) {
388
        }
2058
438
                        start() // go again
389
2059
439
                    }
390
        Binding {
2060
440
                }
391
            target: ApplicationManager
2061
441
            }
392
            property: "suspended"
2062
442
        }
393
            value: greeter.shown
1823
443
1824
444
        Component.onCompleted: {
1825
445
            if (greeter.narrowMode) {
1826
446
                LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
1827
447
            }
1828
448
        }
1829
449
    }
1830
450
1831
451
    Connections {
1832
452
        target: LightDM.Greeter
1833
453
1834
454
        onShowGreeter: greeter.show()
1835
455
        onHideGreeter: greeter.login()
1836
456
1837
457
        onShowPrompt: {
1838
458
            shell.enabled = true;
1839
459
            if (!LightDM.Greeter.active) {
1840
460
                return; // could happen if hideGreeter() comes in before we prompt
1841
461
            }
1842
462
            if (greeter.narrowMode) {
1843
463
                lockscreen.promptText = isDefaultPrompt ? "" : text.toLowerCase();
1844
464
                lockscreen.maybeShow();
1845
465
            }
1846
466
        }
1847
467
1848
468
        onPromptlessChanged: {
1849
469
            if (!LightDM.Greeter.active) {
1850
470
                return; // could happen if hideGreeter() comes in before we prompt
1851
471
            }
1852
472
            if (greeter.narrowMode) {
1853
473
                if (LightDM.Greeter.promptless && LightDM.Greeter.authenticated) {
1854
474
                    lockscreen.hide()
1855
475
                } else {
1856
476
                    lockscreen.reset();
1857
477
                    lockscreen.maybeShow();
1858
478
                }
1859
479
            }
1860
480
        }
1861
481
1862
482
        onAuthenticationComplete: {
1863
483
            shell.enabled = true;
1864
484
            if (LightDM.Greeter.authenticated) {
1865
485
                AccountsService.failedLogins = 0
1866
486
            }
1867
487
            // Else only penalize user for a failed login if they actually were
1868
488
            // prompted for a password.  We do this below after the promptless
1869
489
            // early exit.
1870
490
1871
491
            if (LightDM.Greeter.promptless) {
1872
492
                return;
1873
493
            }
1874
494
1875
495
            if (LightDM.Greeter.authenticated) {
1876
496
                greeter.login();
1877
497
            } else {
1878
498
                AccountsService.failedLogins++
1879
499
                if (maxFailedLogins >= 2) { // require at least a warning
1880
500
                    if (AccountsService.failedLogins === maxFailedLogins - 1) {
1881
501
                        var title = lockscreen.alphaNumeric ?
1882
502
                                    i18n.tr("Sorry, incorrect passphrase.") :
1883
503
                                    i18n.tr("Sorry, incorrect passcode.")
1884
504
                        var text = i18n.tr("This will be your last attempt.") + " " +
1885
505
                                   (lockscreen.alphaNumeric ?
1886
506
                                    i18n.tr("If passphrase is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted.") :
1887
507
                                    i18n.tr("If passcode is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted."))
1888
508
                        lockscreen.showInfoPopup(title, text)
1889
509
                    } else if (AccountsService.failedLogins >= maxFailedLogins) {
1890
510
                        SystemImage.factoryReset() // Ouch!
1891
511
                    }
1892
512
                }
1893
513
                if (failedLoginsDelayAttempts > 0 && AccountsService.failedLogins % failedLoginsDelayAttempts == 0) {
1894
514
                    lockscreen.delayMinutes = failedLoginsDelayMinutes
1895
515
                    forcedDelayTimer.start()
1896
516
                }
1897
517
1898
518
                lockscreen.clear(true);
1899
519
                if (greeter.narrowMode) {
1900
520
                    LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
1901
521
                }
1902
522
            }
1903
523
        }
1904
524
    }
1905
525
1906
526
    Binding {
1907
527
        target: LightDM.Greeter
1908
528
        property: "active"
1909
529
        value: greeter.shown || lockscreen.shown || greeter.hasLockedApp
1910
530
    }
1911
531
1912
532
    Rectangle {
1913
533
        anchors.fill: parent
1914
534
        color: "black"
1915
535
        opacity: greeterWrapper.showProgress * 0.8
1916
536
    }
1917
537
1918
538
    Item {
1919
539
        // Just a tiny wrapper to adjust greeter's x without messing with its own dragging
1920
540
        id: greeterWrapper
1921
541
        objectName: "greeterWrapper"
1922
542
        x: (greeter.narrowMode && greeter.showProgress > 0) ? launcher.progress : 0
1923
543
        y: panel.panelHeight
1924
544
        width: parent.width
1925
545
        height: parent.height - panel.panelHeight
1926
546
1927
547
        Behavior on x {
1928
548
            enabled: !launcher.dashSwipe
1929
549
            StandardAnimation {}
1930
550
        }
1931
551
1932
552
        property bool fullyShown: showProgress === 1.0
1933
553
        onFullyShownChanged: {
1934
554
            // Wait until the greeter is completely covering lockscreen before resetting it.
1935
555
            if (greeter.narrowMode && fullyShown && !LightDM.Greeter.authenticated) {
1936
556
                lockscreen.reset();
1937
557
                lockscreen.maybeShow();
1938
558
            }
1939
559
        }
1940
560
1941
561
        readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
1942
562
        onShowProgressChanged: {
1943
563
            if (showProgress === 0) {
1944
564
                if ((LightDM.Greeter.promptless && LightDM.Greeter.authenticated) || shell.forcedUnlock) {
1945
565
                    greeter.login()
1946
566
                } else if (greeter.narrowMode) {
1947
567
                    lockscreen.clear(false) // to reset focus if necessary
1948
568
                }
1949
569
            }
1950
570
        }
1951
571
1952
572
        Greeter {
1953
573
            id: greeter
1954
574
            objectName: "greeter"
1955
575
1956
576
            signal sessionStarted() // helpful for tests
1957
577
1958
578
            property string lockedApp: ""
1959
579
            property bool hasLockedApp: lockedApp !== ""
1960
580
1961
581
            hides: [launcher, panel.indicators]
1962
582
            loadContent: required || lockscreen.required // keeps content in memory for quick show()
1963
583
1964
584
            locked: shell.locked
1965
585
1966
586
            background: shell.background
1967
587
1968
588
            width: parent.width
1969
589
            height: parent.height
1970
590
1971
591
1972
592
            // avoid overlapping with Launcher's edge drag area
1973
593
            // FIXME: Fix TouchRegistry & friends and remove this workaround
1974
594
            //        Issue involves launcher's DDA getting disabled on a long
1975
595
            //        left-edge drag
1976
596
            dragHandleLeftMargin: launcher.available ? launcher.dragAreaWidth + 1 : 0
1977
597
1978
598
            function startUnlock() {
1979
599
                if (narrowMode) {
1980
600
                    if (!LightDM.Greeter.authenticated) {
1981
601
                        lockscreen.maybeShow()
1982
602
                    }
1983
603
                    hide()
1984
604
                } else {
1985
605
                    show()
1986
606
                    tryToUnlock()
1987
607
                }
1988
608
            }
1989
609
1990
610
            function login() {
1991
611
                enabled = false;
1992
612
                if (LightDM.Greeter.startSessionSync()) {
1993
613
                    sessionStarted();
1994
614
                    greeter.hide();
1995
615
                    lockscreen.hide();
1996
616
                    launcher.hide();
1997
617
                }
1998
618
                enabled = true;
1999
619
            }
2000
620
2001
621
            Timer {
2002
622
                // See powerConnection for why this is useful
2003
623
                id: showGreeterDelayed
2004
624
                interval: 1
2005
625
                onTriggered: {
2006
626
                    greeter.showNow();
2007
627
                }
2008
628
            }
2009
629
2010
630
            onShownChanged: {
2011
631
                if (shown) {
2012
632
                    // Disable everything so that user can't swipe greeter or
2013
633
                    // launcher until we get the next prompt/authenticate, which
2014
634
                    // will re-enable the shell.
2015
635
                    shell.enabled = false;
2016
636
2017
637
                    if (greeter.narrowMode) {
2018
638
                        LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
2019
639
                    } else {
2020
640
                        reset()
2021
641
                    }
2022
642
                    greeter.lockedApp = "";
2023
643
                    greeter.forceActiveFocus();
2024
644
                }
2025
645
            }
2026
646
2027
647
            Component.onCompleted: {
2028
648
                Connectivity.unlockAllModems()
2029
649
            }
2030
650
2031
651
            onUnlocked: greeter.hide()
2032
652
            onSelected: {
2033
653
                // Update launcher items for new user
2034
654
                var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
2035
655
                AccountsService.user = user;
2036
656
                LauncherModel.setUser(user);
2037
657
            }
2038
658
2039
659
            onTapped: {
2040
660
                if (!tutorial.running) {
2041
661
                    launcher.tease();
2042
662
                }
2043
663
            }
2044
664
            onDraggingChanged: {
2045
665
                if (dragging && !tutorial.running) {
2046
666
                    launcher.tease();
2047
667
                }
2048
668
            }
2049
669
2050
670
            Binding {
2051
671
                target: ApplicationManager
2052
672
                property: "suspended"
2053
673
                value: (greeter.shown && greeterWrapper.showProgress == 1) || lockscreen.shown
2054
674
            }
2063
675
        }
394
        }
2064
676
    }
395
    }
2065
677
396
2066
@@ -680,7 +399,7 @@
2067
680
        target: callManager
399
        target: callManager
2068
681
400
2069
682
        onHasCallsChanged: {
401
        onHasCallsChanged: {
2071
683
            if (shell.locked && callManager.hasCalls && greeter.lockedApp !== "dialer-app") {
402
            if (greeter.locked && callManager.hasCalls && greeter.lockedApp !== "dialer-app") {
2072
684
                // We just received an incoming call while locked.  The
403
                // We just received an incoming call while locked.  The
2073
685
                // indicator will have already launched dialer-app for us, but
404
                // indicator will have already launched dialer-app for us, but
2074
686
                // there is a race between "hasCalls" changing and the dialer
405
                // there is a race between "hasCalls" changing and the dialer
2075
@@ -720,9 +439,7 @@
2076
720
            return
439
            return
2077
721
        }
440
        }
2078
722
441
2082
723
        if (LightDM.Greeter.active) {
442
        greeter.notifyAboutToFocusApp("unity8-dash");
2080
724
            greeter.startUnlock()
2081
725
        }
2083
726
443
2084
727
        var animate = !LightDM.Greeter.active && !stages.shown
444
        var animate = !LightDM.Greeter.active && !stages.shown
2085
728
        dash.setCurrentScope(0, animate, false)
445
        dash.setCurrentScope(0, animate, false)
2086
@@ -730,17 +447,11 @@
2087
730
    }
447
    }
2088
731
448
2089
732
    function showDash() {
449
    function showDash() {
2097
733
        if (greeter.hasLockedApp || // just in case user gets here
450
        if (greeter.notifyShowingDashFromDrag()) {
2091
734
            (!greeter.narrowMode && shell.locked)) {
2092
735
            return
2093
736
        }
2094
737
2095
738
        if (greeter.shown) {
2096
739
            greeter.hideRight();
2098
740
            launcher.fadeOut();
451
            launcher.fadeOut();
2099
741
        }
452
        }
2100
742
453
2102
743
        if (ApplicationManager.focusedApplicationId != "unity8-dash") {
454
        if (!greeter.locked && ApplicationManager.focusedApplicationId != "unity8-dash") {
2103
744
            ApplicationManager.requestFocusApplication("unity8-dash")
455
            ApplicationManager.requestFocusApplication("unity8-dash")
2104
745
            launcher.fadeOut();
456
            launcher.fadeOut();
2105
746
        }
457
        }
2106
@@ -758,7 +469,9 @@
2107
758
            anchors.fill: parent //because this draws indicator menus
469
            anchors.fill: parent //because this draws indicator menus
2108
759
            indicators {
470
            indicators {
2109
760
                hides: [launcher]
471
                hides: [launcher]
2111
761
                available: tutorial.panelEnabled && (!shell.locked || AccountsService.enableIndicatorsWhileLocked) && !greeter.hasLockedApp
472
                available: tutorial.panelEnabled
2112
473
                        && (!greeter.locked || AccountsService.enableIndicatorsWhileLocked)
2113
474
                        && !greeter.hasLockedApp
2114
762
                contentEnabled: tutorial.panelContentEnabled
475
                contentEnabled: tutorial.panelContentEnabled
2115
763
                width: parent.width > units.gu(60) ? units.gu(40) : parent.width
476
                width: parent.width > units.gu(60) ? units.gu(40) : parent.width
2116
764
477
2117
@@ -772,7 +485,7 @@
2118
772
                }
485
                }
2119
773
            }
486
            }
2120
774
            callHint {
487
            callHint {
2122
775
                greeterShown: greeter.shown || lockscreen.shown
488
                greeterShown: greeter.shown
2123
776
            }
489
            }
2124
777
490
2125
778
            property bool topmostApplicationIsFullscreen:
491
            property bool topmostApplicationIsFullscreen:
2126
@@ -794,7 +507,9 @@
2127
794
            anchors.bottom: parent.bottom
507
            anchors.bottom: parent.bottom
2128
795
            width: parent.width
508
            width: parent.width
2129
796
            dragAreaWidth: shell.edgeSize
509
            dragAreaWidth: shell.edgeSize
2131
797
            available: tutorial.launcherEnabled && (!shell.locked || AccountsService.enableLauncherWhileLocked) && !greeter.hasLockedApp
510
            available: tutorial.launcherEnabled
2132
511
                    && (!greeter.locked || AccountsService.enableLauncherWhileLocked)
2133
512
                    && !greeter.hasLockedApp
2134
798
            inverted: usageModeSettings.usageMode === "Staged"
513
            inverted: usageModeSettings.usageMode === "Staged"
2135
799
            shadeBackground: !tutorial.running
514
            shadeBackground: !tutorial.running
2136
800
515
2137
@@ -806,11 +521,10 @@
2138
806
                }
521
                }
2139
807
            }
522
            }
2140
808
            onLauncherApplicationSelected: {
523
            onLauncherApplicationSelected: {
2145
809
                if (greeter.hasLockedApp) {
524
                if (!tutorial.running) {
2146
810
                    greeter.startUnlock()
525
                    greeter.notifyAboutToFocusApp(appId);
2143
811
                }
2144
812
                if (!tutorial.running)
2147
813
                    shell.activateApplication(appId)
526
                    shell.activateApplication(appId)
2148
527
                }
2149
814
            }
528
            }
2150
815
            onShownChanged: {
529
            onShownChanged: {
2151
816
                if (shown) {
530
                if (shown) {
2152
817
531
2153
=== modified file 'tests/autopilot/unity8/shell/emulators/greeter.py'
2154
--- tests/autopilot/unity8/shell/emulators/greeter.py	2014-09-08 10:33:50 +0000
2155
+++ tests/autopilot/unity8/shell/emulators/greeter.py	2015-02-23 15:44:00 +0000
2156
@@ -19,6 +19,7 @@
2157
19
19
2158
20
import ubuntuuitoolkit
20
import ubuntuuitoolkit
2159
21
21
2160
22
from autopilot.utilities import sleep
2161
22
from unity8.shell.emulators import UnityEmulatorBase
23
from unity8.shell.emulators import UnityEmulatorBase
2162
23
24
2163
24
25
2164
@@ -26,12 +27,27 @@
2165
26
    """An emulator that understands the greeter screen."""
27
    """An emulator that understands the greeter screen."""
2166
27
28
2167
28
    def wait_swiped_away(self):
29
    def wait_swiped_away(self):
2169
29
        self.showProgress.wait_for(0)
30
        # We have to be careful here, because coverPage can go away at any time
2170
31
        # if there isn't a lockscreen behind it (it hides completely, then
2171
32
        # the greeter disposes it).  But if there *is* a lockscreen, then we
2172
33
        # need a different check, by looking at its showProgress.  So make our
2173
34
        # own wait_for loop and check both possibilities.
2174
35
        for i in range(10):
2175
36
            if not self.required:
2176
37
                return
2177
38
            coverPage = self.select_single(objectName='coverPage')
2178
39
            if coverPage.showProgress == 0:
2179
40
                return
2180
41
            sleep(1)
2181
42
2182
43
        raise AssertionError("Greeter cover page still up after 10s")
2183
44
2184
30
45
2185
31
    def swipe(self):
46
    def swipe(self):
2186
32
        """Swipe the greeter screen away."""
47
        """Swipe the greeter screen away."""
2189
33
        self.created.wait_for(True)
48
        self.waiting.wait_for(False)
2190
34
        self.showProgress.wait_for(1)
49
        coverPage = self.select_single(objectName='coverPage')
2191
50
        coverPage.showProgress.wait_for(1)
2192
35
51
2193
36
        rect = self.globalRect
52
        rect = self.globalRect
2194
37
        start_x = rect[0] + rect[2] - 3
53
        start_x = rect[0] + rect[2] - 3
2195
38
54
2196
=== modified file 'tests/autopilot/unity8/shell/emulators/main_window.py'
2197
--- tests/autopilot/unity8/shell/emulators/main_window.py	2015-01-21 04:11:36 +0000
2198
+++ tests/autopilot/unity8/shell/emulators/main_window.py	2015-02-23 15:44:00 +0000
2199
@@ -35,12 +35,6 @@
2200
35
    def get_greeter(self):
35
    def get_greeter(self):
2201
36
        return self.select_single(Greeter)
36
        return self.select_single(Greeter)
2202
37
37
2203
38
    def get_greeter_content_loader(self):
2204
39
        return self.wait_select_single(
2205
40
            "QQuickLoader",
2206
41
            objectName="greeterContentLoader"
2207
42
        )
2208
43
2209
44
    def get_login_loader(self):
38
    def get_login_loader(self):
2210
45
        return self.select_single("QQuickLoader", objectName="loginLoader")
39
        return self.select_single("QQuickLoader", objectName="loginLoader")
2211
46
40
2212
47
41
2213
=== modified file 'tests/autopilot/unity8/shell/tests/__init__.py'
2214
--- tests/autopilot/unity8/shell/tests/__init__.py	2015-01-21 13:50:14 +0000
2215
+++ tests/autopilot/unity8/shell/tests/__init__.py	2015-02-23 15:44:00 +0000
2216
@@ -375,9 +375,8 @@
2217
375
        self._proxy = None
375
        self._proxy = None
2218
376
376
2219
377
    def wait_for_unity(self):
377
    def wait_for_unity(self):
2223
378
        greeter_content_loader = self.main_window.wait_select_single(
378
        greeter = self.main_window.wait_select_single(objectName='greeter')
2224
379
            objectName='greeterContentLoader')
379
        greeter.waiting.wait_for(False)
2222
380
        greeter_content_loader.progress.wait_for(1)
2225
381
380
2226
382
    def get_dash(self):
381
    def get_dash(self):
2227
383
        pid = process_helpers.get_job_pid('unity8-dash')
382
        pid = process_helpers.get_job_pid('unity8-dash')
2228
384
383
2229
=== modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
2230
--- tests/autopilot/unity8/shell/tests/test_lock_screen.py	2015-01-21 13:50:14 +0000
2231
+++ tests/autopilot/unity8/shell/tests/test_lock_screen.py	2015-02-23 15:44:00 +0000
2232
@@ -47,14 +47,13 @@
2233
47
        self.launch_unity()
47
        self.launch_unity()
2234
48
        greeter = self.main_window.get_greeter()
48
        greeter = self.main_window.get_greeter()
2235
49
49
2237
50
        if greeter.narrowMode:
50
        if not greeter.tabletMode:
2238
51
            greeter.swipe()
51
            greeter.swipe()
2239
52
            lockscreen = self._wait_for_lockscreen()
52
            lockscreen = self._wait_for_lockscreen()
2240
53
            self.main_window.enter_pin_code("1234")
53
            self.main_window.enter_pin_code("1234")
2241
54
            self.assertThat(lockscreen.shown, Eventually(Equals(False)))
2242
55
        else:
54
        else:
2243
56
            self._enter_prompt_passphrase("1234\n")
55
            self._enter_prompt_passphrase("1234\n")
2245
57
            self.assertThat(greeter.shown, Eventually(Equals(False)))
56
        self.assertThat(greeter.shown, Eventually(Equals(False)))
2246
58
57
2247
59
    def test_can_unlock_passphrase_screen(self):
58
    def test_can_unlock_passphrase_screen(self):
2248
60
        """Must be able to unlock the passphrase entry screen."""
59
        """Must be able to unlock the passphrase entry screen."""
2249
@@ -63,14 +62,13 @@
2250
63
        self.launch_unity()
62
        self.launch_unity()
2251
64
        greeter = self.main_window.get_greeter()
63
        greeter = self.main_window.get_greeter()
2252
65
64
2254
66
        if greeter.narrowMode:
65
        if not greeter.tabletMode:
2255
67
            greeter.swipe()
66
            greeter.swipe()
2256
68
            lockscreen = self._wait_for_lockscreen()
67
            lockscreen = self._wait_for_lockscreen()
2257
69
            self._enter_pin_passphrase("password")
68
            self._enter_pin_passphrase("password")
2258
70
            self.assertThat(lockscreen.shown, Eventually(Equals(False)))
2259
71
        else:
69
        else:
2260
72
            self._enter_prompt_passphrase("password")
70
            self._enter_prompt_passphrase("password")
2262
73
            self.assertThat(greeter.shown, Eventually(Equals(False)))
71
        self.assertThat(greeter.shown, Eventually(Equals(False)))
2263
74
72
2264
75
    def test_pin_screen_wrong_code(self):
73
    def test_pin_screen_wrong_code(self):
2265
76
        """Entering the wrong pin code must not dismiss the lock screen."""
74
        """Entering the wrong pin code must not dismiss the lock screen."""
2266
@@ -78,18 +76,17 @@
2267
78
        self.launch_unity()
76
        self.launch_unity()
2268
79
        greeter = self.main_window.get_greeter()
77
        greeter = self.main_window.get_greeter()
2269
80
78
2271
81
        if greeter.narrowMode:
79
        if not greeter.tabletMode:
2272
82
            greeter.swipe()
80
            greeter.swipe()
2273
83
            lockscreen = self._wait_for_lockscreen()
81
            lockscreen = self._wait_for_lockscreen()
2274
84
            self.main_window.enter_pin_code("4321")
82
            self.main_window.enter_pin_code("4321")
2275
85
            pinentryField = self.main_window.get_pinentryField()
83
            pinentryField = self.main_window.get_pinentryField()
2276
86
            self.assertThat(pinentryField.text, Eventually(Equals("")))
84
            self.assertThat(pinentryField.text, Eventually(Equals("")))
2277
87
            self.assertThat(lockscreen.shown, Eventually(Equals(True)))
2278
88
        else:
85
        else:
2279
89
            self._enter_prompt_passphrase("4231\n")
86
            self._enter_prompt_passphrase("4231\n")
2280
90
            prompt = self.main_window.get_greeter().get_prompt()
87
            prompt = self.main_window.get_greeter().get_prompt()
2281
91
            self.assertThat(prompt.text, Eventually(Equals("")))
88
            self.assertThat(prompt.text, Eventually(Equals("")))
2283
92
            self.assertThat(greeter.shown, Eventually(Equals(True)))
89
        self.assertThat(greeter.shown, Eventually(Equals(True)))
2284
93
90
2285
94
    def test_passphrase_screen_wrong_password(self):
91
    def test_passphrase_screen_wrong_password(self):
2286
95
        """Entering the wrong password must not dismiss the lock screen."""
92
        """Entering the wrong password must not dismiss the lock screen."""
2287
@@ -97,18 +94,17 @@
2288
97
        self.launch_unity()
94
        self.launch_unity()
2289
98
        greeter = self.main_window.get_greeter()
95
        greeter = self.main_window.get_greeter()
2290
99
96
2292
100
        if greeter.narrowMode:
97
        if not greeter.tabletMode:
2293
101
            greeter.swipe()
98
            greeter.swipe()
2294
102
            lockscreen = self._wait_for_lockscreen()
99
            lockscreen = self._wait_for_lockscreen()
2295
103
            self._enter_pin_passphrase("foobar")
100
            self._enter_pin_passphrase("foobar")
2296
104
            pinentryField = self.main_window.get_pinentryField()
101
            pinentryField = self.main_window.get_pinentryField()
2297
105
            self.assertThat(pinentryField.text, Eventually(Equals("")))
102
            self.assertThat(pinentryField.text, Eventually(Equals("")))
2298
106
            self.assertThat(lockscreen.shown, Eventually(Equals(True)))
2299
107
        else:
103
        else:
2300
108
            self._enter_prompt_passphrase("foobar")
104
            self._enter_prompt_passphrase("foobar")
2301
109
            prompt = self.main_window.get_greeter().get_prompt()
105
            prompt = self.main_window.get_greeter().get_prompt()
2302
110
            self.assertThat(prompt.text, Eventually(Equals("")))
106
            self.assertThat(prompt.text, Eventually(Equals("")))
2304
111
            self.assertThat(greeter.shown, Eventually(Equals(True)))
107
        self.assertThat(greeter.shown, Eventually(Equals(True)))
2305
112
108
2306
113
    def _wait_for_lockscreen(self):
109
    def _wait_for_lockscreen(self):
2307
114
        """Wait for the lock screen to load, and return it."""
110
        """Wait for the lock screen to load, and return it."""
2308
115
111
2309
=== modified file 'tests/plugins/LightDM/CMakeLists.txt'
2310
--- tests/plugins/LightDM/CMakeLists.txt	2015-01-27 15:50:02 +0000
2311
+++ tests/plugins/LightDM/CMakeLists.txt	2015-02-23 15:44:00 +0000
2312
@@ -4,17 +4,32 @@
2313
4
    )
4
    )
2314
5
qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
5
qt5_use_modules(GreeterDBusTestExec Core DBus Quick Test)
2315
6
6
2316
7
add_executable(GreeterUsersModelTestExec
2317
8
    usersmodel.cpp
2318
9
    ${CMAKE_SOURCE_DIR}/plugins/LightDM/UsersModel.cpp
2319
10
    ${CMAKE_SOURCE_DIR}/plugins/Utils/unitysortfilterproxymodelqml.cpp
2320
11
    )
2321
12
qt5_use_modules(GreeterUsersModelTestExec Core Test)
2322
13
2323
7
include_directories(
14
include_directories(
2324
8
    ${CMAKE_CURRENT_BINARY_DIR}
15
    ${CMAKE_CURRENT_BINARY_DIR}
2325
9
    ${CMAKE_SOURCE_DIR}/plugins/LightDM
16
    ${CMAKE_SOURCE_DIR}/plugins/LightDM
2326
17
    ${CMAKE_SOURCE_DIR}/plugins/Utils
2327
10
    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
18
    ${CMAKE_SOURCE_DIR}/tests/mocks/LightDM
2334
11
    ${LIBLIGHTDM_INCLUDE_DIRS}
19
    )
2335
12
    )
20
2336
13
21
target_link_libraries(GreeterDBusTestExec
2337
14
add_dependencies(GreeterDBusTestExec MockLightDM)
22
    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
2338
15
target_link_libraries(GreeterDBusTestExec -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
23
    -llightdm-qt5-2
2339
16
    -llightdm-qt5-2)
24
    )
2340
25
2341
26
target_link_libraries(GreeterUsersModelTestExec
2342
27
    -L${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm
2343
28
    -llightdm-qt5-2
2344
29
    )
2345
17
30
2346
18
add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
31
add_definitions(-DCURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
2347
19
32
2348
20
add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
33
add_binary_qml_test(GreeterDBus "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "QML2_IMPORT_PATH=${CMAKE_BINARY_DIR}/tests/mocks")
2349
34
2350
35
add_binary_qml_test(GreeterUsersModel "${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm" MockLightDM "LIBLIGHTDM_MOCK_MODE=full")
2351
21
36
2352
=== added file 'tests/plugins/LightDM/usersmodel.cpp'
2353
--- tests/plugins/LightDM/usersmodel.cpp	1970-01-01 00:00:00 +0000
2354
+++ tests/plugins/LightDM/usersmodel.cpp	2015-02-23 15:44:00 +0000
2355
@@ -0,0 +1,84 @@
2356
1
/*
2357
2
 * Copyright (C) 2015 Canonical, Ltd.
2358
3
 *
2359
4
 * This program is free software; you can redistribute it and/or modify
2360
5
 * it under the terms of the GNU General Public License as published by
2361
6
 * the Free Software Foundation; version 3.
2362
7
 *
2363
8
 * This program is distributed in the hope that it will be useful,
2364
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2365
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2366
11
 * GNU General Public License for more details.
2367
12
 *
2368
13
 * You should have received a copy of the GNU General Public License
2369
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2370
15
 */
2371
16
2372
17
#include "UsersModel.h"
2373
18
2374
19
#include <QLightDM/UsersModel>
2375
20
#include <QtTest>
2376
21
2377
22
class GreeterUsersModelTest : public QObject
2378
23
{
2379
24
    Q_OBJECT
2380
25
2381
26
private:
2382
27
    static int findName(QAbstractItemModel *model, const QString &name)
2383
28
    {
2384
29
        for (int i = 0; i < model->rowCount(QModelIndex()); i++) {
2385
30
            if (model->data(model->index(i, 0), QLightDM::UsersModel::NameRole).toString() == name) {
2386
31
                return i;
2387
32
            }
2388
33
        }
2389
34
        return -1;
2390
35
    }
2391
36
2392
37
    static QString getStringValue(QAbstractItemModel *model, const QString &name, int role)
2393
38
    {
2394
39
        int i = findName(model, name);
2395
40
        return model->data(model->index(i, 0), role).toString();
2396
41
    }
2397
42
2398
43
private Q_SLOTS:
2399
44
2400
45
    void init()
2401
46
    {
2402
47
        model = new UsersModel();
2403
48
        QVERIFY(model);
2404
49
        sourceModel = new QLightDM::UsersModel();
2405
50
        QVERIFY(sourceModel);
2406
51
    }
2407
52
2408
53
    void cleanup()
2409
54
    {
2410
55
        delete model;
2411
56
        delete sourceModel;
2412
57
    }
2413
58
2414
59
    void testMangleColor()
2415
60
    {
2416
61
        QString background = getStringValue(sourceModel, "color-background", QLightDM::UsersModel::BackgroundPathRole);
2417
62
        QVERIFY(background == "#dd4814");
2418
63
2419
64
        background = getStringValue(model, "color-background", QLightDM::UsersModel::BackgroundPathRole);
2420
65
        QVERIFY(background == "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#dd4814'/></svg>");
2421
66
    }
2422
67
2423
68
    void testMangleEmptyName()
2424
69
    {
2425
70
        QString name = getStringValue(sourceModel, "empty-name", QLightDM::UsersModel::RealNameRole);
2426
71
        QVERIFY(name == "");
2427
72
2428
73
        name = getStringValue(model, "empty-name", QLightDM::UsersModel::RealNameRole);
2429
74
        QVERIFY(name == "empty-name");
2430
75
    }
2431
76
2432
77
private:
2433
78
    UsersModel *model;
2434
79
    QLightDM::UsersModel *sourceModel;
2435
80
};
2436
81
2437
82
QTEST_MAIN(GreeterUsersModelTest)
2438
83
2439
84
#include "usersmodel.moc"
2440
0
85
2441
=== modified file 'tests/qmltests/CMakeLists.txt'
2442
--- tests/qmltests/CMakeLists.txt	2015-02-11 17:11:41 +0000
2443
+++ tests/qmltests/CMakeLists.txt	2015-02-23 15:44:00 +0000
2444
@@ -60,10 +60,11 @@
2445
60
add_qml_test(Dash/ScopeSettings ScopeSettingNumber)
60
add_qml_test(Dash/ScopeSettings ScopeSettingNumber)
2446
61
add_qml_test(Dash/ScopeSettings ScopeSettingString)
61
add_qml_test(Dash/ScopeSettings ScopeSettingString)
2447
62
add_qml_test(Dash/ScopeSettings ScopeSettingsWidgetFactory)
62
add_qml_test(Dash/ScopeSettings ScopeSettingsWidgetFactory)
2450
63
add_qml_test(Greeter MultiGreeter)
63
add_qml_test(Greeter Clock)
2451
64
add_qml_test(Greeter SingleGreeter)
64
add_qml_test(Greeter Greeter)
2452
65
add_qml_test(Greeter Infographics)
65
add_qml_test(Greeter Infographics)
2454
66
add_qml_test(Greeter Clock)
66
add_qml_test(Greeter NarrowView)
2455
67
add_qml_test(Greeter WideView)
2456
67
add_qml_test(Launcher Launcher)
68
add_qml_test(Launcher Launcher)
2457
68
add_qml_test(Notifications Notifications)
69
add_qml_test(Notifications Notifications)
2458
69
add_qml_test(Notifications VisualSnapDecisionsQueue)
70
add_qml_test(Notifications VisualSnapDecisionsQueue)
2459
70
71
2460
=== added file 'tests/qmltests/Greeter/TestView.qml'
2461
--- tests/qmltests/Greeter/TestView.qml	1970-01-01 00:00:00 +0000
2462
+++ tests/qmltests/Greeter/TestView.qml	2015-02-23 15:44:00 +0000
2463
@@ -0,0 +1,99 @@
2464
1
/*
2465
2
 * Copyright (C) 2015 Canonical, Ltd.
2466
3
 *
2467
4
 * This program is free software; you can redistribute it and/or modify
2468
5
 * it under the terms of the GNU General Public License as published by
2469
6
 * the Free Software Foundation; version 3.
2470
7
 *
2471
8
 * This program is distributed in the hope that it will be useful,
2472
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2473
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2474
11
 * GNU General Public License for more details.
2475
12
 *
2476
13
 * You should have received a copy of the GNU General Public License
2477
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2478
15
 */
2479
16
2480
17
import QtQuick 2.3
2481
18
import Ubuntu.Components 1.1
2482
19
import "../Components"
2483
20
2484
21
Item {
2485
22
    objectName: "testView"
2486
23
2487
24
    property real dragHandleLeftMargin
2488
25
    property real launcherOffset
2489
26
    property int currentIndex
2490
27
    property int delayMinutes
2491
28
    property real backgroundTopMargin
2492
29
    property url background
2493
30
    property bool locked
2494
31
    property bool alphanumeric
2495
32
    property var userModel
2496
33
    property var infographicModel
2497
34
    readonly property bool fullyShown: _fullyShown
2498
35
    readonly property bool required: _required
2499
36
2500
37
    property bool _fullyShown: true
2501
38
    property bool _required: true
2502
39
2503
40
    signal selected(int index)
2504
41
    signal responded(string response)
2505
42
    signal tease()
2506
43
    signal emergencyCall()
2507
44
2508
45
    signal _showMessageCalled(string html)
2509
46
    signal _showPromptCalled(string text, bool isSecret, bool isDefaultPrompt)
2510
47
    signal _showLastChanceCalled()
2511
48
    signal _hideCalled()
2512
49
    signal _notifyAuthenticationSucceededCalled()
2513
50
    signal _notifyAuthenticationFailedCalled()
2514
51
    signal _resetCalled()
2515
52
    signal _tryToUnlockCalled(bool toTheRight)
2516
53
2517
54
    function showMessage(html) {
2518
55
        _showMessageCalled(html);
2519
56
    }
2520
57
2521
58
    function showPrompt(text, isSecret, isDefaultPrompt) {
2522
59
        _showPromptCalled(text, isSecret, isDefaultPrompt);
2523
60
    }
2524
61
2525
62
    function showLastChance() {
2526
63
        _showLastChanceCalled();
2527
64
    }
2528
65
2529
66
    function hide() {
2530
67
        _hideCalled();
2531
68
        _required = false;
2532
69
        _fullyShown = false;
2533
70
    }
2534
71
2535
72
    function notifyAuthenticationSucceeded() {
2536
73
        _notifyAuthenticationSucceededCalled();
2537
74
    }
2538
75
2539
76
    function notifyAuthenticationFailed() {
2540
77
        _notifyAuthenticationFailedCalled();
2541
78
    }
2542
79
2543
80
    function reset() {
2544
81
        _resetCalled();
2545
82
    }
2546
83
2547
84
    function tryToUnlock(toTheRight) {
2548
85
        _tryToUnlockCalled(toTheRight);
2549
86
        return true;
2550
87
    }
2551
88
2552
89
    Rectangle {
2553
90
        anchors.fill: parent
2554
91
        color: "black"
2555
92
2556
93
        Label {
2557
94
            text: "Fake view, nothing to see here"
2558
95
            color: "white"
2559
96
            anchors.centerIn: parent
2560
97
        }
2561
98
    }
2562
99
}
2563
0
100
2564
=== added file 'tests/qmltests/Greeter/tst_Greeter.qml'
2565
--- tests/qmltests/Greeter/tst_Greeter.qml	1970-01-01 00:00:00 +0000
2566
+++ tests/qmltests/Greeter/tst_Greeter.qml	2015-02-23 15:44:00 +0000
2567
@@ -0,0 +1,472 @@
2568
1
/*
2569
2
 * Copyright 2015 Canonical Ltd.
2570
3
 *
2571
4
 * This program is free software; you can redistribute it and/or modify
2572
5
 * it under the terms of the GNU General Public License as published by
2573
6
 * the Free Software Foundation; version 3.
2574
7
 *
2575
8
 * This program is distributed in the hope that it will be useful,
2576
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
2577
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
2578
11
 * GNU General Public License for more details.
2579
12
 *
2580
13
 * You should have received a copy of the GNU General Public License
2581
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
2582
15
 */
2583
16
2584
17
import QtQuick 2.0
2585
18
import QtTest 1.0
2586
19
import ".."
2587
20
import "../../../qml/Greeter"
2588
21
import Ubuntu.Components 0.1
2589
22
import AccountsService 0.1
2590
23
import LightDM 0.1 as LightDM
2591
24
import Unity.Test 0.1 as UT
2592
25
2593
26
Item {
2594
27
    width: units.gu(120)
2595
28
    height: units.gu(80)
2596
29
2597
30
    property url defaultBackground: Qt.resolvedUrl("../../../qml/graphics/tablet_background.jpg")
2598
31
2599
32
    Component.onCompleted: {
2600
33
        // set the mock mode before loading
2601
34
        LightDM.Greeter.mockMode = "full";
2602
35
        LightDM.Users.mockMode = "full";
2603
36
        loader.active = true;
2604
37
    }
2605
38
2606
39
    Loader {
2607
40
        id: loader
2608
41
2609
42
        active: false
2610
43
        anchors.fill: parent
2611
44
2612
45
        property bool itemDestroyed: false
2613
46
        sourceComponent: Component {
2614
47
            Greeter {
2615
48
                width: loader.width
2616
49
                height: loader.height
2617
50
                background: defaultBackground
2618
51
                viewSource: Qt.resolvedUrl("TestView.qml")
2619
52
2620
53
                Component.onDestruction: {
2621
54
                    loader.itemDestroyed = true;
2622
55
                }
2623
56
            }
2624
57
        }
2625
58
    }
2626
59
2627
60
    SignalSpy {
2628
61
        id: teaseSpy
2629
62
        target: loader.item
2630
63
        signalName: "tease"
2631
64
    }
2632
65
2633
66
    SignalSpy {
2634
67
        id: sessionStartedSpy
2635
68
        target: loader.item
2636
69
        signalName: "sessionStarted"
2637
70
    }
2638
71
2639
72
    SignalSpy {
2640
73
        id: emergencyCallSpy
2641
74
        target: loader.item
2642
75
        signalName: "emergencyCall"
2643
76
    }
2644
77
2645
78
    UT.UnityTestCase {
2646
79
        id: testCase
2647
80
        name: "Greeter"
2648
81
        when: windowShown
2649
82
2650
83
        property Item greeter: loader.status === Loader.Ready ? loader.item : null
2651
84
        property Item view
2652
85
2653
86
        SignalSpy {
2654
87
            id: viewShowMessageSpy
2655
88
            target: testCase.view
2656
89
            signalName: "_showMessageCalled"
2657
90
        }
2658
91
2659
92
        SignalSpy {
2660
93
            id: viewShowPromptSpy
2661
94
            target: testCase.view
2662
95
            signalName: "_showPromptCalled"
2663
96
        }
2664
97
2665
98
        SignalSpy {
2666
99
            id: viewShowLastChanceSpy
2667
100
            target: testCase.view
2668
101
            signalName: "_showLastChanceCalled"
2669
102
        }
2670
103
2671
104
        SignalSpy {
2672
105
            id: viewHideSpy
2673
106
            target: testCase.view
2674
107
            signalName: "_hideCalled"
2675
108
        }
2676
109
2677
110
        SignalSpy {
2678
111
            id: viewAuthenticationSucceededSpy
2679
112
            target: testCase.view
2680
113
            signalName: "_notifyAuthenticationSucceededCalled"
2681
114
        }
2682
115
2683
116
        SignalSpy {
2684
117
            id: viewAuthenticationFailedSpy
2685
118
            target: testCase.view
2686
119
            signalName: "_notifyAuthenticationFailedCalled"
2687
120
        }
2688
121
2689
122
        SignalSpy {
2690
123
            id: viewResetSpy
2691
124
            target: testCase.view
2692
125
            signalName: "_resetCalled"
2693
126
        }
2694
127
2695
128
        SignalSpy {
2696
129
            id: viewTryToUnlockSpy
2697
130
            target: testCase.view
2698
131
            signalName: "_tryToUnlockCalled"
2699
132
        }
2700
133
2701
134
        function init() {
2702
135
            teaseSpy.clear();
2703
136
            sessionStartedSpy.clear();
2704
137
            emergencyCallSpy.clear();
2705
138
            viewShowMessageSpy.clear();
2706
139
            viewShowPromptSpy.clear();
2707
140
            viewShowLastChanceSpy.clear();
2708
141
            viewHideSpy.clear();
2709
142
            viewAuthenticationSucceededSpy.clear();
2710
143
            viewAuthenticationFailedSpy.clear();
2711
144
            viewResetSpy.clear();
2712
145
            viewTryToUnlockSpy.clear();
2713
146
            tryCompare(greeter, "waiting", false);
2714
147
            view = findChild(greeter, "testView");
2715
148
            verifySelected(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
2716
149
        }
2717
150
2718
151
        function cleanup() {
2719
152
            loader.itemDestroyed = false;
2720
153
            loader.active = false;
2721
154
            tryCompare(loader, "status", Loader.Null);
2722
155
            tryCompare(loader, "item", null);
2723
156
            tryCompare(loader, "itemDestroyed", true);
2724
157
            loader.active = true;
2725
158
            tryCompare(loader, "status", Loader.Ready);
2726
159
            removeTimeConstraintsFromDirectionalDragAreas(loader.item);
2727
160
        }
2728
161
2729
162
        function getIndexOf(name) {
2730
163
            for (var i = 0; i < LightDM.Users.count; i++) {
2731
164
                if (name === LightDM.Users.data(i, LightDM.UserRoles.NameRole)) {
2732
165
                    return i;
2733
166
                }
2734
167
            }
2735
168
            fail("Didn't find name")
2736
169
            return -1;
2737
170
        }
2738
171
2739
172
        function selectUser(name) {
2740
173
            var i = getIndexOf(name);
2741
174
            view.selected(i);
2742
175
            verifySelected(name);
2743
176
            return i;
2744
177
        }
2745
178
2746
179
        function verifySelected(name) {
2747
180
            var i = getIndexOf(name);
2748
181
            compare(view.currentIndex, i);
2749
182
            compare(AccountsService.user, name);
2750
183
            compare(LightDM.Greeter.authenticationUser, name);
2751
184
        }
2752
185
2753
186
        function verifyLoggedIn() {
2754
187
            tryCompare(sessionStartedSpy, "count", 1);
2755
188
            verify(viewAuthenticationSucceededSpy.count > 0);
2756
189
            compare(LightDM.Greeter.authenticated, true);
2757
190
            compare(greeter.shown, false);
2758
191
        }
2759
192
2760
193
        function test_unlockPass() {
2761
194
            selectUser("has-password");
2762
195
            tryCompare(viewShowPromptSpy, "count", 1);
2763
196
            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
2764
197
            compare(viewShowPromptSpy.signalArguments[0][1], true);
2765
198
            compare(viewShowPromptSpy.signalArguments[0][2], true);
2766
199
2767
200
            view.responded("password");
2768
201
            verifyLoggedIn();
2769
202
        }
2770
203
2771
204
        function test_unlockFail() {
2772
205
            selectUser("has-password");
2773
206
            tryCompare(viewShowPromptSpy, "count", 1);
2774
207
            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
2775
208
            compare(viewShowPromptSpy.signalArguments[0][1], true);
2776
209
            compare(viewShowPromptSpy.signalArguments[0][2], true);
2777
210
2778
211
            view.responded("wr0ng p4ssw0rd");
2779
212
            tryCompare(viewAuthenticationFailedSpy, "count", 1);
2780
213
2781
214
            tryCompare(viewShowPromptSpy, "count", 2);
2782
215
            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
2783
216
            compare(viewShowPromptSpy.signalArguments[0][1], true);
2784
217
            compare(viewShowPromptSpy.signalArguments[0][2], true);
2785
218
        }
2786
219
2787
220
        function test_promptless() {
2788
221
            selectUser("no-password");
2789
222
            tryCompare(viewAuthenticationSucceededSpy, "count", 1);
2790
223
            compare(sessionStartedSpy.count, 1);
2791
224
            compare(viewShowPromptSpy.count, 0);
2792
225
            compare(viewHideSpy.count, 0);
2793
226
            compare(view.locked, false);
2794
227
        }
2795
228
2796
229
        function test_twoFactorPass() {
2797
230
            selectUser("two-factor");
2798
231
            tryCompare(viewShowPromptSpy, "count", 1);
2799
232
            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
2800
233
            compare(viewShowPromptSpy.signalArguments[0][1], true);
2801
234
            compare(viewShowPromptSpy.signalArguments[0][2], true);
2802
235
2803
236
            view.responded("password");
2804
237
            tryCompare(viewShowPromptSpy, "count", 2);
2805
238
            compare(viewShowPromptSpy.signalArguments[1][0], "otp");
2806
239
            compare(viewShowPromptSpy.signalArguments[1][1], false);
2807
240
            compare(viewShowPromptSpy.signalArguments[1][2], false);
2808
241
2809
242
            view.responded("otp");
2810
243
            verifyLoggedIn();
2811
244
        }
2812
245
2813
246
        function test_twoFactorFailOnFirst() {
2814
247
            selectUser("two-factor");
2815
248
            tryCompare(viewShowPromptSpy, "count", 1);
2816
249
            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
2817
250
            compare(viewShowPromptSpy.signalArguments[0][1], true);
2818
251
            compare(viewShowPromptSpy.signalArguments[0][2], true);
2819
252
2820
253
            view.responded("wr0ng p4ssw0rd");
2821
254
            tryCompare(viewAuthenticationFailedSpy, "count", 1);
2822
255
2823
256
            tryCompare(viewShowPromptSpy, "count", 2);
2824
257
            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
2825
258
            compare(viewShowPromptSpy.signalArguments[0][1], true);
2826
259
            compare(viewShowPromptSpy.signalArguments[0][2], true);
2827
260
        }
2828
261
2829
262
        function test_twoFactorFailOnSecond() {
2830
263
            selectUser("two-factor");
2831
264
            tryCompare(viewShowPromptSpy, "count", 1);
2832
265
            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
2833
266
            compare(viewShowPromptSpy.signalArguments[0][1], true);
2834
267
            compare(viewShowPromptSpy.signalArguments[0][2], true);
2835
268
2836
269
            view.responded("password");
2837
270
            tryCompare(viewShowPromptSpy, "count", 2);
2838
271
            compare(viewShowPromptSpy.signalArguments[1][0], "otp");
2839
272
            compare(viewShowPromptSpy.signalArguments[1][1], false);
2840
273
            compare(viewShowPromptSpy.signalArguments[1][2], false);
2841
274
2842
275
            view.responded("wr0ng p4ssw0rd");
2843
276
            tryCompare(viewAuthenticationFailedSpy, "count", 1);
2844
277
2845
278
            tryCompare(viewShowPromptSpy, "count", 3);
2846
279
            compare(viewShowPromptSpy.signalArguments[0][0], "Password");
2847
280
            compare(viewShowPromptSpy.signalArguments[0][1], true);
2848
281
            compare(viewShowPromptSpy.signalArguments[0][2], true);
2849
282
        }
2850
283
2851
284
        function test_htmlInfoPrompt() {
2852
285
            selectUser("html-info-prompt");
2853
286
            tryCompare(viewShowPromptSpy, "count", 1);
2854
287
            compare(viewShowMessageSpy.count, 1);
2855
288
            compare(viewShowMessageSpy.signalArguments[0][0], "&lt;b&gt;&amp;&lt;/b&gt;");
2856
289
        }
2857
290
2858
291
        function test_multiInfoPrompt() {
2859
292
            selectUser("multi-info-prompt");
2860
293
            tryCompare(viewShowPromptSpy, "count", 1);
2861
294
            compare(viewShowMessageSpy.count, 3);
2862
295
            compare(viewShowMessageSpy.signalArguments[0][0], "Welcome to Unity Greeter");
2863
296
            compare(viewShowMessageSpy.signalArguments[1][0], "<font color=\"#df382c\">This is an error</font>");
2864
297
            compare(viewShowMessageSpy.signalArguments[2][0], "You should have seen three messages");
2865
298
        }
2866
299
2867
300
        function test_waiting() {
2868
301
            // Make sure we unset 'waiting' on prompt
2869
302
            selectUser("has-password");
2870
303
            compare(greeter.waiting, true);
2871
304
            tryCompare(greeter, "waiting", false);
2872
305
2873
306
            // Make sure we unset 'waiting' on authentication
2874
307
            selectUser("no-password");
2875
308
            compare(greeter.waiting, true);
2876
309
            tryCompare(greeter, "waiting", false);
2877
310
        }
2878
311
2879
312
        function test_locked() {
2880
313
            selectUser("has-password");
2881
314
            compare(view.locked, true);
2882
315
2883
316
            LightDM.Greeter.active = false;
2884
317
            compare(view.locked, false);
2885
318
            LightDM.Greeter.active = true;
2886
319
2887
320
            greeter.forcedUnlock = true;
2888
321
            compare(view.locked, false);
2889
322
            greeter.forcedUnlock = false;
2890
323
2891
324
            selectUser("no-password");
2892
325
            tryCompare(view, "locked", false);
2893
326
            selectUser("has-password");
2894
327
        }
2895
328
2896
329
        function test_fullyShown() {
2897
330
            compare(greeter.fullyShown, true);
2898
331
            view.hide();
2899
332
            compare(greeter.fullyShown, false);
2900
333
        }
2901
334
2902
335
        function test_alphanumeric() {
2903
336
            selectUser("has-password");
2904
337
            compare(view.alphanumeric, true);
2905
338
            selectUser("has-pin");
2906
339
            compare(view.alphanumeric, false);
2907
340
        }
2908
341
2909
342
        function test_background() {
2910
343
            greeter.background = "testing";
2911
344
            compare(view.background, Qt.resolvedUrl("testing"));
2912
345
        }
2913
346
2914
347
        function test_notifyAboutToFocusApp() {
2915
348
            greeter.notifyAboutToFocusApp("fake-app");
2916
349
            compare(viewTryToUnlockSpy.count, 1);
2917
350
            compare(viewTryToUnlockSpy.signalArguments[0][0], false);
2918
351
        }
2919
352
2920
353
        function test_notifyShowingDashFromDrag() {
2921
354
            compare(greeter.notifyShowingDashFromDrag("fake-app"), true);
2922
355
            compare(viewTryToUnlockSpy.count, 1);
2923
356
            compare(viewTryToUnlockSpy.signalArguments[0][0], true);
2924
357
        }
2925
358
2926
359
        function test_dragHandleLeftMargin() {
2927
360
            compare(view.dragHandleLeftMargin, 0);
2928
361
            greeter.dragHandleLeftMargin = 5;
2929
362
            compare(view.dragHandleLeftMargin, 5);
2930
363
        }
2931
364
2932
365
        function test_launcherOffset() {
2933
366
            compare(view.launcherOffset, 0);
2934
367
            greeter.launcherOffset = 5;
2935
368
            tryCompare(view, "launcherOffset", 5);
2936
369
        }
2937
370
2938
371
        function test_laucherOffsetAnimation() {
2939
372
            // Our logic for smoothing launcherOffset when it suddenly goes to
2940
373
            // zero is a bit complicated.  Let's just make sure it works here.
2941
374
2942
375
            launcherOffsetWatcher.target = view;
2943
376
2944
377
            // should follow immediately
2945
378
            launcherOffsetWatcher.values = [];
2946
379
            greeter.launcherOffset = 100;
2947
380
            compare(view.launcherOffset, 100);
2948
381
            compare(launcherOffsetWatcher.values.length, 1);
2949
382
2950
383
            // should interpolate values until it reaches 0
2951
384
            launcherOffsetWatcher.values = [];
2952
385
            greeter.launcherOffset = 0;
2953
386
            tryCompare(view, "launcherOffset", 0);
2954
387
            verify(launcherOffsetWatcher.values.length > 1);
2955
388
            for (var i = 0; i < launcherOffsetWatcher.values.length - 1; ++i) {
2956
389
                verify(launcherOffsetWatcher.values[i] > 0.0);
2957
390
                verify(launcherOffsetWatcher.values[i] < 100.0);
2958
391
            }
2959
392
        }
2960
393
        Connections {
2961
394
            id: launcherOffsetWatcher
2962
395
            property var values: []
2963
396
            onLauncherOffsetChanged: {
2964
397
                values.push(target.launcherOffset);
2965
398
            }
2966
399
        }
2967
400
2968
401
        function test_backgroundTopMargin() {
2969
402
            compare(view.backgroundTopMargin, 0);
2970
403
            greeter.y = 5;
2971
404
            compare(view.backgroundTopMargin, -5);
2972
405
        }
2973
406
2974
407
        function test_differentPrompt() {
2975
408
            selectUser("different-prompt");
2976
409
            tryCompare(viewShowPromptSpy, "count", 1);
2977
410
            compare(viewShowPromptSpy.signalArguments[0][0], "Secret word");
2978
411
            compare(viewShowPromptSpy.signalArguments[0][1], true);
2979
412
            compare(viewShowPromptSpy.signalArguments[0][2], false);
2980
413
        }
2981
414
2982
415
        function test_authError() {
2983
416
            selectUser("auth-error");
2984
417
            tryCompare(viewAuthenticationFailedSpy, "count", 1);
2985
418
            compare(viewShowPromptSpy.count, 0);
2986
419
            compare(view.locked, true);
2987
420
        }
2988
421
2989
422
        function test_statsWelcomeScreen() {
2990
423
            // Test logic in greeter that turns statsWelcomeScreen setting into infographic changes
2991
424
            selectUser("has-password");
2992
425
            compare(LightDM.Infographic.username, "has-password");
2993
426
            AccountsService.statsWelcomeScreen = false;
2994
427
            compare(LightDM.Infographic.username, "");
2995
428
            AccountsService.statsWelcomeScreen = true;
2996
429
            compare(LightDM.Infographic.username, "has-password");
2997
430
        }
2998
431
2999
432
        function test_dbusRequestAuthenticationUser() {
3000
433
            selectUser("no-password");
3001
434
            LightDM.Greeter.requestAuthenticationUser("has-password");
3002
435
            verifySelected("has-password");
3003
436
        }
3004
437
3005
438
        function test_dbusHideGreeter() {
3006
439
            compare(view.required, true);
3007
440
            LightDM.Greeter.hideGreeter();
3008
441
            compare(view.required, false);
3009
442
            compare(greeter.required, false);
3010
443
        }
3011
444
3012
445
        function test_dbusShowGreeterFromHiddenState() {
3013
446
            greeter.hide();
3014
447
            compare(greeter.required, false);
3015
448
3016
449
            LightDM.Greeter.showGreeter();
3017
450
            compare(greeter.required, true);
3018
451
            compare(greeter.fullyShown, true);
3019
452
            view = findChild(greeter, "testView");
3020
453
            compare(view.required, true);
3021
454
3022
455
            // Can't test some of the stuff called on 'view' here because
3023
456
            // the view was torn down and created again.  So the spies missed
3024
457
            // the good stuff while it down.  See next test for more.
3025
458
        }
3026
459
3027
460
        function test_dbusShowGreeterFromShownState() {
3028
461
            selectUser("has-password");
3029
462
            compare(viewResetSpy.count, 1);
3030
463
            tryCompare(viewShowPromptSpy, "count", 1);
3031
464
3032
465
            viewResetSpy.clear();
3033
466
            viewShowPromptSpy.clear();
3034
467
3035
468
            LightDM.Greeter.showGreeter();
3036
469
            compare(viewResetSpy.count, 1);
3037
470
        }
3038
471
    }
3039
472
}
3040
0
473
3041
=== removed file 'tests/qmltests/Greeter/tst_MultiGreeter.qml'
3042
--- tests/qmltests/Greeter/tst_MultiGreeter.qml	2015-02-02 14:28:32 +0000
3043
+++ tests/qmltests/Greeter/tst_MultiGreeter.qml	1970-01-01 00:00:00 +0000
3044
@@ -1,475 +0,0 @@
3045
1
/*
3046
2
 * Copyright 2013 Canonical Ltd.
3047
3
 *
3048
4
 * This program is free software; you can redistribute it and/or modify
3049
5
 * it under the terms of the GNU General Public License as published by
3050
6
 * the Free Software Foundation; version 3.
3051
7
 *
3052
8
 * This program is distributed in the hope that it will be useful,
3053
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3054
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3055
11
 * GNU General Public License for more details.
3056
12
 *
3057
13
 * You should have received a copy of the GNU General Public License
3058
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3059
15
 */
3060
16
3061
17
import QtQuick 2.0
3062
18
import QtQuick.Layouts 1.1
3063
19
import QtTest 1.0
3064
20
import ".."
3065
21
import "../../../qml/Greeter"
3066
22
import Ubuntu.Components 0.1
3067
23
import LightDM 0.1 as LightDM
3068
24
import Unity.Test 0.1 as UT
3069
25
3070
26
Item {
3071
27
    id: root
3072
28
    width: units.gu(140)
3073
29
    height: units.gu(80)
3074
30
3075
31
    QtObject {
3076
32
        id: fakeInputMethod
3077
33
        property bool visible: fakeKeyboard.visible
3078
34
        property var keyboardRectangle: QtObject {
3079
35
            property real x: fakeKeyboard.x
3080
36
            property real y: fakeKeyboard.y
3081
37
            property real width: fakeKeyboard.width
3082
38
            property real height: fakeKeyboard.height
3083
39
        }
3084
40
    }
3085
41
3086
42
    Binding {
3087
43
        target: LightDM.Greeter
3088
44
        property: "mockMode"
3089
45
        value: "full"
3090
46
    }
3091
47
    Binding {
3092
48
        target: LightDM.Users
3093
49
        property: "mockMode"
3094
50
        value: "full"
3095
51
    }
3096
52
3097
53
    Greeter {
3098
54
        id: greeter
3099
55
        width: units.gu(120)
3100
56
        height: root.height
3101
57
        inputMethod: fakeInputMethod
3102
58
        locked: !LightDM.Greeter.authenticated
3103
59
    }
3104
60
3105
61
    Component {
3106
62
        id: greeterComponent
3107
63
        Greeter {
3108
64
            SignalSpy {
3109
65
                objectName: "selectedSpy"
3110
66
                target: parent
3111
67
                signalName: "selected"
3112
68
            }
3113
69
        }
3114
70
    }
3115
71
3116
72
    Rectangle {
3117
73
        id: fakeKeyboard
3118
74
        color: "green"
3119
75
        opacity: 0.7
3120
76
        anchors.bottom: root.bottom
3121
77
        width: greeter.width
3122
78
        height: greeter.height * 0.6
3123
79
        visible: keyboardVisibleCheckbox.checked
3124
80
        Text {
3125
81
            text: "Keyboard Rectangle"
3126
82
            color: "yellow"
3127
83
            font.bold: true
3128
84
            fontSizeMode: Text.Fit
3129
85
            minimumPixelSize: 10; font.pixelSize: 200
3130
86
            verticalAlignment: Text.AlignVCenter
3131
87
            x: (parent.width - width) / 2
3132
88
            y: (parent.height - height) / 2
3133
89
            width: parent.width
3134
90
            height: parent.height
3135
91
        }
3136
92
    }
3137
93
3138
94
    Item {
3139
95
        anchors {
3140
96
            top: root.top
3141
97
            bottom: root.bottom
3142
98
            left: greeter.right
3143
99
            right: root.right
3144
100
        }
3145
101
        RowLayout {
3146
102
            Layout.fillWidth: true
3147
103
            CheckBox {
3148
104
                id: keyboardVisibleCheckbox
3149
105
            }
3150
106
            Label { text: "Keyboard Visible"; anchors.verticalCenter: parent.verticalCenter }
3151
107
        }
3152
108
    }
3153
109
3154
110
    SignalSpy {
3155
111
        id: unlockSpy
3156
112
        target: greeter
3157
113
        signalName: "unlocked"
3158
114
    }
3159
115
3160
116
    SignalSpy {
3161
117
        id: selectionSpy
3162
118
        target: greeter
3163
119
        signalName: "selected"
3164
120
    }
3165
121
3166
122
    SignalSpy {
3167
123
        id: tappedSpy
3168
124
        target: greeter
3169
125
        signalName: "tapped"
3170
126
    }
3171
127
3172
128
    UT.UnityTestCase {
3173
129
        name: "MultiGreeter"
3174
130
        when: windowShown
3175
131
3176
132
        function cleanup() {
3177
133
            keyboardVisibleCheckbox.checked = false;
3178
134
        }
3179
135
3180
136
        function select_index(i) {
3181
137
            // We could be anywhere in list; find target index to know which direction
3182
138
            var userlist = findChild(greeter, "userList")
3183
139
            if (userlist.currentIndex == i)
3184
140
                keyClick(Qt.Key_Escape) // Reset state if we're not moving
3185
141
            while (userlist.currentIndex != i) {
3186
142
                var next = userlist.currentIndex + 1
3187
143
                if (userlist.currentIndex > i) {
3188
144
                    next = userlist.currentIndex - 1
3189
145
                }
3190
146
                var account = findChild(greeter, "username"+next)
3191
147
                mouseClick(account, 1, 1)
3192
148
                tryCompare(userlist, "currentIndex", next)
3193
149
                tryCompare(userlist, "movingInternally", false)
3194
150
            }
3195
151
        }
3196
152
3197
153
        function select_user(name) {
3198
154
            // We could be anywhere in list; find target index to know which direction
3199
155
            for (var i = 0; i < greeter.model.count; i++) {
3200
156
                if (greeter.model.data(i, LightDM.UserRoles.NameRole) == name) {
3201
157
                    break
3202
158
                }
3203
159
            }
3204
160
            if (i == greeter.model.count) {
3205
161
                fail("Didn't find name")
3206
162
                return -1
3207
163
            }
3208
164
            select_index(i)
3209
165
            return i
3210
166
        }
3211
167
3212
168
        function test_properties() {
3213
169
            compare(greeter.multiUser, true)
3214
170
            compare(greeter.narrowMode, false)
3215
171
        }
3216
172
3217
173
        function test_cycle_data() {
3218
174
            var data = new Array()
3219
175
            for (var i = 0; i < greeter.model.count; i++) {
3220
176
                data[i] = {tag: greeter.model.data(i, LightDM.UserRoles.NameRole), uid: i }
3221
177
            }
3222
178
            return data
3223
179
        }
3224
180
3225
181
        function test_cycle(data) {
3226
182
            selectionSpy.clear();
3227
183
            var userList = findChild(greeter, "userList")
3228
184
            var waitForSignal = data.uid != 0 && userList.currentIndex != data.uid
3229
185
            select_index(data.uid)
3230
186
            tryCompare(userList, "currentIndex", data.uid)
3231
187
            tryCompare(greeter, "locked", data.tag !== "no-password")
3232
188
            if (waitForSignal) {
3233
189
                selectionSpy.wait()
3234
190
                tryCompare(selectionSpy, "count", 1)
3235
191
            }
3236
192
        }
3237
193
3238
194
        function test_unlock_password() {
3239
195
            select_user("no-password") // to guarantee a selected signal
3240
196
            unlockSpy.clear()
3241
197
            select_user("has-password")
3242
198
            var passwordInput = findChild(greeter, "passwordInput")
3243
199
            tryCompare(passwordInput, "opacity", 1)
3244
200
            mouseClick(passwordInput, 1, 1)
3245
201
            compare(unlockSpy.count, 0)
3246
202
            typeString("password")
3247
203
            keyClick(Qt.Key_Enter)
3248
204
            unlockSpy.wait()
3249
205
        }
3250
206
3251
207
        function test_unlock_wrong_password() {
3252
208
            select_user("no-password") // to guarantee a selected signal
3253
209
            unlockSpy.clear()
3254
210
            select_user("has-password")
3255
211
            wait(0) // spin event loop to start any pending animations
3256
212
            var passwordInput = findChild(greeter, "passwordInput")
3257
213
            tryCompare(passwordInput, "opacity", 1) // wait for opacity animation to be finished
3258
214
            mouseClick(passwordInput, 1, 1)
3259
215
            compare(unlockSpy.count, 0)
3260
216
            typeString("wr0ng p4ssw0rd")
3261
217
            keyClick(Qt.Key_Enter)
3262
218
            compare(unlockSpy.count, 0)
3263
219
        }
3264
220
3265
221
        function test_unlock_no_password() {
3266
222
            unlockSpy.clear()
3267
223
            select_user("no-password")
3268
224
            var passwordInput = findChild(greeter, "passwordInput")
3269
225
            tryCompare(passwordInput, "opacity", 1)
3270
226
            mouseClick(passwordInput, 1, 1)
3271
227
            unlockSpy.wait()
3272
228
            compare(unlockSpy.count, 1)
3273
229
        }
3274
230
3275
231
        function test_empty_name() {
3276
232
            for (var i = 0; i < greeter.model.count; i++) {
3277
233
                if (greeter.model.data(i, LightDM.UserRoles.NameRole) == "empty-name") {
3278
234
                    compare(greeter.model.data(i, LightDM.UserRoles.RealNameRole), greeter.model.data(i, LightDM.UserRoles.NameRole))
3279
235
                    return
3280
236
                }
3281
237
            }
3282
238
            fail("Didn't find empty-name")
3283
239
        }
3284
240
3285
241
        function test_auth_error() {
3286
242
            select_user("auth-error")
3287
243
            var passwordInput = findChild(greeter, "passwordInput")
3288
244
            tryCompare(passwordInput, "placeholderText", "Retry")
3289
245
        }
3290
246
3291
247
        function test_different_prompt() {
3292
248
            select_user("different-prompt")
3293
249
            var passwordInput = findChild(greeter, "passwordInput")
3294
250
            tryCompare(passwordInput, "placeholderText", "Secret word")
3295
251
        }
3296
252
3297
253
        function test_no_response() {
3298
254
            unlockSpy.clear()
3299
255
            select_user("no-response")
3300
256
            var passwordInput = findChild(greeter, "passwordInput")
3301
257
            tryCompare(passwordInput, "opacity", 1)
3302
258
            mouseClick(passwordInput, 1, 1)
3303
259
            compare(unlockSpy.count, 0)
3304
260
            typeString("password")
3305
261
            keyClick(Qt.Key_Enter)
3306
262
            tryCompare(passwordInput, "enabled", false)
3307
263
            keyClick(Qt.Key_Escape)
3308
264
            tryCompare(passwordInput, "enabled", true)
3309
265
            compare(unlockSpy.count, 0)
3310
266
        }
3311
267
3312
268
        function test_two_factor_correct() {
3313
269
            unlockSpy.clear()
3314
270
            select_user("two-factor")
3315
271
            var passwordInput = findChild(greeter, "passwordInput")
3316
272
            tryCompare(passwordInput, "opacity", 1)
3317
273
            tryCompare(passwordInput, "echoMode", TextInput.Password)
3318
274
            tryCompare(passwordInput, "placeholderText", "Password")
3319
275
            mouseClick(passwordInput, 1, 1)
3320
276
            compare(unlockSpy.count, 0)
3321
277
            typeString("password")
3322
278
            keyClick(Qt.Key_Enter)
3323
279
            tryCompare(passwordInput, "echoMode", TextInput.Normal)
3324
280
            tryCompare(passwordInput, "placeholderText", "otp")
3325
281
            tryCompare(passwordInput, "enabled", true)
3326
282
            typeString("otp")
3327
283
            keyClick(Qt.Key_Enter)
3328
284
            unlockSpy.wait()
3329
285
        }
3330
286
3331
287
        function test_two_factor_wrong1() {
3332
288
            unlockSpy.clear()
3333
289
            select_user("two-factor")
3334
290
            var passwordInput = findChild(greeter, "passwordInput")
3335
291
            tryCompare(passwordInput, "opacity", 1)
3336
292
            tryCompare(passwordInput, "placeholderText", "Password")
3337
293
            mouseClick(passwordInput, 1, 1)
3338
294
            compare(unlockSpy.count, 0)
3339
295
            typeString("wr0ng p4ssw0rd")
3340
296
            keyClick(Qt.Key_Enter)
3341
297
            tryCompare(passwordInput, "placeholderText", "Password")
3342
298
            tryCompare(passwordInput, "enabled", true)
3343
299
            compare(unlockSpy.count, 0)
3344
300
        }
3345
301
3346
302
        function test_two_factor_wrong2() {
3347
303
            unlockSpy.clear()
3348
304
            select_user("two-factor")
3349
305
            var passwordInput = findChild(greeter, "passwordInput")
3350
306
            tryCompare(passwordInput, "opacity", 1)
3351
307
            tryCompare(passwordInput, "placeholderText", "Password")
3352
308
            mouseClick(passwordInput, 1, 1)
3353
309
            compare(unlockSpy.count, 0)
3354
310
            typeString("password")
3355
311
            keyClick(Qt.Key_Enter)
3356
312
            tryCompare(passwordInput, "placeholderText", "otp")
3357
313
            tryCompare(passwordInput, "enabled", true)
3358
314
            typeString("wr0ng p4ssw0rd")
3359
315
            keyClick(Qt.Key_Enter)
3360
316
            tryCompare(passwordInput, "placeholderText", "Password")
3361
317
            tryCompare(passwordInput, "enabled", true)
3362
318
            compare(unlockSpy.count, 0)
3363
319
        }
3364
320
3365
321
        function test_unicode() {
3366
322
            var index = select_user("unicode")
3367
323
            var label = findChild(greeter, "username"+index)
3368
324
            tryCompare(label, "text", "가나다라마")
3369
325
        }
3370
326
3371
327
        function test_long_name() {
3372
328
            var index = select_user("long-name")
3373
329
            var label = findChild(greeter, "username"+index)
3374
330
            tryCompare(label, "truncated", true)
3375
331
        }
3376
332
3377
333
        function test_info_prompt() {
3378
334
            select_user("info-prompt")
3379
335
            var label = findChild(greeter, "infoLabel")
3380
336
            tryCompare(label, "text", "Welcome to Unity Greeter")
3381
337
            tryCompare(label, "opacity", 1)
3382
338
            tryCompare(label, "clip", true)
3383
339
            tryCompareFunction(function() {return label.contentWidth > label.width;}, false) // c.f. wide-info-prompt
3384
340
            var passwordInput = findChild(greeter, "passwordInput")
3385
341
            mouseClick(passwordInput, 1, 1)
3386
342
            keyClick(Qt.Key_Escape)
3387
343
        }
3388
344
3389
345
        function test_info_prompt_escape() {
3390
346
            select_user("info-prompt")
3391
347
            var passwordInput = findChild(greeter, "passwordInput")
3392
348
            mouseClick(passwordInput, 1, 1)
3393
349
            keyClick(Qt.Key_Escape)
3394
350
            var label = findChild(greeter, "infoLabel")
3395
351
            tryCompare(label, "text", "Welcome to Unity Greeter")
3396
352
            tryCompare(label, "opacity", 1)
3397
353
        }
3398
354
3399
355
        function test_wide_info_prompt() {
3400
356
            select_user("wide-info-prompt")
3401
357
            var label = findChild(greeter, "infoLabel")
3402
358
            tryCompare(label, "clip", true)
3403
359
            tryCompareFunction(function() {return label.contentWidth > label.width;}, true)
3404
360
        }
3405
361
3406
362
        function test_html_info_prompt() {
3407
363
            select_user("html-info-prompt")
3408
364
            var label = findChild(greeter, "infoLabel")
3409
365
            tryCompare(label, "text", "&lt;b&gt;&amp;&lt;/b&gt;")
3410
366
        }
3411
367
3412
368
        function test_long_info_prompt() {
3413
369
            select_user("long-info-prompt")
3414
370
            var label = findChild(greeter, "infoLabel")
3415
371
            tryCompare(label, "text", "Welcome to Unity Greeter<br><br>We like to annoy you with super ridiculously long messages.<br>Like this one<br><br>This is the last line of a multiple line message.")
3416
372
            tryCompare(label, "textFormat", Text.StyledText) // for parsing above correctly
3417
373
            tryCompare(label, "clip", true)
3418
374
            tryCompareFunction(function() {return label.contentWidth > label.width;}, true)
3419
375
        }
3420
376
3421
377
        function test_multi_info_prompt() {
3422
378
            select_user("multi-info-prompt")
3423
379
            var label = findChild(greeter, "infoLabel")
3424
380
            tryCompare(label, "text", "Welcome to Unity Greeter<br><font color=\"#df382c\">This is an error</font><br>You should have seen three messages")
3425
381
            tryCompare(label, "textFormat", Text.StyledText) // for parsing above correctly
3426
382
        }
3427
383
3428
384
        function test_bg_color() {
3429
385
            var index = select_user("color-background")
3430
386
            compare(greeter.model.data(index, LightDM.UserRoles.BackgroundPathRole), "data:image/svg+xml,<svg><rect width='100%' height='100%' fill='#dd4814'/></svg>")
3431
387
        }
3432
388
3433
389
        function test_bg_none() {
3434
390
            var index = select_user("no-background")
3435
391
            compare(greeter.model.data(index, LightDM.UserRoles.BackgroundPathRole), "")
3436
392
        }
3437
393
3438
394
        function test_tappedSignal_data() {
3439
395
            return [
3440
396
                {tag: "left", posX: units.gu(2)},
3441
397
                {tag: "right", posX: greeter.width - units.gu(2)}
3442
398
            ]
3443
399
        }
3444
400
3445
401
        function test_tappedSignal(data) {
3446
402
            select_user("no-password");
3447
403
            tappedSpy.clear();
3448
404
            tap(greeter, data.posX, greeter.height - units.gu(1))
3449
405
            tryCompare(tappedSpy, "count", 1)
3450
406
        }
3451
407
3452
408
        function test_teaseLockedUnlocked_data() {
3453
409
            return [
3454
410
                {tag: "unlocked", locked: false, narrow: false},
3455
411
                {tag: "locked", locked: true, narrow: false},
3456
412
            ];
3457
413
        }
3458
414
3459
415
        function test_teaseLockedUnlocked(data) {
3460
416
            tappedSpy.clear()
3461
417
            greeter.locked = data.locked;
3462
418
3463
419
            tap(greeter, greeter.width - units.gu(5), greeter.height - units.gu(1));
3464
420
3465
421
            if (!data.locked || data.narrow) {
3466
422
                tappedSpy.wait()
3467
423
                tryCompare(tappedSpy, "count", 1);
3468
424
            } else {
3469
425
                // waiting 100ms to make sure nothing happens
3470
426
                wait(100);
3471
427
                compare(tappedSpy.count, 0, "Greeter teasing not disabled even though it's locked.");
3472
428
            }
3473
429
3474
430
            // Reset value
3475
431
            greeter.locked = false;
3476
432
        }
3477
433
3478
434
        function test_dbus_set_active_entry() {
3479
435
            select_user("no-password") // to guarantee a selected signal
3480
436
            selectionSpy.clear()
3481
437
            LightDM.Greeter.requestAuthenticationUser("has-password")
3482
438
3483
439
            selectionSpy.wait()
3484
440
            tryCompare(selectionSpy, "count", 1)
3485
441
3486
442
            var userlist = findChild(greeter, "userList")
3487
443
            compare(greeter.model.data(userlist.currentIndex, LightDM.UserRoles.NameRole), "has-password")
3488
444
        }
3489
445
3490
446
        function test_initial_selected_signal() {
3491
447
            var greeterObj = greeterComponent.createObject(this)
3492
448
            var spy = findChild(greeterObj, "selectedSpy")
3493
449
            spy.wait()
3494
450
            tryCompare(spy, "count", 1)
3495
451
            greeterObj.destroy()
3496
452
        }
3497
453
3498
454
        function test_login_list_not_covered_by_keyboard() {
3499
455
            var loginList = findChild(greeter, "loginLoader").item;
3500
456
            compare(loginList.height, greeter.height);
3501
457
3502
458
            // when the vkb shows up, loginList is moved up to remain fully uncovered
3503
459
3504
460
            keyboardVisibleCheckbox.checked = true;
3505
461
3506
462
            tryCompare(loginList, "height", greeter.height - fakeInputMethod.keyboardRectangle.height);
3507
463
            tryCompareFunction( function() {
3508
464
                var loginListRect = loginList.mapToItem(greeter, 0, 0, loginList.width, loginList.height);
3509
465
                return loginListRect.y + loginListRect.height <= fakeInputMethod.keyboardRectangle.y;
3510
466
            }, true);
3511
467
3512
468
            // once the vkb goes away, loginList goes back to its full height
3513
469
3514
470
            keyboardVisibleCheckbox.checked = false;
3515
471
3516
472
            tryCompare(loginList, "height", greeter.height);
3517
473
        }
3518
474
    }
3519
475
}
3520
476
0
3521
=== added file 'tests/qmltests/Greeter/tst_NarrowView.qml'
3522
--- tests/qmltests/Greeter/tst_NarrowView.qml	1970-01-01 00:00:00 +0000
3523
+++ tests/qmltests/Greeter/tst_NarrowView.qml	2015-02-23 15:44:00 +0000
3524
@@ -0,0 +1,522 @@
3525
1
/*
3526
2
 * Copyright 2014 Canonical Ltd.
3527
3
 *
3528
4
 * This program is free software; you can redistribute it and/or modify
3529
5
 * it under the terms of the GNU General Public License as published by
3530
6
 * the Free Software Foundation; version 3.
3531
7
 *
3532
8
 * This program is distributed in the hope that it will be useful,
3533
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3534
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
3535
11
 * GNU General Public License for more details.
3536
12
 *
3537
13
 * You should have received a copy of the GNU General Public License
3538
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
3539
15
 */
3540
16
3541
17
import QtQuick 2.0
3542
18
import QtTest 1.0
3543
19
import ".."
3544
20
import "../../../qml/Greeter"
3545
21
import LightDM 0.1 as LightDM
3546
22
import Ubuntu.Components 0.1
3547
23
import Unity.Test 0.1 as UT
3548
24
3549
25
Item {
3550
26
    id: root
3551
27
    width: units.gu(90)
3552
28
    height: units.gu(80)
3553
29
3554
30
    Row {
3555
31
        anchors.fill: parent
3556
32
        Loader {
3557
33
            id: loader
3558
34
            width: root.width - controls.width
3559
35
            height: parent.height
3560
36
3561
37
            property bool itemDestroyed: false
3562
38
            sourceComponent: Component {
3563
39
                NarrowView {
3564
40
                    background: Qt.resolvedUrl("../../../qml/graphics/phone_background.jpg")
3565
41
                    userModel: LightDM.Users
3566
42
                    infographicModel: LightDM.Infographic
3567
43
3568
44
                    launcherOffset: parseFloat(launcherOffsetField.text)
3569
45
                    currentIndex: parseInt(currentIndexField.text, 10)
3570
46
                    delayMinutes: parseInt(delayMinutesField.text, 10)
3571
47
                    backgroundTopMargin: parseFloat(backgroundTopMarginField.text)
3572
48
                    locked: lockedCheckBox.checked
3573
49
                    alphanumeric: alphanumericCheckBox.checked
3574
50
3575
51
                    Component.onDestruction: {
3576
52
                        loader.itemDestroyed = true
3577
53
                    }
3578
54
3579
55
                    onSelected: {
3580
56
                        currentIndexField.text = index;
3581
57
                    }
3582
58
                }
3583
59
            }
3584
60
        }
3585
61
3586
62
        Rectangle {
3587
63
            id: controls
3588
64
            color: "white"
3589
65
            width: units.gu(40)
3590
66
            height: parent.height
3591
67
3592
68
            Column {
3593
69
                anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
3594
70
                spacing: units.gu(1)
3595
71
3596
72
                Row {
3597
73
                    Button {
3598
74
                        text: "Show Last Chance"
3599
75
                        onClicked: loader.item.showLastChance()
3600
76
                    }
3601
77
                }
3602
78
                Row {
3603
79
                    Button {
3604
80
                        text: "Hide"
3605
81
                        onClicked: loader.item.hide()
3606
82
                    }
3607
83
                }
3608
84
                Row {
3609
85
                    Button {
3610
86
                        text: "Reset"
3611
87
                        onClicked: loader.item.reset()
3612
88
                    }
3613
89
                }
3614
90
                Row {
3615
91
                    Button {
3616
92
                        text: "Show Message"
3617
93
                        onClicked: loader.item.showMessage(messageField.text)
3618
94
                    }
3619
95
                    TextField {
3620
96
                        id: messageField
3621
97
                        width: units.gu(10)
3622
98
                        text: ""
3623
99
                    }
3624
100
                }
3625
101
                Row {
3626
102
                    Button {
3627
103
                        text: "Show Prompt"
3628
104
                        onClicked: loader.item.showPrompt(promptField.text, isSecretCheckBox.checked, isDefaultPromptCheckBox.checked)
3629
105
                    }
3630
106
                    TextField {
3631
107
                        id: promptField
3632
108
                        width: units.gu(10)
3633
109
                        text: ""
3634
110
                    }
3635
111
                    CheckBox {
3636
112
                        id: isSecretCheckBox
3637
113
                    }
3638
114
                    Label {
3639
115
                        text: "secret"
3640
116
                    }
3641
117
                    CheckBox {
3642
118
                        id: isDefaultPromptCheckBox
3643
119
                    }
3644
120
                    Label {
3645
121
                        text: "default"
3646
122
                    }
3647
123
                }
3648
124
                Row {
3649
125
                    Button {
3650
126
                        text: "Authenticated"
3651
127
                        onClicked: {
3652
128
                            if (successCheckBox.checked) {
3653
129
                                loader.item.notifyAuthenticationSucceeded();
3654
130
                            } else {
3655
131
                                loader.item.notifyAuthenticationFailed();
3656
132
                            }
3657
133
                        }
3658
134
                    }
3659
135
                    CheckBox {
3660
136
                        id: successCheckBox
3661
137
                    }
3662
138
                    Label {
3663
139
                        text: "success"
3664
140
                    }
3665
141
                }
3666
142
                Row {
3667
143
                    Button {
3668
144
                        text: "Try To Unlock"
3669
145
                        onClicked: loader.item.tryToUnlock(toTheRightCheckBox.checked)
3670
146
                    }
3671
147
                    CheckBox {
3672
148
                        id: toTheRightCheckBox
3673
149
                    }
3674
150
                    Label {
3675
151
                        text: "toTheRight"
3676
152
                    }
3677
153
                }
3678
154
                Row {
3679
155
                    TextField {
3680
156
                        id: launcherOffsetField
3681
157
                        width: units.gu(10)
3682
158
                        text: "0"
3683
159
                    }
3684
160
                    Label {
3685
161
                        text: "launcherOffset"
3686
162
                    }
3687
163
                }
3688
164
                Row {
3689
165
                    TextField {
3690
166
                        id: currentIndexField
3691
167
                        width: units.gu(10)
3692
168
                        text: "0"
3693
169
                    }
3694
170
                    Label {
3695
171
                        text: "currentIndex"
3696
172
                    }
3697
173
                }
3698
174
                Row {
3699
175
                    TextField {
3700
176
                        id: delayMinutesField
3701
177
                        width: units.gu(10)
3702
178
                        text: "0"
3703
179
                    }
3704
180
                    Label {
3705
181
                        text: "delayMinutes"
3706
182
                    }
3707
183
                }
3708
184
                Row {
3709
185
                    TextField {
3710
186
                        id: backgroundTopMarginField
3711
187
                        width: units.gu(10)
3712
188
                        text: "0"
3713
189
                    }
3714
190
                    Label {
3715
191
                        text: "backgroundTopMargin"
3716
192
                    }
3717
193
                }
3718
194
                Row {
3719
195
                    CheckBox {
3720
196
                        id: lockedCheckBox
3721
197
                    }
3722
198
                    Label {
3723
199
                        text: "locked"
3724
200
                    }
3725
201
                }
3726
202
                Row {
3727
203
                    CheckBox {
3728
204
                        id: alphanumericCheckBox
3729
205
                    }
3730
206
                    Label {
3731
207
                        text: "alphanumeric"
3732
208
                    }
3733
209
                }
3734
210
                Row {
3735
211
                    Label {
3736
212
                        text: "selected: " + selectedSpy.count
3737
213
                    }
3738
214
                }
3739
215
                Row {
3740
216
                    Label {
3741
217
                        text: "responded: " + respondedSpy.count
3742
218
                    }
3743
219
                }
3744
220
                Row {
3745
221
                    Label {
3746
222
                        text: "teased: " + teaseSpy.count
3747
223
                    }
3748
224
                }
3749
225
                Row {
3750
226
                    Label {
3751
227
                        text: "emergency: " + emergencySpy.count
3752
228
                    }
3753
229
                }
3754
230
                Row {
3755
231
                    Button {
3756
232
                        text: "Reload View"
3757
233
                        onClicked: {
3758
234
                            loader.active = false;
3759
235
                            loader.active = true;
3760
236
                        }
3761
237
                    }
3762
238
                }
3763
239
            }
3764
240
        }
3765
241
    }
3766
242
3767
243
    Binding {
3768
244
        target: LightDM.Infographic
3769
245
        property: "username"
3770
246
        value: "single"
3771
247
    }
3772
248
3773
249
    SignalSpy {
3774
250
        id: selectedSpy
3775
251
        target: loader.item
3776
252
        signalName: "selected"
3777
253
    }
3778
254
3779
255
    SignalSpy {
3780
256
        id: respondedSpy
3781
257
        target: loader.item
3782
258
        signalName: "responded"
3783
259
    }
3784
260
3785
261
    SignalSpy {
3786
262
        id: teaseSpy
3787
263
        target: loader.item
3788
264
        signalName: "tease"
3789
265
    }
3790
266
3791
267
    SignalSpy {
3792
268
        id: emergencySpy
3793
269
        target: loader.item
3794
270
        signalName: "emergencyCall"
3795
271
    }
3796
272
3797
273
    SignalSpy {
3798
274
        id: infographicDataChangedSpy
3799
275
        target: LightDM.Infographic
3800
276
        signalName: "dataChanged"
3801
277
    }
3802
278
3803
279
    UT.UnityTestCase {
3804
280
        name: "NarrowView"
3805
281
        when: windowShown
3806
282
3807
283
        property Item view: loader.status === Loader.Ready ? loader.item : null
3808
284
3809
285
        function init() {
3810
286
            view.currentIndex = 0; // break binding with text field
3811
287
3812
288
            selectedSpy.clear();
3813
289
            respondedSpy.clear();
3814
290
            teaseSpy.clear();
3815
291
            emergencySpy.clear();
3816
292
            infographicDataChangedSpy.clear();
3817
293
        }
3818
294
3819
295
        function cleanup() {
3820
296
            loader.itemDestroyed = false;
3821
297
            loader.active = false;
3822
298
            tryCompare(loader, "status", Loader.Null);
3823
299
            tryCompare(loader, "item", null);
3824
300
            tryCompare(loader, "itemDestroyed", true);
3825
301
            loader.active = true;
3826
302
            tryCompare(loader, "status", Loader.Ready);
3827
303
            removeTimeConstraintsFromDirectionalDragAreas(loader.item);
3828
304
        }
3829
305
3830
306
        function swipeAwayCover(toTheRight) {
3831
307
            if (toTheRight === undefined) {
3832
308
                toTheRight = false;
3833
309
            }
3834
310
3835
311
            tryCompare(view, "fullyShown", true);
3836
312
            var touchY = view.height / 2;
3837
313
            if (toTheRight) {
3838
314
                touchFlick(view, 0, touchY, view.width, touchY);
3839
315
            } else {
3840
316
                touchFlick(view, view.width, touchY, 0, touchY);
3841
317
            }
3842
318
            var coverPage = findChild(view, "coverPage");
3843
319
            tryCompare(coverPage, "showProgress", 0);
3844
320
            waitForRendering(view);
3845
321
        }
3846
322
3847
323
        function enterPin(pin) {
3848
324
            for (var i = 0; i < pin.length; ++i) {
3849
325
                var character = pin.charAt(i);
3850
326
                var button = findChild(view, "pinPadButton" + character);
3851
327
                tap(button);
3852
328
            }
3853
329
        }
3854
330
3855
331
        function test_tease_data() {
3856
332
            return [
3857
333
                {tag: "left", x: 0, offset: 0, count: 1},
3858
334
                {tag: "leftWithOffsetPass", x: 10, offset: 10, count: 1},
3859
335
                {tag: "leftWithOffsetFail", x: 9, offset: 10, count: 0},
3860
336
                {tag: "right", x: view.width, offset: 0, count: 1},
3861
337
            ]
3862
338
        }
3863
339
        function test_tease(data) {
3864
340
            view.dragHandleLeftMargin = data.offset;
3865
341
            tap(view, data.x, 0);
3866
342
            compare(teaseSpy.count, data.count);
3867
343
        }
3868
344
3869
345
        function test_respondedWithPin() {
3870
346
            view.locked = true;
3871
347
            swipeAwayCover();
3872
348
            enterPin("1234");
3873
349
            compare(respondedSpy.count, 1);
3874
350
            compare(respondedSpy.signalArguments[0][0], "1234");
3875
351
        }
3876
352
3877
353
        function test_respondedWithPassphrase() {
3878
354
            view.locked = true;
3879
355
            view.alphanumeric = true;
3880
356
            swipeAwayCover();
3881
357
            typeString("test");
3882
358
            keyClick(Qt.Key_Enter);
3883
359
            compare(respondedSpy.count, 1);
3884
360
            compare(respondedSpy.signalArguments[0][0], "test");
3885
361
        }
3886
362
3887
363
        function test_respondedWithSwipe_data() {
3888
364
            return [
3889
365
                {tag: "left", toTheRight: false, hiddenX: -view.width},
3890
366
                {tag: "right", toTheRight: true, hiddenX: view.width},
3891
367
            ];
3892
368
        }
3893
369
        function test_respondedWithSwipe(data) {
3894
370
            swipeAwayCover(data.toTheRight);
3895
371
            var coverPage = findChild(view, "coverPage");
3896
372
            compare(coverPage.x, data.hiddenX);
3897
373
            compare(respondedSpy.count, 1);
3898
374
            compare(respondedSpy.signalArguments[0][0], "");
3899
375
        }
3900
376
3901
377
        function test_emergencyCall() {
3902
378
            view.locked = true;
3903
379
            swipeAwayCover();
3904
380
            var emergencyCallLabel = findChild(view, "emergencyCallLabel");
3905
381
            tap(emergencyCallLabel);
3906
382
            compare(emergencySpy.count, 1);
3907
383
        }
3908
384
3909
385
        function test_fullyShown() {
3910
386
            tryCompare(view, "fullyShown", true);
3911
387
            swipeAwayCover();
3912
388
            tryCompare(view, "fullyShown", false);
3913
389
            view.locked = true;
3914
390
            tryCompare(view, "fullyShown", true);
3915
391
            view.locked = false;
3916
392
            tryCompare(view, "fullyShown", false);
3917
393
        }
3918
394
3919
395
        function test_required() {
3920
396
            tryCompare(view, "required", true);
3921
397
            swipeAwayCover();
3922
398
            tryCompare(view, "required", false);
3923
399
            view.locked = true;
3924
400
            tryCompare(view, "required", true);
3925
401
            view.locked = false;
3926
402
            tryCompare(view, "required", false);
3927
403
        }
3928
404
3929
405
        function test_tryToUnlock() {
3930
406
            var coverPage = findChild(view, "coverPage");
3931
407
            tryCompare(coverPage, "showProgress", 1);
3932
408
            compare(view.tryToUnlock(false), true);
3933
409
            tryCompare(coverPage, "showProgress", 0);
3934
410
            compare(view.tryToUnlock(false), false);
3935
411
        }
3936
412
3937
413
        /*
3938
414
            Regression test for https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1388359
3939
415
            "User metrics can no longer be changed by double tap"
3940
416
        */
3941
417
        function test_doubleTapSwitchesToNextInfographic() {
3942
418
            var infographicPrivate = findInvisibleChild(view, "infographicPrivate");
3943
419
            verify(infographicPrivate);
3944
420
3945
421
            // wait for the UI to settle down before double tapping it
3946
422
            tryCompare(infographicPrivate, "animating", false);
3947
423
3948
424
            var dataCircle = findChild(view, "dataCircle");
3949
425
            verify(dataCircle);
3950
426
3951
427
            tap(dataCircle);
3952
428
            wait(1);
3953
429
            tap(dataCircle);
3954
430
3955
431
            tryCompare(infographicDataChangedSpy, "count", 1);
3956
432
        }
3957
433
3958
434
        function test_movesBackIntoPlaceWhenNotDraggedFarEnough() {
3959
435
            var coverPage = findChild(view, "coverPage");
3960
436
3961
437
            var dragEvaluator = findInvisibleChild(coverPage, "edgeDragEvaluator");
3962
438
            verify(dragEvaluator);
3963
439
3964
440
            // Make it easier to get a rejection/rollback. Otherwise would have to inject
3965
441
            // a fake timer into dragEvaluator.
3966
442
            // Afterall, we are testing if the CoverPage indeed moves back on a
3967
443
            // rollback decision, not the drag evaluation itself.
3968
444
            dragEvaluator.minDragDistance = dragEvaluator.maxDragDistance / 2;
3969
445
3970
446
            // it starts as fully shown
3971
447
            compare(coverPage.x, 0);
3972
448
3973
449
            // then we drag it a bit
3974
450
            var startX = coverPage.width - 1;
3975
451
            var touchY = coverPage.height / 2;
3976
452
            var dragXDelta = -(dragEvaluator.minDragDistance * 0.3);
3977
453
            touchFlick(coverPage,
3978
454
                       startX , touchY, // start pos
3979
455
                       startX + dragXDelta, touchY, // end pos
3980
456
                       true /* beginTouch */, false /* endTouch  */);
3981
457
3982
458
            // which should make it move a bit
3983
459
            tryCompareFunction(function() {return coverPage.x < 0;}, true);
3984
460
3985
461
            // then we release it
3986
462
            touchRelease(coverPage, startX + dragXDelta, touchY);
3987
463
3988
464
            // which should make it move back into its original position as it didn't move
3989
465
            // far enough to have it hidden
3990
466
            tryCompare(coverPage, "x", 0);
3991
467
        }
3992
468
3993
469
        function test_dragToHide_data() {
3994
470
            return [
3995
471
                {tag: "left", startX: view.width * 0.95, endX: view.width * 0.1, hiddenX: -view.width},
3996
472
                {tag: "right", startX: view.width * 0.1, endX: view.width * 0.95, hiddenX: view.width},
3997
473
            ];
3998
474
        }
3999
475
        function test_dragToHide(data) {
4000
476
            var coverPage = findChild(view, "coverPage");
4001
477
            compare(coverPage.x, 0);
4002
478
            compare(coverPage.visible, true);
4003
479
            compare(coverPage.shown, true);
4004
480
            compare(coverPage.showProgress, 1);
4005
481
            compare(view.fullyShown, true);
4006
482
4007
483
            touchFlick(view,
4008
484
                    data.startX, view.height / 2, // start pos
4009
485
                    data.endX, view.height / 2); // end pos
4010
486
4011
487
            tryCompare(coverPage, "x", data.hiddenX);
4012
488
            tryCompare(coverPage, "visible", false);
4013
489
            tryCompare(coverPage, "shown", false);
4014
490
            tryCompare(coverPage, "showProgress", 0);
4015
491
            compare(view.fullyShown, false);
4016
492
        }
4017
493
4018
494
        function test_hiddenViewRemainsHiddenAfterResize_data() {
4019
495
            return [
4020
496
                {tag: "left", startX: view.width * 0.95, endX: view.width * 0.1},
4021
497
                {tag: "right", startX: view.width * 0.1, endX: view.width * 0.95},
4022
498
            ];
4023
499
        }
4024
500
        function test_hiddenViewRemainsHiddenAfterResize(data) {
4025
501
            touchFlick(view,
4026
502
                    data.startX, view.height / 2, // start pos
4027
503
                    data.endX, view.height / 2); // end pos
4028
504
4029
505
            var coverPage = findChild(view, "coverPage");
4030
506
            tryCompare(coverPage, "x", data.tag == "left" ? -view.width : view.width);
4031
507
            tryCompare(coverPage, "visible", false);
4032
508
            tryCompare(coverPage, "shown", false);
4033
509
            tryCompare(coverPage, "showProgress", 0);
4034
510
4035
511
            // flip dimensions to simulate an orientation change
4036
512
            view.width = loader.height;
4037
513
            view.height = loader.width;
4038
514
4039
515
            // All properties should remain consistent
4040
516
            tryCompare(coverPage, "x", data.tag == "left" ? -view.width : view.width);
4041
517
            tryCompare(coverPage, "visible", false);
4042
518
            tryCompare(coverPage, "shown", false);
4043
519
            tryCompare(coverPage, "showProgress", 0);
4044
520
        }
4045
521
    }
4046
522
}
4047
0
523
4048
=== removed file 'tests/qmltests/Greeter/tst_SingleGreeter.qml'
4049
--- tests/qmltests/Greeter/tst_SingleGreeter.qml	2014-12-08 18:08:38 +0000
4050
+++ tests/qmltests/Greeter/tst_SingleGreeter.qml	1970-01-01 00:00:00 +0000
4051
@@ -1,244 +0,0 @@
4052
1
/*
4053
2
 * Copyright 2013 Canonical Ltd.
4054
3
 *
4055
4
 * This program is free software; you can redistribute it and/or modify
4056
5
 * it under the terms of the GNU General Public License as published by
4057
6
 * the Free Software Foundation; version 3.
4058
7
 *
4059
8
 * This program is distributed in the hope that it will be useful,
4060
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4061
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4062
11
 * GNU General Public License for more details.
4063
12
 *
4064
13
 * You should have received a copy of the GNU General Public License
4065
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4066
15
 */
4067
16
4068
17
import QtQuick 2.0
4069
18
import QtTest 1.0
4070
19
import ".."
4071
20
import "../../../qml/Greeter"
4072
21
import AccountsService 0.1
4073
22
import LightDM 0.1 as LightDM
4074
23
import Ubuntu.Components 0.1
4075
24
import Unity.Test 0.1 as UT
4076
25
4077
26
Rectangle {
4078
27
    color: "darkblue"
4079
28
    width: units.gu(60)
4080
29
    height: units.gu(80)
4081
30
4082
31
    Button {
4083
32
        anchors.centerIn: parent
4084
33
        text: "Show Greeter"
4085
34
        onClicked: {
4086
35
            if (greeterLoader.item)
4087
36
                greeterLoader.item.show();
4088
37
        }
4089
38
    }
4090
39
4091
40
    Loader {
4092
41
        id: greeterLoader
4093
42
        anchors.fill: parent
4094
43
4095
44
        property bool itemDestroyed: false
4096
45
4097
46
        sourceComponent: Component {
4098
47
            Greeter {
4099
48
                width: greeterLoader.width
4100
49
                height: greeterLoader.height
4101
50
4102
51
                Component.onDestruction: {
4103
52
                    greeterLoader.itemDestroyed = true;
4104
53
                }
4105
54
                SignalSpy {
4106
55
                    objectName: "selectedSpy"
4107
56
                    target: parent
4108
57
                    signalName: "selected"
4109
58
                }
4110
59
            }
4111
60
        }
4112
61
    }
4113
62
4114
63
    SignalSpy {
4115
64
        id: unlockSpy
4116
65
        target: greeterLoader.item
4117
66
        signalName: "unlocked"
4118
67
    }
4119
68
4120
69
    SignalSpy {
4121
70
        id: tappedSpy
4122
71
        target: greeterLoader.item
4123
72
        signalName: "tapped"
4124
73
    }
4125
74
4126
75
    SignalSpy {
4127
76
        id: infographicDataChangedSpy
4128
77
        target: LightDM.Infographic
4129
78
        signalName: "dataChanged"
4130
79
    }
4131
80
4132
81
    UT.UnityTestCase {
4133
82
        name: "SingleGreeter"
4134
83
        when: windowShown
4135
84
4136
85
        property Greeter greeter: greeterLoader.item
4137
86
4138
87
        function cleanup() {
4139
88
            AccountsService.statsWelcomeScreen = true
4140
89
4141
90
            // force a reload so that we get a fresh Greeter for the next test
4142
91
            greeterLoader.itemDestroyed = false;
4143
92
            greeterLoader.active = false;
4144
93
            tryCompare(greeterLoader, "itemDestroyed", true);
4145
94
4146
95
            unlockSpy.clear();
4147
96
            tappedSpy.clear();
4148
97
4149
98
            greeterLoader.active = true;
4150
99
            tryCompare(greeterLoader, "status", Loader.Ready);
4151
100
            removeTimeConstraintsFromDirectionalDragAreas(greeterLoader.item);
4152
101
        }
4153
102
4154
103
        function test_properties() {
4155
104
            compare(greeter.multiUser, false)
4156
105
            compare(greeter.narrowMode, true)
4157
106
        }
4158
107
4159
108
        function test_teasingArea_data() {
4160
109
            return [
4161
110
                {tag: "left", posX: units.gu(2), leftPressed: true, rightPressed: false},
4162
111
                {tag: "right", posX: greeter.width - units.gu(2), leftPressed: false, rightPressed: true}
4163
112
            ]
4164
113
        }
4165
114
4166
115
        function test_teasingArea(data) {
4167
116
            tappedSpy.clear()
4168
117
            tap(greeter, data.posX, greeter.height - units.gu(1))
4169
118
            tappedSpy.wait()
4170
119
            tryCompare(tappedSpy, "count", 1)
4171
120
        }
4172
121
4173
122
        function test_statsWelcomeScreen() {
4174
123
            // Test logic in greeter that turns statsWelcomeScreen setting into infographic changes
4175
124
            compare(AccountsService.statsWelcomeScreen, true)
4176
125
            tryCompare(LightDM.Infographic, "username", "single")
4177
126
            AccountsService.statsWelcomeScreen = false
4178
127
            tryCompare(LightDM.Infographic, "username", "")
4179
128
            AccountsService.statsWelcomeScreen = true
4180
129
            tryCompare(LightDM.Infographic, "username", "single")
4181
130
        }
4182
131
4183
132
        function test_initial_selected_signal() {
4184
133
            var selectedSpy = findChild(greeter, "selectedSpy");
4185
134
            selectedSpy.wait();
4186
135
            tryCompare(selectedSpy, "count", 1);
4187
136
        }
4188
137
4189
138
        /*
4190
139
            Regression test for https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1388359
4191
140
            "User metrics can no longer be changed by double tap"
4192
141
        */
4193
142
        function test_doubleTapSwitchesToNextInfographic() {
4194
143
            infographicDataChangedSpy.clear();
4195
144
4196
145
            var infographicPrivate = findInvisibleChild(greeter, "infographicPrivate");
4197
146
            verify(infographicPrivate);
4198
147
4199
148
            // wait for the UI to settle down before double tapping it
4200
149
            tryCompare(infographicPrivate, "animating", false);
4201
150
4202
151
            var dataCircle = findChild(greeter, "dataCircle");
4203
152
            verify(dataCircle);
4204
153
4205
154
            tap(dataCircle);
4206
155
            wait(1);
4207
156
            tap(dataCircle);
4208
157
4209
158
            tryCompare(infographicDataChangedSpy, "count", 1);
4210
159
        }
4211
160
4212
161
        function test_movesBackIntoPlaceWhenNotDraggedFarEnough() {
4213
162
4214
163
            var dragEvaluator = findInvisibleChild(greeter, "edgeDragEvaluator");
4215
164
            verify(dragEvaluator);
4216
165
4217
166
            // Make it easier to get a rejection/rollback. Otherwise would have to inject
4218
167
            // a fake timer into dragEvaluator.
4219
168
            // Afterall, we are testing if the Greeter indeed moves back on a
4220
169
            // rollback decision, not the drag evaluation itself.
4221
170
            dragEvaluator.minDragDistance = dragEvaluator.maxDragDistance / 2;
4222
171
4223
172
            // it starts as fully shown
4224
173
            compare(greeter.x, 0);
4225
174
4226
175
            // then we drag it a bit
4227
176
            var startX = greeter.width - 1;
4228
177
            var touchY = greeter.height / 2;
4229
178
            var dragXDelta = -(dragEvaluator.minDragDistance * 0.3);
4230
179
            touchFlick(greeter,
4231
180
                       startX , touchY, // start pos
4232
181
                       startX + dragXDelta, touchY, // end pos
4233
182
                       true /* beginTouch */, false /* endTouch  */);
4234
183
4235
184
            // which should make it move a bit
4236
185
            tryCompareFunction(function(){return greeter.x < 0;}, true);
4237
186
4238
187
            // then we release it
4239
188
            touchRelease(greeter, startX + dragXDelta, touchY);
4240
189
4241
190
            // which should make it move back into its original position as it didn't move
4242
191
            // far enough to have it hidden
4243
192
            tryCompare(greeter, "x", 0);
4244
193
        }
4245
194
4246
195
        function test_dragToHide_data() {
4247
196
            return [
4248
197
                {tag: "left", startX: greeter.width * 0.95, endX: greeter.width * 0.1, hiddenX: -greeter.width},
4249
198
                {tag: "right", startX: greeter.width * 0.1, endX: greeter.width * 0.95, hiddenX: greeter.width},
4250
199
            ];
4251
200
        }
4252
201
        function test_dragToHide(data) {
4253
202
            compare(greeter.x, 0);
4254
203
            compare(greeter.visible, true);
4255
204
            compare(greeter.shown, true);
4256
205
            compare(greeter.showProgress, 1);
4257
206
4258
207
            touchFlick(greeter,
4259
208
                    data.startX, greeter.height / 2, // start pos
4260
209
                    data.endX, greeter.height / 2); // end pos
4261
210
4262
211
            tryCompare(greeter, "x", data.hiddenX);
4263
212
            tryCompare(greeter, "visible", false);
4264
213
            tryCompare(greeter, "shown", false);
4265
214
            tryCompare(greeter, "showProgress", 0);
4266
215
        }
4267
216
4268
217
        function test_hiddenGreeterRemainsHiddenAfterResize_data() {
4269
218
            return [
4270
219
                {tag: "left", startX: greeter.width * 0.95, endX: greeter.width * 0.1},
4271
220
                {tag: "right", startX: greeter.width * 0.1, endX: greeter.width * 0.95},
4272
221
            ];
4273
222
        }
4274
223
        function test_hiddenGreeterRemainsHiddenAfterResize(data) {
4275
224
            touchFlick(greeter,
4276
225
                    data.startX, greeter.height / 2, // start pos
4277
226
                    data.endX, greeter.height / 2); // end pos
4278
227
4279
228
            tryCompare(greeter, "x", data.tag == "left" ? -greeter.width : greeter.width);
4280
229
            tryCompare(greeter, "visible", false);
4281
230
            tryCompare(greeter, "shown", false);
4282
231
            tryCompare(greeter, "showProgress", 0);
4283
232
4284
233
            // flip dimensions to simulate an orientation change
4285
234
            greeter.width = greeterLoader.height;
4286
235
            greeter.height = greeterLoader.width;
4287
236
4288
237
            // All properties should remain consistent
4289
238
            tryCompare(greeter, "x", data.tag == "left" ? -greeter.width : greeter.width);
4290
239
            tryCompare(greeter, "visible", false);
4291
240
            tryCompare(greeter, "shown", false);
4292
241
            tryCompare(greeter, "showProgress", 0);
4293
242
        }
4294
243
    }
4295
244
}
4296
245
0
4297
=== added file 'tests/qmltests/Greeter/tst_WideView.qml'
4298
--- tests/qmltests/Greeter/tst_WideView.qml	1970-01-01 00:00:00 +0000
4299
+++ tests/qmltests/Greeter/tst_WideView.qml	2015-02-23 15:44:00 +0000
4300
@@ -0,0 +1,519 @@
4301
1
/*
4302
2
 * Copyright 2014 Canonical Ltd.
4303
3
 *
4304
4
 * This program is free software; you can redistribute it and/or modify
4305
5
 * it under the terms of the GNU General Public License as published by
4306
6
 * the Free Software Foundation; version 3.
4307
7
 *
4308
8
 * This program is distributed in the hope that it will be useful,
4309
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4310
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
4311
11
 * GNU General Public License for more details.
4312
12
 *
4313
13
 * You should have received a copy of the GNU General Public License
4314
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
4315
15
 */
4316
16
4317
17
import QtQuick 2.0
4318
18
import QtTest 1.0
4319
19
import ".."
4320
20
import "../../../qml/Greeter"
4321
21
import LightDM 0.1 as LightDM
4322
22
import Ubuntu.Components 0.1
4323
23
import Unity.Test 0.1 as UT
4324
24
4325
25
Item {
4326
26
    id: root
4327
27
    width: units.gu(120)
4328
28
    height: units.gu(80)
4329
29
4330
30
    Binding {
4331
31
        target: LightDM.Users
4332
32
        property: "mockMode"
4333
33
        value: "full"
4334
34
    }
4335
35
4336
36
    Row {
4337
37
        anchors.fill: parent
4338
38
        Loader {
4339
39
            id: loader
4340
40
            width: root.width - controls.width
4341
41
            height: parent.height
4342
42
4343
43
            property bool itemDestroyed: false
4344
44
            sourceComponent: Component {
4345
45
                WideView {
4346
46
                    id: view
4347
47
4348
48
                    background: Qt.resolvedUrl("../../../qml/graphics/tablet_background.jpg")
4349
49
                    userModel: LightDM.Users
4350
50
                    infographicModel: LightDM.Infographic
4351
51
4352
52
                    launcherOffset: parseFloat(launcherOffsetField.text)
4353
53
                    currentIndex: parseInt(currentIndexField.text, 10)
4354
54
                    delayMinutes: parseInt(delayMinutesField.text, 10)
4355
55
                    backgroundTopMargin: parseFloat(backgroundTopMarginField.text)
4356
56
                    locked: lockedCheckBox.checked
4357
57
                    inputMethod: fakeInputMethod
4358
58
4359
59
                    Component.onDestruction: {
4360
60
                        loader.itemDestroyed = true
4361
61
                    }
4362
62
4363
63
                    onSelected: {
4364
64
                        currentIndexField.text = index;
4365
65
                    }
4366
66
4367
67
                    QtObject {
4368
68
                        id: fakeInputMethod
4369
69
                        property bool visible: fakeKeyboard.visible
4370
70
                        property var keyboardRectangle: QtObject {
4371
71
                            property real x: fakeKeyboard.x
4372
72
                            property real y: fakeKeyboard.y
4373
73
                            property real width: fakeKeyboard.width
4374
74
                            property real height: fakeKeyboard.height
4375
75
                        }
4376
76
                    }
4377
77
4378
78
                    Rectangle {
4379
79
                        id: fakeKeyboard
4380
80
                        color: "green"
4381
81
                        opacity: 0.7
4382
82
                        anchors.bottom: view.bottom
4383
83
                        width: view.width
4384
84
                        height: view.height * 0.6
4385
85
                        visible: keyboardVisibleCheckBox.checked
4386
86
                        Text {
4387
87
                            text: "Keyboard Rectangle"
4388
88
                            color: "yellow"
4389
89
                            font.bold: true
4390
90
                            fontSizeMode: Text.Fit
4391
91
                            minimumPixelSize: 10; font.pixelSize: 200
4392
92
                            verticalAlignment: Text.AlignVCenter
4393
93
                            x: (parent.width - width) / 2
4394
94
                            y: (parent.height - height) / 2
4395
95
                            width: parent.width
4396
96
                            height: parent.height
4397
97
                        }
4398
98
                    }
4399
99
4400
100
                }
4401
101
            }
4402
102
        }
4403
103
4404
104
        Rectangle {
4405
105
            id: controls
4406
106
            color: "white"
4407
107
            width: units.gu(40)
4408
108
            height: parent.height
4409
109
4410
110
            Column {
4411
111
                anchors { left: parent.left; right: parent.right; top: parent.top; margins: units.gu(1) }
4412
112
                spacing: units.gu(1)
4413
113
4414
114
                Row {
4415
115
                    Button {
4416
116
                        text: "Show Last Chance"
4417
117
                        onClicked: loader.item.showLastChance()
4418
118
                    }
4419
119
                }
4420
120
                Row {
4421
121
                    Button {
4422
122
                        text: "Hide"
4423
123
                        onClicked: loader.item.hide()
4424
124
                    }
4425
125
                }
4426
126
                Row {
4427
127
                    Button {
4428
128
                        text: "Reset"
4429
129
                        onClicked: loader.item.reset()
4430
130
                    }
4431
131
                }
4432
132
                Row {
4433
133
                    Button {
4434
134
                        text: "Show Message"
4435
135
                        onClicked: loader.item.showMessage(messageField.text)
4436
136
                    }
4437
137
                    TextField {
4438
138
                        id: messageField
4439
139
                        width: units.gu(10)
4440
140
                        text: ""
4441
141
                    }
4442
142
                }
4443
143
                Row {
4444
144
                    Button {
4445
145
                        text: "Show Prompt"
4446
146
                        onClicked: loader.item.showPrompt(promptField.text, isSecretCheckBox.checked, isDefaultPromptCheckBox.checked)
4447
147
                    }
4448
148
                    TextField {
4449
149
                        id: promptField
4450
150
                        width: units.gu(10)
4451
151
                        text: ""
4452
152
                    }
4453
153
                    CheckBox {
4454
154
                        id: isSecretCheckBox
4455
155
                    }
4456
156
                    Label {
4457
157
                        text: "secret"
4458
158
                    }
4459
159
                    CheckBox {
4460
160
                        id: isDefaultPromptCheckBox
4461
161
                    }
4462
162
                    Label {
4463
163
                        text: "default"
4464
164
                    }
4465
165
                }
4466
166
                Row {
4467
167
                    Button {
4468
168
                        text: "Authenticated"
4469
169
                        onClicked: {
4470
170
                            if (successCheckBox.checked) {
4471
171
                                loader.item.notifyAuthenticationSucceeded();
4472
172
                            } else {
4473
173
                                loader.item.notifyAuthenticationFailed();
4474
174
                            }
4475
175
                        }
4476
176
                    }
4477
177
                    CheckBox {
4478
178
                        id: successCheckBox
4479
179
                    }
4480
180
                    Label {
4481
181
                        text: "success"
4482
182
                    }
4483
183
                }
4484
184
                Row {
4485
185
                    Button {
4486
186
                        text: "Try To Unlock"
4487
187
                        onClicked: loader.item.tryToUnlock(toTheRightCheckBox.checked)
4488
188
                    }
4489
189
                    CheckBox {
4490
190
                        id: toTheRightCheckBox
4491
191
                    }
4492
192
                    Label {
4493
193
                        text: "toTheRight"
4494
194
                    }
4495
195
                }
4496
196
                Row {
4497
197
                    TextField {
4498
198
                        id: launcherOffsetField
4499
199
                        width: units.gu(10)
4500
200
                        text: "0"
4501
201
                    }
4502
202
                    Label {
4503
203
                        text: "launcherOffset"
4504
204
                    }
4505
205
                }
4506
206
                Row {
4507
207
                    TextField {
4508
208
                        id: currentIndexField
4509
209
                        width: units.gu(10)
4510
210
                        text: "0"
4511
211
                    }
4512
212
                    Label {
4513
213
                        text: "currentIndex"
4514
214
                    }
4515
215
                }
4516
216
                Row {
4517
217
                    TextField {
4518
218
                        id: delayMinutesField
4519
219
                        width: units.gu(10)
4520
220
                        text: "0"
4521
221
                    }
4522
222
                    Label {
4523
223
                        text: "delayMinutes"
4524
224
                    }
4525
225
                }
4526
226
                Row {
4527
227
                    TextField {
4528
228
                        id: backgroundTopMarginField
4529
229
                        width: units.gu(10)
4530
230
                        text: "0"
4531
231
                    }
4532
232
                    Label {
4533
233
                        text: "backgroundTopMargin"
4534
234
                    }
4535
235
                }
4536
236
                Row {
4537
237
                    CheckBox {
4538
238
                        id: lockedCheckBox
4539
239
                    }
4540
240
                    Label {
4541
241
                        text: "locked"
4542
242
                    }
4543
243
                }
4544
244
                Row {
4545
245
                    Label {
4546
246
                        text: "selected: " + selectedSpy.count
4547
247
                    }
4548
248
                }
4549
249
                Row {
4550
250
                    Label {
4551
251
                        text: "responded: " + respondedSpy.count
4552
252
                    }
4553
253
                }
4554
254
                Row {
4555
255
                    Label {
4556
256
                        text: "teased: " + teaseSpy.count
4557
257
                    }
4558
258
                }
4559
259
                Row {
4560
260
                    Label {
4561
261
                        text: "emergency: " + emergencySpy.count
4562
262
                    }
4563
263
                }
4564
264
                Row {
4565
265
                    Button {
4566
266
                        text: "Reload View"
4567
267
                        onClicked: {
4568
268
                            loader.active = false;
4569
269
                            loader.active = true;
4570
270
                        }
4571
271
                    }
4572
272
                }
4573
273
                Row {
4574
274
                    CheckBox {
4575
275
                        id: keyboardVisibleCheckBox
4576
276
                    }
4577
277
                    Label {
4578
278
                        text: "Keyboard Visible"
4579
279
                    }
4580
280
                }
4581
281
            }
4582
282
        }
4583
283
    }
4584
284
4585
285
    SignalSpy {
4586
286
        id: selectedSpy
4587
287
        target: loader.item
4588
288
        signalName: "selected"
4589
289
    }
4590
290
4591
291
    SignalSpy {
4592
292
        id: respondedSpy
4593
293
        target: loader.item
4594
294
        signalName: "responded"
4595
295
    }
4596
296
4597
297
    SignalSpy {
4598
298
        id: teaseSpy
4599
299
        target: loader.item
4600
300
        signalName: "tease"
4601
301
    }
4602
302
4603
303
    SignalSpy {
4604
304
        id: emergencySpy
4605
305
        target: loader.item
4606
306
        signalName: "emergencyCall"
4607
307
    }
4608
308
4609
309
    UT.UnityTestCase {
4610
310
        name: "WideView"
4611
311
        when: windowShown
4612
312
4613
313
        property Item view: loader.status === Loader.Ready ? loader.item : null
4614
314
4615
315
        function init() {
4616
316
            view.currentIndex = 0; // break binding with text field
4617
317
            selectedSpy.clear();
4618
318
            respondedSpy.clear();
4619
319
            teaseSpy.clear();
4620
320
            emergencySpy.clear();
4621
321
        }
4622
322
4623
323
        function cleanup() {
4624
324
            keyboardVisibleCheckBox.checked = false;
4625
325
4626
326
            loader.itemDestroyed = false;
4627
327
            loader.active = false;
4628
328
            tryCompare(loader, "status", Loader.Null);
4629
329
            tryCompare(loader, "item", null);
4630
330
            tryCompare(loader, "itemDestroyed", true);
4631
331
            loader.active = true;
4632
332
            tryCompare(loader, "status", Loader.Ready);
4633
333
            removeTimeConstraintsFromDirectionalDragAreas(loader.item);
4634
334
        }
4635
335
4636
336
        function getIndexOf(name) {
4637
337
            for (var i = 0; i < LightDM.Users.count; i++) {
4638
338
                if (name === LightDM.Users.data(i, LightDM.UserRoles.NameRole)) {
4639
339
                    return i;
4640
340
                }
4641
341
            }
4642
342
            fail("Didn't find name")
4643
343
            return -1;
4644
344
        }
4645
345
4646
346
        function selectUser(name) {
4647
347
            var i = getIndexOf(name);
4648
348
            view.currentIndex = i;
4649
349
            return i;
4650
350
        }
4651
351
4652
352
        function swipeAwayCover() {
4653
353
            tryCompare(view, "fullyShown", true);
4654
354
            var touchY = view.height / 2;
4655
355
            touchFlick(view, view.width, touchY, 0, touchY);
4656
356
            var coverPage = findChild(view, "coverPage");
4657
357
            tryCompare(coverPage, "showProgress", 0);
4658
358
            waitForRendering(view);
4659
359
        }
4660
360
4661
361
        function test_tease_data() {
4662
362
            return [
4663
363
                {tag: "locked", x: 0, offset: 0, count: 0, locked: true},
4664
364
                {tag: "left", x: 0, offset: 0, count: 1, locked: false},
4665
365
                {tag: "leftWithOffsetPass", x: 10, offset: 10, count: 1, locked: false},
4666
366
                {tag: "leftWithOffsetFail", x: 9, offset: 10, count: 0, locked: false},
4667
367
                {tag: "right", x: view.width, offset: 0, count: 1, locked: false},
4668
368
            ]
4669
369
        }
4670
370
        function test_tease(data) {
4671
371
            view.locked = data.locked;
4672
372
            view.dragHandleLeftMargin = data.offset;
4673
373
            tap(view, data.x, 0);
4674
374
            compare(teaseSpy.count, data.count);
4675
375
        }
4676
376
4677
377
        function test_selected() {
4678
378
            var delegate = findChild(view, "username2");
4679
379
            tap(delegate);
4680
380
            compare(selectedSpy.count, 1);
4681
381
            compare(selectedSpy.signalArguments[0][0], 2);
4682
382
            compare(view.currentIndex, 0); // confirm we didn't change
4683
383
        }
4684
384
4685
385
        function test_respondedWithPassword() {
4686
386
            view.locked = true;
4687
387
            view.showPrompt("Prompt", true, true);
4688
388
            var passwordInput = findChild(view, "passwordInput");
4689
389
            compare(passwordInput.placeholderText, "Prompt");
4690
390
            compare(passwordInput.echoMode, TextInput.Password);
4691
391
            tap(passwordInput);
4692
392
            typeString("password");
4693
393
            keyClick(Qt.Key_Enter);
4694
394
            compare(respondedSpy.count, 1);
4695
395
            compare(respondedSpy.signalArguments[0][0], "password");
4696
396
        }
4697
397
4698
398
        function test_respondedWithNonSecret() {
4699
399
            view.locked = true;
4700
400
            view.showPrompt("otp", false, false);
4701
401
            var passwordInput = findChild(view, "passwordInput");
4702
402
            compare(passwordInput.placeholderText, "otp");
4703
403
            compare(passwordInput.echoMode, TextInput.Normal);
4704
404
            tap(passwordInput);
4705
405
            typeString("foo");
4706
406
            keyClick(Qt.Key_Enter);
4707
407
            compare(respondedSpy.count, 1);
4708
408
            compare(respondedSpy.signalArguments[0][0], "foo");
4709
409
        }
4710
410
4711
411
        function test_respondedWithSwipe() {
4712
412
            swipeAwayCover();
4713
413
            compare(respondedSpy.count, 1);
4714
414
            compare(respondedSpy.signalArguments[0][0], "");
4715
415
        }
4716
416
4717
417
        function test_fullyShown() {
4718
418
            tryCompare(view, "fullyShown", true);
4719
419
            swipeAwayCover();
4720
420
            tryCompare(view, "fullyShown", false);
4721
421
        }
4722
422
4723
423
        function test_required() {
4724
424
            tryCompare(view, "required", true);
4725
425
            swipeAwayCover();
4726
426
            tryCompare(view, "required", false);
4727
427
        }
4728
428
4729
429
        function test_showMessage() {
4730
430
            view.showMessage("Welcome to Unity Greeter");
4731
431
            view.showMessage("<font color=\"#df382c\">This is an error</font>");
4732
432
            view.showMessage("You should have seen three messages and this is a really long message too. wow so long much length");
4733
433
            var infoLabel = findChild(view, "infoLabel");
4734
434
            compare(infoLabel.text, "Welcome to Unity Greeter<br><font color=\"#df382c\">This is an error</font><br>You should have seen three messages and this is a really long message too. wow so long much length");
4735
435
            compare(infoLabel.textFormat, Text.StyledText);
4736
436
            compare(infoLabel.clip, true);
4737
437
            verify(infoLabel.contentWidth > infoLabel.width);
4738
438
            verify(infoLabel.opacity < 1);
4739
439
            tryCompare(infoLabel, "opacity", 1);
4740
440
        }
4741
441
4742
442
        // Escape is used to reset the authentication, especially if PAM is unresponsive
4743
443
        function test_escape() {
4744
444
            view.currentIndex = 1;
4745
445
            view.locked = true;
4746
446
            view.showPrompt("Prompt", true, true);
4747
447
            var passwordInput = findChild(view, "passwordInput");
4748
448
            tap(passwordInput);
4749
449
            compare(passwordInput.focus, true);
4750
450
            compare(passwordInput.enabled, true);
4751
451
4752
452
            typeString("password");
4753
453
            keyClick(Qt.Key_Enter);
4754
454
            compare(passwordInput.focus, false);
4755
455
            compare(passwordInput.enabled, false);
4756
456
4757
457
            compare(selectedSpy.count, 0);
4758
458
            keyClick(Qt.Key_Escape);
4759
459
            compare(selectedSpy.count, 1);
4760
460
            compare(selectedSpy.signalArguments[0][0], 1);
4761
461
4762
462
            view.reset();
4763
463
            compare(passwordInput.focus, false);
4764
464
            compare(passwordInput.enabled, true);
4765
465
        }
4766
466
4767
467
        function test_unicode() {
4768
468
            var index = selectUser("unicode");
4769
469
            var label = findChild(view, "username" + index);
4770
470
            tryCompare(label, "text", "가나다라마");
4771
471
        }
4772
472
4773
473
        function test_longName() {
4774
474
            var index = selectUser("long-name");
4775
475
            var label = findChild(view, "username" + index);
4776
476
            tryCompare(label, "truncated", true);
4777
477
        }
4778
478
4779
479
        function test_promptless() {
4780
480
            var passwordInput = findChild(view, "passwordInput");
4781
481
4782
482
            view.locked = true;
4783
483
            compare(passwordInput.placeholderText, "Retry");
4784
484
            tap(passwordInput);
4785
485
            compare(respondedSpy.count, 0);
4786
486
            compare(selectedSpy.count, 1);
4787
487
            compare(selectedSpy.signalArguments[0][0], 0);
4788
488
            selectedSpy.clear();
4789
489
4790
490
            view.locked = false;
4791
491
            compare(passwordInput.placeholderText, "Tap to unlock");
4792
492
            tap(passwordInput);
4793
493
            compare(selectedSpy.count, 0);
4794
494
            compare(respondedSpy.count, 1);
4795
495
            compare(respondedSpy.signalArguments[0][0], "");
4796
496
        }
4797
497
4798
498
        function test_loginListNotCoveredByKeyboard() {
4799
499
            var loginList = findChild(view, "loginList");
4800
500
            compare(loginList.height, view.height);
4801
501
4802
502
            // when the vkb shows up, loginList is moved up to remain fully uncovered
4803
503
4804
504
            keyboardVisibleCheckBox.checked = true;
4805
505
4806
506
            tryCompare(loginList, "height", view.height - view.inputMethod.keyboardRectangle.height);
4807
507
            tryCompareFunction( function() {
4808
508
                var loginListRect = loginList.mapToItem(view, 0, 0, loginList.width, loginList.height);
4809
509
                return loginListRect.y + loginListRect.height <= view.inputMethod.keyboardRectangle.y;
4810
510
            }, true);
4811
511
4812
512
            // once the vkb goes away, loginList goes back to its full height
4813
513
4814
514
            keyboardVisibleCheckBox.checked = false;
4815
515
4816
516
            tryCompare(loginList, "height", view.height);
4817
517
        }
4818
518
    }
4819
519
}
4820
0
520
4821
=== modified file 'tests/qmltests/Tutorial/tst_Tutorial.qml'
4822
--- tests/qmltests/Tutorial/tst_Tutorial.qml	2015-02-05 20:20:28 +0000
4823
+++ tests/qmltests/Tutorial/tst_Tutorial.qml	2015-02-23 15:44:00 +0000
4824
@@ -112,9 +112,9 @@
4825
112
112
4826
113
        function init() {
113
        function init() {
4827
114
            tryCompare(shell, "enabled", true); // enabled by greeter when ready
114
            tryCompare(shell, "enabled", true); // enabled by greeter when ready
4828
115
            swipeAwayGreeter();
4829
116
            AccountsService.demoEdges = false;
115
            AccountsService.demoEdges = false;
4830
117
            AccountsService.demoEdges = true;
116
            AccountsService.demoEdges = true;
4831
117
            swipeAwayGreeter();
4832
118
        }
118
        }
4833
119
119
4834
120
        function cleanup() {
120
        function cleanup() {
4835
@@ -151,13 +151,14 @@
4836
151
        }
151
        }
4837
152
152
4838
153
        function swipeAwayGreeter() {
153
        function swipeAwayGreeter() {
4841
154
            var greeter = findChild(shell, "greeter");
154
            var coverPage = findChild(shell, "coverPage");
4842
155
            tryCompare(greeter, "showProgress", 1);
155
            tryCompare(coverPage, "showProgress", 1);
4843
156
156
4844
157
            touchFlick(shell, halfWidth, halfHeight, shell.width, halfHeight);
157
            touchFlick(shell, halfWidth, halfHeight, shell.width, halfHeight);
4845
158
158
4846
159
            // wait until the animation has finished
159
            // wait until the animation has finished
4848
160
            tryCompare(greeter, "showProgress", 0);
160
            var greeter = findChild(shell, "greeter");
4849
161
            tryCompare(greeter, "required", false);
4850
161
            waitForRendering(greeter);
162
            waitForRendering(greeter);
4851
162
        }
163
        }
4852
163
164
4853
164
165
4854
=== modified file 'tests/qmltests/tst_Shell.qml'
4855
--- tests/qmltests/tst_Shell.qml	2015-02-11 17:12:49 +0000
4856
+++ tests/qmltests/tst_Shell.qml	2015-02-23 15:44:00 +0000
4857
@@ -19,9 +19,11 @@
4858
19
19
4859
20
import QtQuick 2.0
20
import QtQuick 2.0
4860
21
import QtTest 1.0
21
import QtTest 1.0
4861
22
import AccountsService 0.1
4862
22
import GSettings 1.0
23
import GSettings 1.0
4863
23
import LightDM 0.1 as LightDM
24
import LightDM 0.1 as LightDM
4864
24
import Ubuntu.Components 1.1
25
import Ubuntu.Components 1.1
4865
26
import Ubuntu.Components.ListItems 1.0 as ListItem
4866
25
import Ubuntu.Telephony 0.1 as Telephony
27
import Ubuntu.Telephony 0.1 as Telephony
4867
26
import Unity.Application 0.1
28
import Unity.Application 0.1
4868
27
import Unity.Connectivity 0.1
29
import Unity.Connectivity 0.1
4869
@@ -80,7 +82,7 @@
4870
80
        }
82
        }
4871
81
83
4872
82
        Rectangle {
84
        Rectangle {
4874
83
            color: "white"
85
            color: "darkgrey"
4875
84
            width: units.gu(30)
86
            width: units.gu(30)
4876
85
            height: shellLoader.height
87
            height: shellLoader.height
4877
86
88
4878
@@ -98,11 +100,23 @@
4879
98
100
4880
99
                            var greeter = testCase.findChild(shellLoader.item, "greeter");
101
                            var greeter = testCase.findChild(shellLoader.item, "greeter");
4881
100
                            if (!greeter.shown) {
102
                            if (!greeter.shown) {
4883
101
                                greeter.show();
103
                                LightDM.Greeter.showGreeter();
4884
102
                            }
104
                            }
4885
103
                        }
105
                        }
4886
104
                    }
106
                    }
4887
105
                }
107
                }
4888
108
                ListItem.ItemSelector {
4889
109
                    anchors { left: parent.left; right: parent.right }
4890
110
                    activeFocusOnPress: false
4891
111
                    text: "LightDM mock mode"
4892
112
                    model: ["single", "single-passphrase", "single-pin"]
4893
113
                    onSelectedIndexChanged: {
4894
114
                        shellLoader.active = false;
4895
115
                        LightDM.Greeter.mockMode = model[selectedIndex];
4896
116
                        LightDM.Users.mockMode = model[selectedIndex];
4897
117
                        shellLoader.active = true;
4898
118
                    }
4899
119
                }
4900
106
            }
120
            }
4901
107
        }
121
        }
4902
108
    }
122
    }
4903
@@ -284,11 +298,13 @@
4904
284
298
4905
285
        function test_leftEdgeDrag_data() {
299
        function test_leftEdgeDrag_data() {
4906
286
            return [
300
            return [
4912
287
                {tag: "without launcher", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true},
301
                {tag: "without launcher", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true, greeterShown: false},
4913
288
                {tag: "with launcher", revealLauncher: true, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true},
302
                {tag: "with launcher", revealLauncher: true, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true, greeterShown: false},
4914
289
                {tag: "small swipe", revealLauncher: false, swipeLength: units.gu(25), appHides: false, focusedApp: "dialer-app", launcherHides: false},
303
                {tag: "small swipe", revealLauncher: false, swipeLength: units.gu(25), appHides: false, focusedApp: "dialer-app", launcherHides: false, greeterShown: false},
4915
290
                {tag: "long swipe", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true},
304
                {tag: "long swipe", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true, greeterShown: false},
4916
291
                {tag: "long swipe", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "unity8-dash", launcherHides: false}
305
                {tag: "small swipe with greeter", revealLauncher: false, swipeLength: units.gu(25), appHides: false, focusedApp: "dialer-app", launcherHides: false, greeterShown: true},
4917
306
                {tag: "long swipe with greeter", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "dialer-app", launcherHides: true, greeterShown: true},
4918
307
                {tag: "swipe over dash", revealLauncher: false, swipeLength: units.gu(27), appHides: true, focusedApp: "unity8-dash", launcherHides: false, greeterShown: false},
4919
292
            ];
308
            ];
4920
293
        }
309
        }
4921
294
310
4922
@@ -299,6 +315,12 @@
4923
299
            ApplicationManager.focusApplication(data.focusedApp)
315
            ApplicationManager.focusApplication(data.focusedApp)
4924
300
            waitUntilApplicationWindowIsFullyVisible();
316
            waitUntilApplicationWindowIsFullyVisible();
4925
301
317
4926
318
            var greeter = findChild(shell, "greeter");
4927
319
            if (data.greeterShown) {
4928
320
                LightDM.Greeter.showGreeter();
4929
321
                tryCompare(greeter, "fullyShown", true);
4930
322
            }
4931
323
4932
302
            if (data.revealLauncher) {
324
            if (data.revealLauncher) {
4933
303
                dragLauncherIntoView();
325
                dragLauncherIntoView();
4934
304
            }
326
            }
4935
@@ -306,8 +328,10 @@
4936
306
            swipeFromLeftEdge(data.swipeLength);
328
            swipeFromLeftEdge(data.swipeLength);
4937
307
            if (data.appHides) {
329
            if (data.appHides) {
4938
308
                waitUntilDashIsFocused();
330
                waitUntilDashIsFocused();
4939
331
                tryCompare(greeter, "shown", false);
4940
309
            } else {
332
            } else {
4941
310
                waitUntilApplicationWindowIsFullyVisible();
333
                waitUntilApplicationWindowIsFullyVisible();
4942
334
                compare(greeter.fullyShown, data.greeterShown);
4943
311
            }
335
            }
4944
312
336
4945
313
            var launcher = findChild(shell, "launcherPanel");
337
            var launcher = findChild(shell, "launcherPanel");
4946
@@ -335,20 +359,20 @@
4947
335
            // Suspend while call is active...
359
            // Suspend while call is active...
4948
336
            callManager.foregroundCall = phoneCall;
360
            callManager.foregroundCall = phoneCall;
4949
337
            Powerd.status = Powerd.Off;
361
            Powerd.status = Powerd.Off;
4951
338
            tryCompare(greeter, "showProgress", 0);
362
            tryCompare(greeter, "shown", false);
4952
339
363
4953
340
            // Now try again after ending call
364
            // Now try again after ending call
4954
341
            callManager.foregroundCall = null;
365
            callManager.foregroundCall = null;
4955
342
            Powerd.status = Powerd.On;
366
            Powerd.status = Powerd.On;
4956
343
            Powerd.status = Powerd.Off;
367
            Powerd.status = Powerd.Off;
4958
344
            tryCompare(greeter, "showProgress", 1);
368
            tryCompare(greeter, "fullyShown", true);
4959
345
369
4960
346
            tryCompare(ApplicationManager, "suspended", true);
370
            tryCompare(ApplicationManager, "suspended", true);
4961
347
            compare(mainApp.state, ApplicationInfoInterface.Suspended);
371
            compare(mainApp.state, ApplicationInfoInterface.Suspended);
4962
348
372
4963
349
            // And wake up
373
            // And wake up
4964
350
            Powerd.status = Powerd.On;
374
            Powerd.status = Powerd.On;
4966
351
            tryCompare(greeter, "showProgress", 1);
375
            tryCompare(greeter, "fullyShown", true);
4967
352
376
4968
353
            // Swipe away greeter to focus app
377
            // Swipe away greeter to focus app
4969
354
            swipeAwayGreeter();
378
            swipeAwayGreeter();
4970
@@ -359,14 +383,14 @@
4971
359
383
4972
360
        function swipeAwayGreeter() {
384
        function swipeAwayGreeter() {
4973
361
            var greeter = findChild(shell, "greeter");
385
            var greeter = findChild(shell, "greeter");
4975
362
            tryCompare(greeter, "showProgress", 1);
386
            tryCompare(greeter, "fullyShown", true);
4976
363
387
4977
364
            var touchX = shell.width - (shell.edgeSize / 2);
388
            var touchX = shell.width - (shell.edgeSize / 2);
4978
365
            var touchY = shell.height / 2;
389
            var touchY = shell.height / 2;
4979
366
            touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY);
390
            touchFlick(shell, touchX, touchY, shell.width * 0.1, touchY);
4980
367
391
4981
368
            // wait until the animation has finished
392
            // wait until the animation has finished
4983
369
            tryCompare(greeter, "showProgress", 0);
393
            tryCompare(greeter, "shown", false);
4984
370
            waitForRendering(greeter);
394
            waitForRendering(greeter);
4985
371
        }
395
        }
4986
372
396
4987
@@ -608,12 +632,12 @@
4988
608
632
4989
609
            waitUntilDashIsFocused();
633
            waitUntilDashIsFocused();
4990
610
634
4993
611
            greeter.show();
635
            LightDM.Greeter.showGreeter();
4994
612
            tryCompare(greeter, "showProgress", 1);
636
            tryCompare(greeter, "fullyShown", true);
4995
613
637
4996
614
            // The main point of this test
638
            // The main point of this test
4997
615
            ApplicationManager.requestFocusApplication("dialer-app");
639
            ApplicationManager.requestFocusApplication("dialer-app");
4999
616
            tryCompare(greeter, "showProgress", 0);
640
            tryCompare(greeter, "shown", false);
5000
617
            waitForRendering(greeter);
641
            waitForRendering(greeter);
Status:	Merged
Approved by:	Daniel d'Andrada on 2015-02-18
Approved revision:	1507
Merged at revision:	1622
Proposed branch:	lp:~mterry/unity8/greeter-refactor
Merge into:	lp:unity8
Prerequisite:	lp:~mterry/unity8/tutorial-new-screens
Diff against target:	5614 lines (+2954/-1668) 28 files modified cmake/modules/QmlTest.cmake (+1/-1) qml/Components/DelayedLockscreen.qml (+3/-1) qml/Components/PassphraseLockscreen.qml (+2/-3) qml/Components/PinLockscreen.qml (+3/-4) qml/Greeter/CoverPage.qml (+163/-110) qml/Greeter/Greeter.qml (+358/-186) qml/Greeter/Infographics.qml (+1/-0) qml/Greeter/LoginList.qml (+70/-88) qml/Greeter/NarrowView.qml (+170/-0) qml/Greeter/WideView.qml (+134/-0) qml/Shell.qml (+78/-364) tests/autopilot/unity8/shell/emulators/greeter.py (+19/-3) tests/autopilot/unity8/shell/emulators/main_window.py (+0/-6) tests/autopilot/unity8/shell/tests/__init__.py (+2/-3) tests/autopilot/unity8/shell/tests/test_lock_screen.py (+8/-12) tests/plugins/LightDM/CMakeLists.txt (+21/-6) tests/plugins/LightDM/usersmodel.cpp (+84/-0) tests/qmltests/CMakeLists.txt (+4/-3) tests/qmltests/Greeter/TestView.qml (+99/-0) tests/qmltests/Greeter/tst_Greeter.qml (+472/-0) tests/qmltests/Greeter/tst_MultiGreeter.qml (+0/-475) tests/qmltests/Greeter/tst_NarrowView.qml (+522/-0) tests/qmltests/Greeter/tst_SingleGreeter.qml (+0/-244) tests/qmltests/Greeter/tst_WideView.qml (+519/-0) tests/qmltests/Tutorial/tst_Tutorial.qml (+5/-4) tests/qmltests/tst_Shell.qml (+65/-43) tests/qmltests/tst_ShellWithPin.qml (+97/-48) tests/qmltests/tst_TabletShell.qml (+54/-64)
To merge this branch:	bzr merge lp:~mterry/unity8/greeter-refactor
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)			Approve on 2015-02-24
Daniel d'Andrada (community)		2015-02-05	Approve on 2015-02-18
PS Jenkins bot (community)	continuous-integration	2015-02-05	Needs Fixing on 2015-02-18
Review via email: mp+248829@code.launchpad.net