f47831e · unity8 · git.iko.soy

plugins/LightDM/DBusGreeter.cpp+5

compare with xenial

unifiedsplit

@@ -34,6 +34,11 @@ bool DBusGreeter::isActive() const

34 return m_greeter->isActive();

35}

36

37+void DBusGreeter::ShowGreeter()

38+{

39+ return Q_EMIT m_greeter->showGreeter();

40+}

41+

37void DBusGreeter::isActiveChangedHandler()

42void DBusGreeter::isActiveChangedHandler()

38{

43{

39 notifyPropertyChanged("IsActive", isActive());

44 notifyPropertyChanged("IsActive", isActive());

plugins/LightDM/DBusGreeter.h+1

@@ -37,6 +37,7 @@ public:

37 explicit DBusGreeter(Greeter *greeter, const QDBusConnection &connection, const QString &path);

38

39 bool isActive() const;

40+ Q_SCRIPTABLE void ShowGreeter(); // temporary, until we split the greeter again

40

41

41Q_SIGNALS:

42Q_SIGNALS:

42 void isActiveChanged();

43 void isActiveChanged();

plugins/LightDM/Greeter.h+1

@@ -60,6 +60,7 @@ Q_SIGNALS:

60 void authenticationUserChanged(const QString &user);

61 void isActiveChanged();

62 void promptlessChanged();

63+ void showGreeter();

63

64

64 // This signal is emitted by external agents like indicators, and the UI

65 // This signal is emitted by external agents like indicators, and the UI

65 // should switch to this user if possible.

66 // should switch to this user if possible.

qml/Shell.qml+5

@@ -348,6 +348,8 @@ FocusScope {

348 Connections {

349 target: LightDM.Greeter

350

351+ onShowGreeter: greeter.show()

352+

351 onShowPrompt: {

353 onShowPrompt: {

352 if (LightDM.Users.count == 1) {

354 if (LightDM.Users.count == 1) {

353 // TODO: There's no better way for now to determine if its a PIN or a passphrase.

355 // TODO: There's no better way for now to determine if its a PIN or a passphrase.

@@ -418,6 +420,9 @@ FocusScope {

418 onShownChanged: {

420 onShownChanged: {

419 if (shown) {

421 if (shown) {

420 lockscreen.reset();

422 lockscreen.reset();

423+ if (!LightDM.Greeter.promptless) {

424+ lockscreen.show();

425+ }

421 // If there is only one user, we start authenticating with that one here.

426 // If there is only one user, we start authenticating with that one here.

422 // If there are more users, the Greeter will handle that

427 // If there are more users, the Greeter will handle that

423 if (LightDM.Users.count == 1) {

428 if (LightDM.Users.count == 1) {

tests/plugins/LightDM/dbus.cpp+7

@@ -187,6 +187,13 @@ private Q_SLOTS:

187 QVERIFY(arguments.at(1).toMap()["IsActive"].toBool());

188 }

189

190+ void testShowGreeter()

191+ {

192+ // Just confirm the call exists and doesn't fail

193+ QDBusReply<void> reply = dbusMain->call("ShowGreeter");

194+ QVERIFY(reply.isValid());

195+ }

196+

190private:

197private:

191 QQuickView *view;

198 QQuickView *view;

192 Greeter *greeter;

199 Greeter *greeter;

tests/qmltests/tst_Shell.qml+8

@@ -20,6 +20,7 @@

20import QtQuick 2.0

21import QtTest 1.0

22import GSettings 1.0

23+import LightDM 0.1 as LightDM

23import Unity.Application 0.1

24import Unity.Application 0.1

24import Unity.Test 0.1 as UT

25import Unity.Test 0.1 as UT

25import Powerd 0.1

26import Powerd 0.1

@@ -520,5 +521,12 @@ Item {

520 tryCompare(greeter, "showProgress", 0)

521 tryCompare(greeter, "showProgress", 0)

521 waitUntilApplicationWindowIsFullyVisible()

522 waitUntilApplicationWindowIsFullyVisible()

522 }

523 }

524+

525+ function test_showGreeterDBusCall() {

526+ var greeter = findChild(shell, "greeter")

527+ tryCompare(greeter, "showProgress", 0)

528+ LightDM.Greeter.showGreeter()

529+ tryCompare(greeter, "showProgress", 1)

530+ }

523 }

531 }

524}

532}