1
=== modified file 'Components/EdgeDemo.qml'
2
--- Components/EdgeDemo.qml	2013-09-03 14:09:28 +0000
3
+++ Components/EdgeDemo.qml	2013-09-05 18:10:06 +0000
4
@@ -44,13 +44,13 @@
5
44
44
6
45
    function hideEdgeDemoInShell() {
45
    function hideEdgeDemoInShell() {
7
46
        var user = LightDM.Users.data(greeter.currentIndex, LightDM.UserRoles.NameRole);
46
        var user = LightDM.Users.data(greeter.currentIndex, LightDM.UserRoles.NameRole);
9
47
        AccountsService.setUserProperty(user, "demo-edges", false);
47
        AccountsService.demoEdges = false;
10
48
        d.showEdgeDemo = false;
48
        d.showEdgeDemo = false;
11
49
        stopDemo();
49
        stopDemo();
12
50
    }
50
    }
13
51
51
14
52
    function hideEdgeDemoInGreeter() {
52
    function hideEdgeDemoInGreeter() {
16
53
        // TODO: AccountsService.setUserProperty("lightdm", "demo-edges", false);
53
        // TODO: AccountsService.demoEdges = false as lightdm user
17
54
        d.showEdgeDemoInGreeter = false;
54
        d.showEdgeDemoInGreeter = false;
18
55
    }
55
    }
19
56
56
20
@@ -80,7 +80,7 @@
21
80
        property QtObject leftEdgeDemo
80
        property QtObject leftEdgeDemo
22
81
        property QtObject finalEdgeDemo
81
        property QtObject finalEdgeDemo
23
82
        property bool showEdgeDemo: false
82
        property bool showEdgeDemo: false
25
83
        property bool showEdgeDemoInGreeter: d.showEdgeDemo // TODO: AccountsService.getUserProperty("lightdm", "demo-edges")
83
        property bool showEdgeDemoInGreeter: d.showEdgeDemo // TODO: AccountsService.demoEdges as lightdm user
26
84
84
27
85
        onShowEdgeDemoInGreeterChanged: {
85
        onShowEdgeDemoInGreeterChanged: {
28
86
            if (!d.overlay && d.showEdgeDemoInGreeter) {
86
            if (!d.overlay && d.showEdgeDemoInGreeter) {
29
@@ -126,7 +126,7 @@
30
126
126
31
127
        onSelected: {
127
        onSelected: {
32
128
            var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole)
128
            var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole)
34
129
            d.showEdgeDemo = AccountsService.getUserProperty(user, "demo-edges")
129
            d.showEdgeDemo = AccountsService.demoEdges
35
130
        }
130
        }
36
131
    }
131
    }
37
132
132
38
133
133
39
=== modified file 'Greeter/GreeterContent.qml'
40
--- Greeter/GreeterContent.qml	2013-08-28 20:50:37 +0000
41
+++ Greeter/GreeterContent.qml	2013-09-05 18:10:06 +0000
42
@@ -15,6 +15,7 @@
43
15
 */
15
 */
44
16
16
45
17
import QtQuick 2.0
17
import QtQuick 2.0
46
18
import AccountsService 0.1
47
18
import Ubuntu.Components 0.1
19
import Ubuntu.Components 0.1
48
19
import LightDM 0.1 as LightDM
20
import LightDM 0.1 as LightDM
49
20
import "../Components"
21
import "../Components"
50
@@ -39,14 +40,30 @@
51
39
        color: "black"
40
        color: "black"
52
40
    }
41
    }
53
41
42
54
43
    property url backgroundValue: AccountsService.backgroundFile != undefined && AccountsService.backgroundFile.length > 0 ? AccountsService.backgroundFile : shell.defaultBackground
55
44
    onBackgroundValueChanged: wallpaper.source = backgroundValue
56
45
57
42
    CrossFadeImage {
46
    CrossFadeImage {
58
43
        id: wallpaper
47
        id: wallpaper
59
44
60
45
        source: shell.background
61
46
        anchors.fill: parent
48
        anchors.fill: parent
62
47
        fadeInFirst: false
49
        fadeInFirst: false
63
48
    }
50
    }
64
49
51
65
52
    // See Shell.qml's backgroundSettings treatment for why we need a separate
66
53
    // Image, but it boils down to avoiding binding loop detection.
67
54
    Image {
68
55
        source: wallpaper.source
69
56
        height: 0
70
57
        width: 0
71
58
        sourceSize.height: 0
72
59
        sourceSize.width: 0
73
60
        onStatusChanged: {
74
61
            if (status == Image.Error && source != shell.defaultBackground) {
75
62
                wallpaper.source = shell.defaultBackground
76
63
            }
77
64
        }
78
65
    }
79
66
80
50
    Rectangle {
67
    Rectangle {
81
51
        anchors.fill: parent
68
        anchors.fill: parent
82
52
        color: "black"
69
        color: "black"
83
53
70
84
=== modified file 'Shell.qml'
85
--- Shell.qml	2013-09-04 20:40:11 +0000
86
+++ Shell.qml	2013-09-05 18:10:06 +0000
87
@@ -15,6 +15,7 @@
88
15
 */
15
 */
89
16
16
90
17
import QtQuick 2.0
17
import QtQuick 2.0
91
18
import AccountsService 0.1
92
18
import GSettings 1.0
19
import GSettings 1.0
93
19
import Ubuntu.Application 0.1
20
import Ubuntu.Application 0.1
94
20
import Ubuntu.Components 0.1
21
import Ubuntu.Components 0.1
95
@@ -478,6 +479,7 @@
96
478
        onSelected: {
479
        onSelected: {
97
479
            // Update launcher items for new user
480
            // Update launcher items for new user
98
480
            var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
481
            var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);
99
482
            AccountsService.user = user;
100
481
            LauncherModel.setUser(user);
483
            LauncherModel.setUser(user);
101
482
        }
484
        }
102
483
485
103
484
486
104
=== added file 'plugins/AccountsService/AccountsService.cpp'
105
--- plugins/AccountsService/AccountsService.cpp	1970-01-01 00:00:00 +0000
106
+++ plugins/AccountsService/AccountsService.cpp	2013-09-05 18:10:06 +0000
107
@@ -0,0 +1,104 @@
108
1
/*
109
2
 * Copyright (C) 2013 Canonical, Ltd.
110
3
 *
111
4
 * This program is free software; you can redistribute it and/or modify
112
5
 * it under the terms of the GNU General Public License as published by
113
6
 * the Free Software Foundation; version 3.
114
7
 *
115
8
 * This program is distributed in the hope that it will be useful,
116
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
117
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
118
11
 * GNU General Public License for more details.
119
12
 *
120
13
 * You should have received a copy of the GNU General Public License
121
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
122
15
 *
123
16
 * Author: Michael Terry <michael.terry@canonical.com>
124
17
 */
125
18
126
19
#include "AccountsService.h"
127
20
#include "AccountsServiceDBusAdaptor.h"
128
21
129
22
#include <QStringList>
130
23
131
24
AccountsService::AccountsService(QObject* parent)
132
25
  : QObject(parent),
133
26
    m_service(new AccountsServiceDBusAdaptor(this)),
134
27
    m_user(qgetenv("USER"))
135
28
{
136
29
    connect(m_service, SIGNAL(propertiesChanged(const QString &, const QString &, const QStringList &)),
137
30
            this, SLOT(propertiesChanged(const QString &, const QString &, const QStringList &)));
138
31
    connect(m_service, SIGNAL(maybeChanged(const QString &)),
139
32
            this, SLOT(maybeChanged(const QString &)));
140
33
}
141
34
142
35
QString AccountsService::getUser()
143
36
{
144
37
    return m_user;
145
38
}
146
39
147
40
void AccountsService::setUser(const QString &user)
148
41
{
149
42
    m_user = user;
150
43
    Q_EMIT userChanged();
151
44
152
45
    updateDemoEdges();
153
46
    updateBackgroundFile();
154
47
}
155
48
156
49
bool AccountsService::getDemoEdges()
157
50
{
158
51
    return m_demoEdges;
159
52
}
160
53
161
54
void AccountsService::setDemoEdges(bool demoEdges)
162
55
{
163
56
    m_demoEdges = demoEdges;
164
57
    m_service->setUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges", demoEdges);
165
58
}
166
59
167
60
QString AccountsService::getBackgroundFile()
168
61
{
169
62
    return m_backgroundFile;
170
63
}
171
64
172
65
void AccountsService::updateDemoEdges()
173
66
{
174
67
    auto demoEdges = m_service->getUserProperty(m_user, "com.canonical.unity.AccountsService", "demo-edges").toBool();
175
68
    if (m_demoEdges != demoEdges) {
176
69
        m_demoEdges = demoEdges;
177
70
        Q_EMIT demoEdgesChanged();
178
71
    }
179
72
}
180
73
181
74
void AccountsService::updateBackgroundFile()
182
75
{
183
76
    auto backgroundFile = m_service->getUserProperty(m_user, "org.freedesktop.Accounts.User", "BackgroundFile").toString();
184
77
    if (m_backgroundFile != backgroundFile) {
185
78
        m_backgroundFile = backgroundFile;
186
79
        Q_EMIT backgroundFileChanged();
187
80
    }
188
81
}
189
82
190
83
void AccountsService::propertiesChanged(const QString &user, const QString &interface, const QStringList &changed)
191
84
{
192
85
    if (m_user != user) {
193
86
        return;
194
87
    }
195
88
196
89
    if (interface == "com.canonical.unity.AccountsService") {
197
90
        if (changed.contains("demo-edges")) {
198
91
            updateDemoEdges();
199
92
        }
200
93
    }
201
94
}
202
95
203
96
void AccountsService::maybeChanged(const QString &user)
204
97
{
205
98
    if (m_user != user) {
206
99
        return;
207
100
    }
208
101
209
102
    // Standard properties might have changed
210
103
    updateBackgroundFile();
211
104
}
212
0
105
213
=== added file 'plugins/AccountsService/AccountsService.h'
214
--- plugins/AccountsService/AccountsService.h	1970-01-01 00:00:00 +0000
215
+++ plugins/AccountsService/AccountsService.h	2013-09-05 18:10:06 +0000
216
@@ -0,0 +1,70 @@
217
1
/*
218
2
 * Copyright (C) 2013 Canonical, Ltd.
219
3
 *
220
4
 * This program is free software; you can redistribute it and/or modify
221
5
 * it under the terms of the GNU General Public License as published by
222
6
 * the Free Software Foundation; version 3.
223
7
 *
224
8
 * This program is distributed in the hope that it will be useful,
225
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
226
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
227
11
 * GNU General Public License for more details.
228
12
 *
229
13
 * You should have received a copy of the GNU General Public License
230
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
231
15
 *
232
16
 * Authors: Michael Terry <michael.terry@canonical.com>
233
17
 */
234
18
235
19
#ifndef UNITY_ACCOUNTSSERVICE_H
236
20
#define UNITY_ACCOUNTSSERVICE_H
237
21
238
22
#include <QObject>
239
23
#include <QString>
240
24
241
25
class AccountsServiceDBusAdaptor;
242
26
243
27
class AccountsService: public QObject
244
28
{
245
29
    Q_OBJECT
246
30
    Q_PROPERTY (QString user
247
31
                READ getUser
248
32
                WRITE setUser
249
33
                NOTIFY userChanged)
250
34
    Q_PROPERTY (bool demoEdges
251
35
                READ getDemoEdges
252
36
                WRITE setDemoEdges
253
37
                NOTIFY demoEdgesChanged)
254
38
    Q_PROPERTY (QString backgroundFile
255
39
                READ getBackgroundFile
256
40
                NOTIFY backgroundFileChanged)
257
41
258
42
public:
259
43
    explicit AccountsService(QObject *parent = 0);
260
44
261
45
    QString getUser();
262
46
    void setUser(const QString &user);
263
47
    bool getDemoEdges();
264
48
    void setDemoEdges(bool demoEdges);
265
49
    QString getBackgroundFile();
266
50
267
51
Q_SIGNALS:
268
52
    void userChanged();
269
53
    void demoEdgesChanged();
270
54
    void backgroundFileChanged();
271
55
272
56
private Q_SLOTS:
273
57
    void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
274
58
    void maybeChanged(const QString &user);
275
59
276
60
private:
277
61
    void updateDemoEdges();
278
62
    void updateBackgroundFile();
279
63
280
64
    AccountsServiceDBusAdaptor *m_service;
281
65
    QString m_user;
282
66
    bool m_demoEdges;
283
67
    QString m_backgroundFile;
284
68
};
285
69
286
70
#endif
287
0
71
288
=== renamed file 'plugins/AccountsService/AccountsService.cpp' => 'plugins/AccountsService/AccountsServiceDBusAdaptor.cpp'
289
--- plugins/AccountsService/AccountsService.cpp	2013-08-22 14:54:08 +0000
290
+++ plugins/AccountsService/AccountsServiceDBusAdaptor.cpp	2013-09-05 18:10:06 +0000
291
@@ -16,13 +16,13 @@
292
16
 * Author: Michael Terry <michael.terry@canonical.com>
16
 * Author: Michael Terry <michael.terry@canonical.com>
293
17
 */
17
 */
294
18
18
296
19
#include "AccountsService.h"
19
#include "AccountsServiceDBusAdaptor.h"
297
20
#include <QDBusConnection>
20
#include <QDBusConnection>
298
21
#include <QDBusConnectionInterface>
21
#include <QDBusConnectionInterface>
299
22
#include <QDBusMessage>
22
#include <QDBusMessage>
300
23
#include <QDBusVariant>
23
#include <QDBusVariant>
301
24
24
303
25
AccountsService::AccountsService(QObject* parent)
25
AccountsServiceDBusAdaptor::AccountsServiceDBusAdaptor(QObject* parent)
304
26
  : QObject(parent),
26
  : QObject(parent),
305
27
    accounts_manager(NULL),
27
    accounts_manager(NULL),
306
28
    users()
28
    users()
307
@@ -36,11 +36,11 @@
308
36
                                          connection, this);
36
                                          connection, this);
309
37
}
37
}
310
38
38
312
39
QVariant AccountsService::getUserProperty(const QString &user, const QString &property)
39
QVariant AccountsServiceDBusAdaptor::getUserProperty(const QString &user, const QString &interface, const QString &property)
313
40
{
40
{
314
41
    auto iface = getUserInterface(user);
41
    auto iface = getUserInterface(user);
315
42
    if (iface != nullptr && iface->isValid()) {
42
    if (iface != nullptr && iface->isValid()) {
317
43
        auto answer = iface->call("Get", "com.canonical.unity.AccountsService", property);
43
        auto answer = iface->call("Get", interface, property);
318
44
        if (answer.type() == QDBusMessage::ReplyMessage) {
44
        if (answer.type() == QDBusMessage::ReplyMessage) {
319
45
            return answer.arguments()[0].value<QDBusVariant>().variant();
45
            return answer.arguments()[0].value<QDBusVariant>().variant();
320
46
        }
46
        }
321
@@ -48,25 +48,77 @@
322
48
    return QVariant();
48
    return QVariant();
323
49
}
49
}
324
50
50
326
51
void AccountsService::setUserProperty(const QString &user, const QString &property, const QVariant &value)
51
void AccountsServiceDBusAdaptor::setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value)
327
52
{
52
{
328
53
    auto iface = getUserInterface(user);
53
    auto iface = getUserInterface(user);
329
54
    if (iface != nullptr && iface->isValid()) {
54
    if (iface != nullptr && iface->isValid()) {
330
55
        // The value needs to be carefully wrapped
55
        // The value needs to be carefully wrapped
336
56
        iface->call("Set", "com.canonical.unity.AccountsService", property, QVariant::fromValue(QDBusVariant(value)));
56
        iface->call("Set", interface, property, QVariant::fromValue(QDBusVariant(value)));
337
57
    }
57
    }
338
58
}
58
}
339
59
59
340
60
QDBusInterface *AccountsService::getUserInterface(const QString &user)
60
void AccountsServiceDBusAdaptor::propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid)
341
61
{
342
62
    // Merge changed and invalidated together
343
63
    QStringList combined;
344
64
    combined << invalid;
345
65
    combined << changed.keys();
346
66
    combined.removeDuplicates();
347
67
348
68
    Q_EMIT propertiesChanged(getUserForPath(message().path()), interface, combined);
349
69
}
350
70
351
71
void AccountsServiceDBusAdaptor::maybeChangedSlot()
352
72
{
353
73
    Q_EMIT maybeChanged(getUserForPath(message().path()));
354
74
}
355
75
356
76
QString AccountsServiceDBusAdaptor::getUserForPath(const QString &path)
357
77
{
358
78
    QMap<QString, QDBusInterface *>::const_iterator i;
359
79
    for (i = users.constBegin(); i != users.constEnd(); ++i) {
360
80
        if (i.value()->path() == path) {
361
81
            return i.key();
362
82
        }
363
83
    }
364
84
    return QString();
365
85
}
366
86
367
87
QDBusInterface *AccountsServiceDBusAdaptor::getUserInterface(const QString &user)
368
61
{
88
{
369
62
    auto iface = users.value(user);
89
    auto iface = users.value(user);
370
63
    if (iface == nullptr && accounts_manager->isValid()) {
90
    if (iface == nullptr && accounts_manager->isValid()) {
371
64
        auto answer = accounts_manager->call("FindUserByName", user);
91
        auto answer = accounts_manager->call("FindUserByName", user);
372
65
        if (answer.type() == QDBusMessage::ReplyMessage) {
92
        if (answer.type() == QDBusMessage::ReplyMessage) {
373
93
            auto path = answer.arguments()[0].value<QDBusObjectPath>().path();
374
94
375
66
            iface = new QDBusInterface("org.freedesktop.Accounts",
95
            iface = new QDBusInterface("org.freedesktop.Accounts",
377
67
                                       answer.arguments()[0].value<QDBusObjectPath>().path(),
96
                                       path,
378
68
                                       "org.freedesktop.DBus.Properties",
97
                                       "org.freedesktop.DBus.Properties",
379
69
                                       accounts_manager->connection(), this);
98
                                       accounts_manager->connection(), this);
380
99
381
100
            // With its own pre-defined properties, AccountsService is oddly
382
101
            // close-lipped.  It won't send out proper DBus.Properties notices,
383
102
            // but it does have one catch-all Changed() signal.  So let's
384
103
            // listen to that.
385
104
            iface->connection().connect(
386
105
                iface->service(),
387
106
                path,
388
107
                "org.freedesktop.Accounts.User",
389
108
                "Changed",
390
109
                this,
391
110
                SLOT(maybeChangedSlot()));
392
111
393
112
            // But custom properties do send out the right notifications, so
394
113
            // let's still listen there.
395
114
            iface->connection().connect(
396
115
                iface->service(),
397
116
                path,
398
117
                "org.freedesktop.DBus.Properties",
399
118
                "PropertiesChanged",
400
119
                this,
401
120
                SLOT(propertiesChangedSlot(QString, QVariantMap, QStringList)));
402
121
403
70
            users.insert(user, iface);
122
            users.insert(user, iface);
404
71
        }
123
        }
405
72
    }
124
    }
406
73
125
407
=== renamed file 'plugins/AccountsService/AccountsService.h' => 'plugins/AccountsService/AccountsServiceDBusAdaptor.h'
408
--- plugins/AccountsService/AccountsService.h	2013-08-27 17:29:16 +0000
409
+++ plugins/AccountsService/AccountsServiceDBusAdaptor.h	2013-09-05 18:10:06 +0000
410
@@ -1,5 +1,5 @@
411
1
/*
1
/*
413
2
 * Copyright (C) 2012,2013 Canonical, Ltd.
2
 * Copyright (C) 2013 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
@@ -16,26 +16,36 @@
418
16
 * Authors: Michael Terry <michael.terry@canonical.com>
16
 * Authors: Michael Terry <michael.terry@canonical.com>
419
17
 */
17
 */
420
18
18
423
19
#ifndef UNITY_ACCOUNTSSERVICE_H
19
#ifndef UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H
424
20
#define UNITY_ACCOUNTSSERVICE_H
20
#define UNITY_ACCOUNTSSERVICEDBUSADAPTOR_H
425
21
21
426
22
#include <QDBusContext>
427
22
#include <QDBusInterface>
23
#include <QDBusInterface>
428
23
#include <QMap>
24
#include <QMap>
429
24
#include <QObject>
25
#include <QObject>
430
25
#include <QString>
26
#include <QString>
431
26
27
433
27
class AccountsService: public QObject
28
class AccountsServiceDBusAdaptor: public QObject, public QDBusContext
434
28
{
29
{
435
29
    Q_OBJECT
30
    Q_OBJECT
436
30
31
437
31
public:
32
public:
442
32
    explicit AccountsService(QObject *parent = 0);
33
    explicit AccountsServiceDBusAdaptor(QObject *parent = 0);
443
33
34
444
34
    Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &property);
35
    Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &interface, const QString &property);
445
35
    Q_INVOKABLE void setUserProperty(const QString &user, const QString &property, const QVariant &value);
36
    Q_INVOKABLE void setUserProperty(const QString &user, const QString &interface, const QString &property, const QVariant &value);
446
37
447
38
Q_SIGNALS:
448
39
    void propertiesChanged(const QString &user, const QString &interface, const QStringList &changed);
449
40
    void maybeChanged(const QString &user); // Standard properties might have changed
450
41
451
42
private Q_SLOTS:
452
43
    void propertiesChangedSlot(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
453
44
    void maybeChangedSlot();
454
36
45
455
37
private:
46
private:
456
38
    QDBusInterface *getUserInterface(const QString &user);
47
    QDBusInterface *getUserInterface(const QString &user);
457
48
    QString getUserForPath(const QString &path);
458
39
49
459
40
    QDBusInterface *accounts_manager;
50
    QDBusInterface *accounts_manager;
460
41
    QMap<QString, QDBusInterface *> users;
51
    QMap<QString, QDBusInterface *> users;
461
42
52
462
=== modified file 'plugins/AccountsService/CMakeLists.txt'
463
--- plugins/AccountsService/CMakeLists.txt	2013-08-22 20:16:41 +0000
464
+++ plugins/AccountsService/CMakeLists.txt	2013-09-05 18:10:06 +0000
465
@@ -4,6 +4,7 @@
466
4
4
467
5
add_library(AccountsService-qml MODULE
5
add_library(AccountsService-qml MODULE
468
6
    AccountsService.cpp
6
    AccountsService.cpp
469
7
    AccountsServiceDBusAdaptor.cpp
470
7
    plugin.cpp
8
    plugin.cpp
471
8
    )
9
    )
472
9
10
473
10
11
474
=== modified file 'plugins/Unity/Launcher/CMakeLists.txt'
475
--- plugins/Unity/Launcher/CMakeLists.txt	2013-09-02 08:53:33 +0000
476
+++ plugins/Unity/Launcher/CMakeLists.txt	2013-09-05 18:10:06 +0000
477
@@ -17,7 +17,7 @@
478
17
    quicklistmodel.cpp
17
    quicklistmodel.cpp
479
18
    common/quicklistentry.cpp
18
    common/quicklistentry.cpp
480
19
    backend/launcherbackend.cpp
19
    backend/launcherbackend.cpp
482
20
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp
20
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
483
21
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
21
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
484
22
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
22
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherModelInterface.h
485
23
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
23
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/QuickListModelInterface.h
486
24
24
487
=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.cpp'
488
--- plugins/Unity/Launcher/backend/launcherbackend.cpp	2013-09-05 16:01:00 +0000
489
+++ plugins/Unity/Launcher/backend/launcherbackend.cpp	2013-09-05 18:10:06 +0000
490
@@ -18,7 +18,7 @@
491
18
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
18
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
492
19
 */
19
 */
493
20
20
495
21
#include "AccountsService.h"
21
#include "AccountsServiceDBusAdaptor.h"
496
22
#include "launcherbackend.h"
22
#include "launcherbackend.h"
497
23
23
498
24
#include <QDir>
24
#include <QDir>
499
@@ -43,7 +43,7 @@
500
43
    m_accounts(nullptr)
43
    m_accounts(nullptr)
501
44
{
44
{
502
45
    if (useStorage) {
45
    if (useStorage) {
504
46
        m_accounts = new AccountsService(this);
46
        m_accounts = new AccountsServiceDBusAdaptor(this);
505
47
    }
47
    }
506
48
    m_user = qgetenv("USER");
48
    m_user = qgetenv("USER");
507
49
    syncFromAccounts();
49
    syncFromAccounts();
508
@@ -214,7 +214,7 @@
509
214
    m_storedApps.clear();
214
    m_storedApps.clear();
510
215
215
511
216
    if (m_accounts && !m_user.isEmpty()) {
216
    if (m_accounts && !m_user.isEmpty()) {
513
217
        QVariant variant = m_accounts->getUserProperty(m_user, "launcher-items");
217
        QVariant variant = m_accounts->getUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items");
514
218
        apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
218
        apps = qdbus_cast<QList<QVariantMap>>(variant.value<QDBusArgument>());
515
219
        defaults = isDefaultsItem(apps);
219
        defaults = isDefaultsItem(apps);
516
220
    }
220
    }
517
@@ -257,7 +257,7 @@
518
257
            items << itemToVariant(appId);
257
            items << itemToVariant(appId);
519
258
        }
258
        }
520
259
259
522
260
        m_accounts->setUserProperty(m_user, "launcher-items", QVariant::fromValue(items));
260
        m_accounts->setUserProperty(m_user, "com.canonical.unity.AccountsService", "launcher-items", QVariant::fromValue(items));
523
261
    }
261
    }
524
262
}
262
}
525
263
263
526
264
264
527
=== modified file 'plugins/Unity/Launcher/backend/launcherbackend.h'
528
--- plugins/Unity/Launcher/backend/launcherbackend.h	2013-09-02 08:53:33 +0000
529
+++ plugins/Unity/Launcher/backend/launcherbackend.h	2013-09-05 18:10:06 +0000
530
@@ -25,7 +25,7 @@
531
25
#include <QSettings>
25
#include <QSettings>
532
26
#include <QStringList>
26
#include <QStringList>
533
27
27
535
28
class AccountsService;
28
class AccountsServiceDBusAdaptor;
536
29
29
537
30
/**
30
/**
538
31
  * @brief An interface that provides all the data needed by the launcher.
31
  * @brief An interface that provides all the data needed by the launcher.
539
@@ -156,7 +156,7 @@
540
156
    QList<QString> m_storedApps;
156
    QList<QString> m_storedApps;
541
157
    mutable QHash<QString, LauncherBackendItem*> m_itemCache;
157
    mutable QHash<QString, LauncherBackendItem*> m_itemCache;
542
158
158
544
159
    AccountsService *m_accounts;
159
    AccountsServiceDBusAdaptor *m_accounts;
545
160
    QString m_user;
160
    QString m_user;
546
161
};
161
};
547
162
162
548
163
163
549
=== modified file 'tests/mocks/AccountsService/AccountsService.cpp'
550
--- tests/mocks/AccountsService/AccountsService.cpp	2013-08-02 20:03:16 +0000
551
+++ tests/mocks/AccountsService/AccountsService.cpp	2013-09-05 18:10:06 +0000
552
@@ -23,11 +23,27 @@
553
23
{
23
{
554
24
}
24
}
555
25
25
563
26
QVariant AccountsService::getUserProperty(const QString &, const QString &)
26
QString AccountsService::getUser()
564
27
{
27
{
565
28
    return QVariant(false);
28
    return "testuser";
566
29
}
29
}
567
30
30
568
31
void AccountsService::setUserProperty(const QString &, const QString &, const QVariant &)
31
void AccountsService::setUser(const QString &user)
569
32
{
32
{
570
33
    Q_UNUSED(user)
571
34
}
572
35
573
36
bool AccountsService::getDemoEdges()
574
37
{
575
38
    return false;
576
39
}
577
40
578
41
void AccountsService::setDemoEdges(bool demoEdges)
579
42
{
580
43
    Q_UNUSED(demoEdges)
581
44
}
582
45
583
46
QString AccountsService::getBackgroundFile()
584
47
{
585
48
    return TOP_SRCDIR "/graphics/phone_background.jpg";
586
33
}
49
}
587
34
50
588
=== modified file 'tests/mocks/AccountsService/AccountsService.h'
589
--- tests/mocks/AccountsService/AccountsService.h	2013-08-27 17:34:46 +0000
590
+++ tests/mocks/AccountsService/AccountsService.h	2013-09-05 18:10:06 +0000
591
@@ -1,5 +1,5 @@
592
1
/*
1
/*
594
2
 * Copyright (C) 2012,2013 Canonical, Ltd.
2
 * Copyright (C) 2013 Canonical, Ltd.
595
3
 *
3
 *
596
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
597
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
598
@@ -27,12 +27,31 @@
599
27
class AccountsService: public QObject
27
class AccountsService: public QObject
600
28
{
28
{
601
29
    Q_OBJECT
29
    Q_OBJECT
602
30
    Q_PROPERTY (QString user
603
31
                READ getUser
604
32
                WRITE setUser
605
33
                NOTIFY userChanged)
606
34
    Q_PROPERTY (bool demoEdges
607
35
                READ getDemoEdges
608
36
                WRITE setDemoEdges
609
37
                NOTIFY demoEdgesChanged)
610
38
    Q_PROPERTY (QString backgroundFile
611
39
                READ getBackgroundFile
612
40
                NOTIFY backgroundFileChanged)
613
30
41
614
31
public:
42
public:
615
32
    explicit AccountsService(QObject *parent = 0);
43
    explicit AccountsService(QObject *parent = 0);
616
33
44
619
34
    Q_INVOKABLE QVariant getUserProperty(const QString &user, const QString &property);
45
    QString getUser();
620
35
    Q_INVOKABLE void setUserProperty(const QString &user, const QString &property, const QVariant &value);
46
    void setUser(const QString &user);
621
47
    bool getDemoEdges();
622
48
    void setDemoEdges(bool demoEdges);
623
49
    QString getBackgroundFile();
624
50
625
51
Q_SIGNALS:
626
52
    void userChanged();
627
53
    void demoEdgesChanged();
628
54
    void backgroundFileChanged();
629
36
};
55
};
630
37
56
631
38
#endif
57
#endif
632
39
58
633
=== modified file 'tests/mocks/AccountsService/CMakeLists.txt'
634
--- tests/mocks/AccountsService/CMakeLists.txt	2013-07-30 23:22:48 +0000
635
+++ tests/mocks/AccountsService/CMakeLists.txt	2013-09-05 18:10:06 +0000
636
@@ -1,3 +1,5 @@
637
1
add_definitions(-DTOP_SRCDIR="${CMAKE_SOURCE_DIR}")
638
2
639
1
add_library(MockAccountsService-qml MODULE
3
add_library(MockAccountsService-qml MODULE
640
2
    AccountsService.cpp
4
    AccountsService.cpp
641
3
    plugin.cpp
5
    plugin.cpp
642
4
6
643
=== modified file 'tests/plugins/AccountsService/CMakeLists.txt'
644
--- tests/plugins/AccountsService/CMakeLists.txt	2013-08-13 23:35:31 +0000
645
+++ tests/plugins/AccountsService/CMakeLists.txt	2013-09-05 18:10:06 +0000
646
@@ -25,6 +25,7 @@
647
25
25
648
26
add_executable(test-accountsservice
26
add_executable(test-accountsservice
649
27
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp
27
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp
650
28
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
651
28
    client.cpp
29
    client.cpp
652
29
    )
30
    )
653
30
qt5_use_modules(test-accountsservice Core DBus Test)
31
qt5_use_modules(test-accountsservice Core DBus Test)
654
31
32
655
=== modified file 'tests/plugins/AccountsService/client.cpp'
656
--- tests/plugins/AccountsService/client.cpp	2013-08-22 14:54:08 +0000
657
+++ tests/plugins/AccountsService/client.cpp	2013-09-05 18:10:06 +0000
658
@@ -18,6 +18,7 @@
659
18
 */
18
 */
660
19
19
661
20
#include "AccountsService.h"
20
#include "AccountsService.h"
662
21
#include "AccountsServiceDBusAdaptor.h"
663
21
#include <QSignalSpy>
22
#include <QSignalSpy>
664
22
#include <QTest>
23
#include <QTest>
665
23
24
666
@@ -30,17 +31,28 @@
667
30
    void testInvalids()
31
    void testInvalids()
668
31
    {
32
    {
669
32
        // Test various invalid calls
33
        // Test various invalid calls
681
33
        AccountsService session;
34
        AccountsServiceDBusAdaptor session;
682
34
        QCOMPARE(session.getUserProperty("NOPE", "demo-edges"), QVariant());
35
        QCOMPARE(session.getUserProperty("NOPE", "com.canonical.unity.AccountsService", "demo-edges"), QVariant());
683
35
        QCOMPARE(session.getUserProperty("testuser", "NOPE"), QVariant());
36
        QCOMPARE(session.getUserProperty("testuser", "com.canonical.unity.AccountsService", "NOPE"), QVariant());
684
36
    }
37
    }
685
37
38
686
38
    void testGetSet()
39
    void testGetSetServiceDBusAdaptor()
687
39
    {
40
    {
688
40
        AccountsService session;
41
        AccountsServiceDBusAdaptor session;
689
41
        QCOMPARE(session.getUserProperty("testuser", "demo-edges"), QVariant(true));
42
        session.setUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges", QVariant(true));
690
42
        session.setUserProperty("testuser", "demo-edges", QVariant(false));
43
        QCOMPARE(session.getUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges"), QVariant(true));
691
43
        QCOMPARE(session.getUserProperty("testuser", "demo-edges"), QVariant(false));
44
        session.setUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges", QVariant(false));
692
45
        QCOMPARE(session.getUserProperty("testuser", "com.canonical.unity.AccountsService", "demo-edges"), QVariant(false));
693
46
    }
694
47
695
48
    void testGetSetService()
696
49
    {
697
50
        AccountsService session;
698
51
        session.setUser("testuser");
699
52
        session.setDemoEdges(true);
700
53
        QCOMPARE(session.getDemoEdges(), true);
701
54
        session.setDemoEdges(false);
702
55
        QCOMPARE(session.getDemoEdges(), false);
703
44
    }
56
    }
704
45
};
57
};
705
46
58
706
47
59
707
=== modified file 'tests/plugins/Unity/Launcher/CMakeLists.txt'
708
--- tests/plugins/Unity/Launcher/CMakeLists.txt	2013-09-04 22:30:51 +0000
709
+++ tests/plugins/Unity/Launcher/CMakeLists.txt	2013-09-05 18:10:06 +0000
710
@@ -21,7 +21,7 @@
711
21
add_custom_target(launcherbackendtest ${testBackendCommand})
21
add_custom_target(launcherbackendtest ${testBackendCommand})
712
22
add_executable(launcherbackendtestExec
22
add_executable(launcherbackendtestExec
713
23
    launcherbackendtest.cpp
23
    launcherbackendtest.cpp
715
24
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp
24
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
716
25
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp
25
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp
717
26
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp
26
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp
718
27
    )
27
    )
719
@@ -39,7 +39,7 @@
720
39
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launchermodel.cpp
39
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launchermodel.cpp
721
40
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launcheritem.cpp
40
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/launcheritem.cpp
722
41
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistmodel.cpp
41
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/quicklistmodel.cpp
724
42
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsService.cpp
42
    ${CMAKE_SOURCE_DIR}/plugins/AccountsService/AccountsServiceDBusAdaptor.cpp
725
43
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp
43
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/backend/launcherbackend.cpp
726
44
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp
44
    ${CMAKE_SOURCE_DIR}/plugins/Unity/Launcher/common/quicklistentry.cpp
727
45
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
45
    ${LAUNCHER_API_INCLUDEDIR}/unity/shell/launcher/LauncherItemInterface.h
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-09-09
Michael Zanetti (community)		2013-08-29	Approve on 2013-09-06
Review via email: mp+183018@code.launchpad.net