1
=== modified file 'Greeter/GreeterContent.qml'
2
--- Greeter/GreeterContent.qml	2013-09-24 13:00:33 +0000
3
+++ Greeter/GreeterContent.qml	2013-10-03 04:28:43 +0000
4
@@ -135,19 +135,23 @@
5
135
135
6
136
    Infographics {
136
    Infographics {
7
137
        id: infographics
137
        id: infographics
8
138
        objectName: "infographics"
9
138
        height: narrowMode ? parent.height : 0.75 * parent.height
139
        height: narrowMode ? parent.height : 0.75 * parent.height
10
139
        model: greeterContentLoader.infographicModel
140
        model: greeterContentLoader.infographicModel
11
140
141
13
141
        Component.onCompleted: infographics.updateUsername(greeterContentLoader.currentIndex)
142
        property string selectedUser
14
143
        property string infographicUser: AccountsService.statsWelcomeScreen ? selectedUser : ""
15
144
        onInfographicUserChanged: greeterContentLoader.infographicModel.username = infographicUser
16
145
17
146
        Component.onCompleted: {
18
147
            selectedUser = greeterContentLoader.model.data(greeterContentLoader.currentIndex, LightDM.UserRoles.NameRole)
19
148
            greeterContentLoader.infographicModel.username = infographicUser
20
149
            greeterContentLoader.infographicModel.readyForDataChange()
21
150
        }
22
142
151
23
143
        Connections {
152
        Connections {
24
144
            target: root
153
            target: root
31
145
            onSelected: infographics.updateUsername(uid)
154
            onSelected: infographics.selectedUser = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)
26
146
        }
27
147
28
148
        function updateUsername(uid) {
29
149
            greeterContentLoader.infographicModel.username = greeterContentLoader.model.data(uid, LightDM.UserRoles.NameRole)
30
150
            greeterContentLoader.infographicModel.readyForDataChangeSlot();
32
151
        }
155
        }
33
152
156
34
153
        anchors {
157
        anchors {
35
154
158
36
=== modified file 'Greeter/Infographics.qml'
37
--- Greeter/Infographics.qml	2013-09-03 14:39:25 +0000
38
+++ Greeter/Infographics.qml	2013-10-03 04:28:43 +0000
39
@@ -29,21 +29,30 @@
40
29
    Connections {
29
    Connections {
41
30
        target: model
30
        target: model
42
31
31
43
32
        onDataAboutToAppear: startHideAnimation() // hide "no data" label
44
32
        onDataAppeared: startShowAnimation()
33
        onDataAppeared: startShowAnimation()
45
33
34
46
34
        onDataAboutToChange: startHideAnimation()
35
        onDataAboutToChange: startHideAnimation()
47
35
48
36
        onDataChanged: startShowAnimation()
36
        onDataChanged: startShowAnimation()
49
37
37
50
38
        onDataAboutToDisappear: startHideAnimation()
38
        onDataAboutToDisappear: startHideAnimation()
51
39
        onDataDisappeared: startShowAnimation() // show "no data" label
52
39
    }
40
    }
53
40
41
54
41
    function startShowAnimation() {
42
    function startShowAnimation() {
55
43
        dotHideAnimTimer.stop()
56
44
        circleShrinkAnimTimer.stop()
57
45
        notification.hideAnim.stop()
58
46
59
42
        dotShowAnimTimer.startFromBeginning()
47
        dotShowAnimTimer.startFromBeginning()
60
43
        notification.showAnim.start()
48
        notification.showAnim.start()
61
44
    }
49
    }
62
45
50
63
46
    function startHideAnimation() {
51
    function startHideAnimation() {
64
52
        dotShowAnimTimer.stop()
65
53
        circleGrowAnimTimer.stop()
66
54
        notification.showAnim.stop()
67
55
68
47
        dotHideAnimTimer.startFromBeginning()
56
        dotHideAnimTimer.startFromBeginning()
69
48
        notification.hideAnim.start()
57
        notification.hideAnim.start()
70
49
    }
58
    }
71
50
59
72
=== modified file 'plugins/AccountsService/AccountsService.cpp'
73
--- plugins/AccountsService/AccountsService.cpp	2013-09-19 15:36:54 +0000
74
+++ plugins/AccountsService/AccountsService.cpp	2013-10-03 04:28:43 +0000
75
@@ -44,6 +44,7 @@
76
44
44
77
45
    updateDemoEdges();
45
    updateDemoEdges();
78
46
    updateBackgroundFile();
46
    updateBackgroundFile();
79
47
    updateStatsWelcomeScreen();
80
47
}
48
}
81
48
49
82
49
bool AccountsService::demoEdges() const
50
bool AccountsService::demoEdges() const
83
@@ -62,6 +63,11 @@
84
62
    return m_backgroundFile;
63
    return m_backgroundFile;
85
63
}
64
}
86
64
65
87
66
bool AccountsService::statsWelcomeScreen() const
88
67
{
89
68
    return m_statsWelcomeScreen;
90
69
}
91
70
92
65
void AccountsService::updateDemoEdges()
71
void AccountsService::updateDemoEdges()
93
66
{
72
{
94
67
    auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();
73
    auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();
95
@@ -80,6 +86,15 @@
96
80
    }
86
    }
97
81
}
87
}
98
82
88
99
89
void AccountsService::updateStatsWelcomeScreen()
100
90
{
101
91
    bool statsWelcomeScreen = m_service->getUserProperty(m_user, "com.ubuntu.touch.AccountsService.SecurityPrivacy", "StatsWelcomeScreen").toBool();
102
92
    if (m_statsWelcomeScreen != statsWelcomeScreen) {
103
93
        m_statsWelcomeScreen = statsWelcomeScreen;
104
94
        Q_EMIT statsWelcomeScreenChanged();
105
95
    }
106
96
}
107
97
108
83
void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
98
void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
109
84
{
99
{
110
85
    if (m_user != user) {
100
    if (m_user != user) {
111
@@ -90,6 +105,10 @@
112
90
        if (changed.contains("demo-edges")) {
105
        if (changed.contains("demo-edges")) {
113
91
            updateDemoEdges();
106
            updateDemoEdges();
114
92
        }
107
        }
115
108
    } else if (interface == "com.ubuntu.touch.AccountsService.SecurityPrivacy") {
116
109
        if (changed.contains("StatsWelcomeScreen")) {
117
110
            updateStatsWelcomeScreen();
118
111
        }
119
93
    }
112
    }
120
94
}
113
}
121
95
114
122
96
115
123
=== modified file 'plugins/AccountsService/AccountsService.h'
124
--- plugins/AccountsService/AccountsService.h	2013-09-19 15:36:54 +0000
125
+++ plugins/AccountsService/AccountsService.h	2013-10-03 04:28:43 +0000
126
@@ -38,6 +38,9 @@
127
38
    Q_PROPERTY (QString backgroundFile
38
    Q_PROPERTY (QString backgroundFile
128
39
                READ backgroundFile
39
                READ backgroundFile
129
40
                NOTIFY backgroundFileChanged)
40
                NOTIFY backgroundFileChanged)
130
41
    Q_PROPERTY (bool statsWelcomeScreen
131
42
                READ statsWelcomeScreen
132
43
                NOTIFY statsWelcomeScreenChanged)
133
41
44
134
42
public:
45
public:
135
43
    explicit AccountsService(QObject *parent = 0);
46
    explicit AccountsService(QObject *parent = 0);
136
@@ -47,11 +50,13 @@
137
47
    bool demoEdges() const;
50
    bool demoEdges() const;
138
48
    void setDemoEdges(bool demoEdges);
51
    void setDemoEdges(bool demoEdges);
139
49
    QString backgroundFile() const;
52
    QString backgroundFile() const;
140
53
    bool statsWelcomeScreen() const;
141
50
54
142
51
Q_SIGNALS:
55
Q_SIGNALS:
143
52
    void userChanged();
56
    void userChanged();
144
53
    void demoEdgesChanged();
57
    void demoEdgesChanged();
145
54
    void backgroundFileChanged();
58
    void backgroundFileChanged();
146
59
    void statsWelcomeScreenChanged();
147
55
60
148
56
private Q_SLOTS:
61
private Q_SLOTS:
149
57
    void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
62
    void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
150
@@ -60,11 +65,13 @@
151
60
private:
65
private:
152
61
    void updateDemoEdges();
66
    void updateDemoEdges();
153
62
    void updateBackgroundFile();
67
    void updateBackgroundFile();
154
68
    void updateStatsWelcomeScreen();
155
63
69
156
64
    AccountsServiceDBusAdaptor *m_service;
70
    AccountsServiceDBusAdaptor *m_service;
157
65
    QString m_user;
71
    QString m_user;
158
66
    bool m_demoEdges;
72
    bool m_demoEdges;
159
67
    QString m_backgroundFile;
73
    QString m_backgroundFile;
160
74
    bool m_statsWelcomeScreen;
161
68
};
75
};
162
69
76
163
70
#endif
77
#endif
164
71
78
165
=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
166
--- tests/mocks/AccountsService/AccountsService.cpp	2013-09-19 17:10:23 +0000
167
+++ tests/mocks/AccountsService/AccountsService.cpp	2013-10-03 04:28:43 +0000
168
@@ -20,7 +20,8 @@
169
20
20
170
21
AccountsService::AccountsService(QObject* parent)
21
AccountsService::AccountsService(QObject* parent)
171
22
  : QObject(parent),
22
  : QObject(parent),
173
23
    m_backgroundFile(TOP_SRCDIR "/graphics/phone_background.jpg")
23
    m_backgroundFile(TOP_SRCDIR "/graphics/phone_background.jpg"),
174
24
    m_statsWelcomeScreen(true)
175
24
{
25
{
176
25
}
26
}
177
26
27
178
@@ -54,3 +55,14 @@
179
54
    m_backgroundFile = backgroundFile;
55
    m_backgroundFile = backgroundFile;
180
55
    backgroundFileChanged();
56
    backgroundFileChanged();
181
56
}
57
}
182
58
183
59
bool AccountsService::statsWelcomeScreen() const
184
60
{
185
61
    return m_statsWelcomeScreen;
186
62
}
187
63
188
64
void AccountsService::setStatsWelcomeScreen(bool statsWelcomeScreen)
189
65
{
190
66
    m_statsWelcomeScreen = statsWelcomeScreen;
191
67
    statsWelcomeScreenChanged();
192
68
}
193
57
69
194
=== modified file 'tests/mocks/AccountsService/AccountsService.h'
195
--- tests/mocks/AccountsService/AccountsService.h	2013-09-19 17:10:23 +0000
196
+++ tests/mocks/AccountsService/AccountsService.h	2013-10-03 04:28:43 +0000
197
@@ -39,6 +39,10 @@
198
39
                READ backgroundFile
39
                READ backgroundFile
199
40
                WRITE setBackgroundFile // only available in mock
40
                WRITE setBackgroundFile // only available in mock
200
41
                NOTIFY backgroundFileChanged)
41
                NOTIFY backgroundFileChanged)
201
42
    Q_PROPERTY (bool statsWelcomeScreen
202
43
                READ statsWelcomeScreen
203
44
                WRITE setStatsWelcomeScreen // only available in mock
204
45
                NOTIFY statsWelcomeScreenChanged)
205
42
46
206
43
public:
47
public:
207
44
    explicit AccountsService(QObject *parent = 0);
48
    explicit AccountsService(QObject *parent = 0);
208
@@ -49,14 +53,18 @@
209
49
    void setDemoEdges(bool demoEdges);
53
    void setDemoEdges(bool demoEdges);
210
50
    QString backgroundFile() const;
54
    QString backgroundFile() const;
211
51
    void setBackgroundFile(const QString &backgroundFile);
55
    void setBackgroundFile(const QString &backgroundFile);
212
56
    bool statsWelcomeScreen() const;
213
57
    void setStatsWelcomeScreen(bool statsWelcomeScreen);
214
52
58
215
53
Q_SIGNALS:
59
Q_SIGNALS:
216
54
    void userChanged();
60
    void userChanged();
217
55
    void demoEdgesChanged();
61
    void demoEdgesChanged();
218
56
    void backgroundFileChanged();
62
    void backgroundFileChanged();
219
63
    void statsWelcomeScreenChanged();
220
57
64
221
58
private:
65
private:
222
59
    QString m_backgroundFile;
66
    QString m_backgroundFile;
223
67
    bool m_statsWelcomeScreen;
224
60
};
68
};
225
61
69
226
62
#endif
70
#endif
227
63
71
228
=== modified file 'tests/mocks/libusermetrics/UserMetrics.cpp'
229
--- tests/mocks/libusermetrics/UserMetrics.cpp	2013-06-14 19:35:25 +0000
230
+++ tests/mocks/libusermetrics/UserMetrics.cpp	2013-10-03 04:28:43 +0000
231
@@ -228,7 +228,7 @@
232
228
228
233
229
void UserMetricsPrivate::setUsername(const QString &username)
229
void UserMetricsPrivate::setUsername(const QString &username)
234
230
{
230
{
236
231
    if (m_username == username) {
231
    if (m_username == username && m_newData) {
237
232
        return;
232
        return;
238
233
    }
233
    }
239
234
234
240
@@ -407,7 +407,11 @@
241
407
407
242
408
QString UserMetrics::label() const
408
QString UserMetrics::label() const
243
409
{
409
{
245
410
    return d_ptr->m_label;
410
    if (d_ptr->m_label.isEmpty()) {
246
411
        return "No data";
247
412
    } else {
248
413
        return d_ptr->m_label;
249
414
    }
250
411
}
415
}
251
412
416
252
413
QString UserMetrics::username() const
417
QString UserMetrics::username() const
253
414
418
254
=== modified file 'tests/qmltests/Greeter/tst_Infographics.qml'
255
--- tests/qmltests/Greeter/tst_Infographics.qml	2013-06-05 22:03:08 +0000
256
+++ tests/qmltests/Greeter/tst_Infographics.qml	2013-10-03 04:28:43 +0000
257
@@ -64,15 +64,15 @@
258
64
64
259
65
        function test_set_username_data() {
65
        function test_set_username_data() {
260
66
            return [
66
            return [
264
67
                { username: "has-password" },
67
                { username: "has-password", label: "<b>19</b> minutes talk time" },
265
68
                { username: "no-password" },
68
                { username: "two-factor", label: "No data" },
266
69
                { username: "empty-name" }
69
                { username: "", label: "No data" },
267
70
            ]
70
            ]
268
71
        }
71
        }
269
72
72
270
73
        function test_set_username(data) {
73
        function test_set_username(data) {
271
74
            infographicModel.username = data.username
74
            infographicModel.username = data.username
273
75
            tryCompare(label, "text", "<b>19</b> minutes talk time")
75
            tryCompare(label, "text", data.label)
274
76
        }
76
        }
275
77
    }
77
    }
276
78
78
277
79
79
278
=== modified file 'tests/qmltests/Greeter/tst_Phone.qml'
279
--- tests/qmltests/Greeter/tst_Phone.qml	2013-09-13 15:17:02 +0000
280
+++ tests/qmltests/Greeter/tst_Phone.qml	2013-10-03 04:28:43 +0000
281
@@ -19,6 +19,7 @@
282
19
import ".."
19
import ".."
283
20
import "../../../Greeter"
20
import "../../../Greeter"
284
21
import AccountsService 0.1
21
import AccountsService 0.1
285
22
import LightDM 0.1 as LightDM
286
22
import Ubuntu.Components 0.1
23
import Ubuntu.Components 0.1
287
23
import Unity.Test 0.1 as UT
24
import Unity.Test 0.1 as UT
288
24
25
289
@@ -53,6 +54,10 @@
290
53
        name: "Greeter"
54
        name: "Greeter"
291
54
        when: windowShown
55
        when: windowShown
292
55
56
293
57
        function cleanup() {
294
58
            AccountsService.statsWelcomeScreen = true
295
59
        }
296
60
297
56
        function test_properties() {
61
        function test_properties() {
298
57
            compare(greeter.multiUser, false)
62
            compare(greeter.multiUser, false)
299
58
            compare(greeter.narrowMode, true)
63
            compare(greeter.narrowMode, true)
300
@@ -105,6 +110,16 @@
301
105
            tryCompareFunction(function() { return greeter.x;},  0);
110
            tryCompareFunction(function() { return greeter.x;},  0);
302
106
        }
111
        }
303
107
112
304
113
        function test_statsWelcomeScreen() {
305
114
            // Test logic in greeter that turns statsWelcomeScreen setting into infographic changes
306
115
            compare(AccountsService.statsWelcomeScreen, true)
307
116
            tryCompare(LightDM.Infographic, "username", "single")
308
117
            AccountsService.statsWelcomeScreen = false
309
118
            tryCompare(LightDM.Infographic, "username", "")
310
119
            AccountsService.statsWelcomeScreen = true
311
120
            tryCompare(LightDM.Infographic, "username", "single")
312
121
        }
313
122
314
108
        function test_wallpaper_data() {
123
        function test_wallpaper_data() {
315
109
            return [
124
            return [
316
110
                {tag: "set", accounts: "../tests/data/unity/backgrounds/blue.png", expected: "blue.png"},
125
                {tag: "set", accounts: "../tests/data/unity/backgrounds/blue.png", expected: "blue.png"},
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-10-03
Michał Sawicz			Needs Information on 2013-10-02
Michael Zanetti (community)		2013-09-05	Approve on 2013-09-30
Review via email: mp+184153@code.launchpad.net