a2a6340 · unity8 · git.iko.soy

git.iko.soy/unity8

Merge in wallpaper branch again

commita2a6340c9f98ef56f98f992cafdf481889a3b4fd authorMichael Terry <michael.terry@canonical.com> dateTue 3 Sep 2013, 12:23 (13 years ago) parentba246d2 6d2672c

5 files changed+27−5

compare with xenial

unifiedsplit

GreeterShell.qml+1−1 plugins/AccountsService/AccountsBindings.cpp+7 plugins/AccountsService/AccountsBindings.h+7−2 tests/mocks/AccountsService/AccountsBindings.cpp+5 tests/mocks/AccountsService/AccountsBindings.h+7−2

GreeterShell.qml+1−1

@@ -111,7 +111,7 @@ BasicShell {

111111 onSelected: {

112112 // Update launcher items for new user

113113 var user = LightDM.Users.data(uid, LightDM.UserRoles.NameRole);

114− AccountsService.setUser(user);

114+ AccountsService.user = user;

115115 LauncherModel.setUser(user);

116116 }

117117

plugins/AccountsService/AccountsBindings.cpp+7

@@ -34,9 +34,16 @@ AccountsBindings::AccountsBindings(QObject* parent)

3434 updateDemoEdgesForCurrentUser();

3535}

3636

37+QString AccountsBindings::getUser()

38+{

39+ return m_user;

40+}

41+

3742void AccountsBindings::setUser(const QString &user)

3843{

3944 m_user = user;

45+ Q_EMIT userChanged();

46+

4047 updateDemoEdges();

4148 updateBackgroundFile();

4249}

plugins/AccountsService/AccountsBindings.h+7−2

@@ -27,6 +27,10 @@ class AccountsService;

2727class AccountsBindings: public QObject

2828{

2929 Q_OBJECT

30+ Q_PROPERTY (QString user

31+ READ getUser

32+ WRITE setUser

33+ NOTIFY userChanged)

3034 Q_PROPERTY (bool demoEdges

3135 READ getDemoEdges

3236 WRITE setDemoEdges

@@ -42,8 +46,8 @@ class AccountsBindings: public QObject

4246public:

4347 explicit AccountsBindings(QObject *parent = 0);

4448

45− Q_INVOKABLE void setUser(const QString &user);

46−

49+ QString getUser();

50+ void setUser(const QString &user);

4751 bool getDemoEdges();

4852 void setDemoEdges(bool demoEdges);

4953 bool getDemoEdgesForCurrentUser();

@@ -52,6 +56,7 @@ public:

5256 QString getBackgroundFile();

5357

5458Q_SIGNALS:

59+ void userChanged();

5560 void demoEdgesChanged();

5661 void demoEdgesForCurrentUserChanged();

5762 void backgroundFileChanged();

tests/mocks/AccountsService/AccountsBindings.cpp+5

@@ -23,6 +23,11 @@ AccountsBindings::AccountsBindings(QObject* parent)

2323{

2424}

2525

26+QString AccountsBindings::getUser()

27+{

28+ return "testuser";

29+}

30+

2631void AccountsBindings::setUser(const QString &)

2732{

2833}

tests/mocks/AccountsService/AccountsBindings.h+7−2

@@ -27,6 +27,10 @@