git.iko.soy/unity8
on xenial help sign in
Merge in show-greeter-dbus
commita668bad4fb1e190adc8a426f309519ac8319b20c authorMichael Terry <michael.terry@canonical.com> dateMon 30 Jun 2014, 10:19 (12 years ago) parent6321cc1b329889
6 files changed+27
compare with xenial
unifiedsplit
plugins/LightDM/DBusGreeter.cpp+5 plugins/LightDM/DBusGreeter.h+1 plugins/LightDM/Greeter.h+1 qml/Shell.qml+5 tests/plugins/LightDM/dbus.cpp+7 tests/qmltests/tst_Shell.qml+8
plugins/LightDM/DBusGreeter.cpp+5
@@ -34,6 +34,11 @@ bool DBusGreeter::isActive() const
3434 return m_greeter->isActive();
3535}
3636
37+void DBusGreeter::ShowGreeter()
38+{
39+ return Q_EMIT m_greeter->showGreeter();
40+}
41+
3742void DBusGreeter::isActiveChangedHandler()
3843{
3944 notifyPropertyChanged("IsActive", isActive());
plugins/LightDM/DBusGreeter.h+1
@@ -37,6 +37,7 @@ public:
3737 explicit DBusGreeter(Greeter *greeter, const QDBusConnection &connection, const QString &path);
3838
3939 bool isActive() const;
40+ Q_SCRIPTABLE void ShowGreeter(); // temporary, until we split the greeter again
4041
4142Q_SIGNALS:
4243 void isActiveChanged();
plugins/LightDM/Greeter.h+1
@@ -60,6 +60,7 @@ Q_SIGNALS:
6060 void authenticationUserChanged(const QString &user);
6161 void isActiveChanged();
6262 void promptlessChanged();
63+ void showGreeter();
6364
6465 // This signal is emitted by external agents like indicators, and the UI
6566 // should switch to this user if possible.
qml/Shell.qml+5
@@ -367,6 +367,8 @@ FocusScope {
367367 Connections {
368368 target: LightDM.Greeter
369369
370+ onShowGreeter: greeter.show()
371+
370372 onShowPrompt: {
371373 if (LightDM.Users.count == 1) {
372374 // TODO: There's no better way for now to determine if its a PIN or a passphrase.
@@ -453,6 +455,9 @@ FocusScope {
453455 onShownChanged: {
454456 if (shown) {
455457 lockscreen.reset();
458+ if (!LightDM.Greeter.promptless) {
459+ lockscreen.show();
460+ }
456461 // If there is only one user, we start authenticating with that one here.
457462 // If there are more users, the Greeter will handle that
458463 if (LightDM.Users.count == 1) {
tests/plugins/LightDM/dbus.cpp+7
@@ -187,6 +187,13 @@ private Q_SLOTS:
187187 QVERIFY(arguments.at(1).toMap()["IsActive"].toBool());
188188 }
189189
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+
190197private:
191198 QQuickView *view;
192199 Greeter *greeter;
tests/qmltests/tst_Shell.qml+8
@@ -20,6 +20,7 @@
2020import QtQuick 2.0
2121import QtTest 1.0
2222import GSettings 1.0
23+import LightDM 0.1 as LightDM
2324import Unity.Application 0.1
2425import Unity.Test 0.1 as UT
2526import Powerd 0.1
@@ -565,6 +566,13 @@ Item {
565566 waitUntilApplicationWindowIsFullyVisible()
566567 }
567568
569+ function test_showGreeterDBusCall() {
570+ var greeter = findChild(shell, "greeter")
571+ tryCompare(greeter, "showProgress", 0)
572+ LightDM.Greeter.showGreeter()
573+ tryCompare(greeter, "showProgress", 1)
574+ }
575+
568576 function test_login() {
569577 var greeter = findChild(shell, "greeter")
570578 greeter.show()