a2a6340 · unity8 · git.iko.soy

GreeterShell.qml+1−1

compare with xenial

unifiedsplit

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

111 onSelected: {

112 // Update launcher items for new user

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

114− AccountsService.setUser(user);

114+ AccountsService.user = user;

115 LauncherModel.setUser(user);

116 }

117

plugins/AccountsService/AccountsBindings.cpp+7

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

34 updateDemoEdgesForCurrentUser();

35}

36

37+QString AccountsBindings::getUser()

38+{

39+ return m_user;

40+}

41+

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

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

38{

43{

39 m_user = user;

44 m_user = user;

45+ Q_EMIT userChanged();

46+

40 updateDemoEdges();

47 updateDemoEdges();

41 updateBackgroundFile();

48 updateBackgroundFile();

42}

49}

plugins/AccountsService/AccountsBindings.h+7−2

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

27class AccountsBindings: public QObject

28{

29 Q_OBJECT

30+ Q_PROPERTY (QString user

31+ READ getUser

32+ WRITE setUser

33+ NOTIFY userChanged)

30 Q_PROPERTY (bool demoEdges

34 Q_PROPERTY (bool demoEdges

31 READ getDemoEdges

35 READ getDemoEdges

32 WRITE setDemoEdges

36 WRITE setDemoEdges

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

42public:

46public:

43 explicit AccountsBindings(QObject *parent = 0);

47 explicit AccountsBindings(QObject *parent = 0);

44

48

49+ QString getUser();

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

50+ void setUser(const QString &user);

46−

47 bool getDemoEdges();

51 bool getDemoEdges();

48 void setDemoEdges(bool demoEdges);

52 void setDemoEdges(bool demoEdges);

49 bool getDemoEdgesForCurrentUser();

53 bool getDemoEdgesForCurrentUser();

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

52 QString getBackgroundFile();

56 QString getBackgroundFile();

53

57

54Q_SIGNALS:

58Q_SIGNALS:

59+ void userChanged();

55 void demoEdgesChanged();

60 void demoEdgesChanged();

56 void demoEdgesForCurrentUserChanged();

61 void demoEdgesForCurrentUserChanged();

57 void backgroundFileChanged();

62 void backgroundFileChanged();

tests/mocks/AccountsService/AccountsBindings.cpp+5

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

23{

24}

25

26+QString AccountsBindings::getUser()

27+{

28+ return "testuser";

29+}

30+

26void AccountsBindings::setUser(const QString &)

31void AccountsBindings::setUser(const QString &)

27{

32{

28}

33}

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

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

27class AccountsBindings: public QObject

28{

29 Q_OBJECT

30+ Q_PROPERTY (QString user

31+ READ getUser

32+ WRITE setUser

33+ NOTIFY userChanged)

30 Q_PROPERTY (bool demoEdges

34 Q_PROPERTY (bool demoEdges

31 READ getDemoEdges

35 READ getDemoEdges

32 WRITE setDemoEdges

36 WRITE setDemoEdges

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

42public:

46public:

43 explicit AccountsBindings(QObject *parent = 0);

47 explicit AccountsBindings(QObject *parent = 0);

44

48

49+ QString getUser();

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

50+ void setUser(const QString &user);

46−

47 bool getDemoEdges();

51 bool getDemoEdges();

48 void setDemoEdges(bool demoEdges);

52 void setDemoEdges(bool demoEdges);

49 bool getDemoEdgesForCurrentUser();

53 bool getDemoEdgesForCurrentUser();

@@ -51,6 +55,7 @@ public:

51 QString getBackgroundFile();

55 QString getBackgroundFile();

52

56

53Q_SIGNALS:

57Q_SIGNALS:

58+ void userChanged();

54 void demoEdgesChanged();

59 void demoEdgesChanged();

55 void demoEdgesForCurrentUserChanged();

60 void demoEdgesForCurrentUserChanged();

56 void backgroundFileChanged();

61 void backgroundFileChanged();