d33d6c1 · unity8 · git.iko.soy

git.iko.soy/unity8

[CHECKPOINT COMMIT] Add logic to determine if the greeter is being

shown as a lockscreen. Greeter currently doesn't use this information.

commitd33d6c1c3550e1d5eceb30ab8664870ecce50989 authorJosh Arenson <joshua.arenson@canonical.com> dateWed 23 Dec 2015, 16:25 (11 years ago) parentde83d33

3 files changed+14

compare with xenial

unifiedsplit

plugins/LightDM/Greeter.cpp+6 plugins/LightDM/Greeter.h+2 qml/Greeter/Greeter.qml+6

plugins/LightDM/Greeter.cpp+6

@@ -77,6 +77,12 @@ QString Greeter::defaultSessionHint() const

7777 return d->m_greeter->defaultSessionHint();

7878}

7979

80+bool Greeter::lockHint() const

81+{

82+ Q_D(const Greeter);

83+ return d->m_greeter->lockHint();

84+}

85+

8086bool Greeter::promptless() const

8187{

8288 Q_D(const Greeter);

plugins/LightDM/Greeter.h+2

@@ -37,6 +37,7 @@ class Greeter : public QObject

3737 Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)

3838 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)

3939 Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)

40+ Q_PROPERTY(bool lockHint READ lockHint)

4041 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)

4142

4243public:

@@ -46,6 +47,7 @@ public:

4647 bool isAuthenticated() const;

4748 QString authenticationUser() const;

4849 QString defaultSessionHint() const;

50+ bool lockHint() const;

4951 bool promptless() const;

5052

5153public Q_SLOTS:

qml/Greeter/Greeter.qml+6

@@ -27,6 +27,12 @@ Showable {

2727 id: root

2828 created: loader.status == Loader.Ready

2929

30+ Component.onCompleted: {

31+ console.log("JOSH: getHint(): " + LightDMService.greeter.lockHint)

32+// console.log("JOSH: lockHint: " + LightDMService.greeter.getHint("lockHint"))

33+// console.log("JOSH: lock: " + LightDMService.greeter.getHint("lock"))

34+ }

35+

3036 property real dragHandleLeftMargin: 0

3137

3238 property url background