diff --git a/tests/kcheckpass_test.cpp b/tests/kcheckpass_test.cpp index 407bae1..26c713f 100644 --- a/tests/kcheckpass_test.cpp +++ b/tests/kcheckpass_test.cpp @@ -1,53 +1,51 @@ /******************************************************************** KSld - the KDE Screenlocker Daemon This file is part of the KDE project. Copyright (C) 2017 Martin Gräßlin This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ #include "../greeter/authenticator.h" #include #include -#include +#include #include int main(int argc, char *argv[]) { QGuiApplication app(argc, argv); QCommandLineParser parser; QCommandLineOption delayedOption(QStringLiteral("delayed"), QStringLiteral("KCheckpass is created at startup, the authentication is delayed")); QCommandLineOption directOption(QStringLiteral("direct"), QStringLiteral("A new KCheckpass gets created when trying to authenticate")); parser.addOption(directOption); parser.addOption(delayedOption); parser.addHelpOption(); parser.process(app); AuthenticationMode mode = AuthenticationMode::Delayed; if (parser.isSet(directOption)) { mode = AuthenticationMode::Direct; } if (parser.isSet(directOption) && parser.isSet(delayedOption)) { parser.showHelp(0); } Authenticator authenticator(mode); - QQuickView view; - view.rootContext()->setContextProperty(QStringLiteral("authenticator"), &authenticator); - view.setResizeMode(QQuickView::SizeRootObjectToView); - view.setSource(QUrl::fromLocalFile(QStringLiteral(QML_FILE))); - view.show(); + QQmlApplicationEngine engine; + engine.rootContext()->setContextProperty(QStringLiteral("authenticator"), &authenticator); + engine.load(QUrl::fromLocalFile(QStringLiteral(QML_FILE))); return app.exec(); } diff --git a/tests/kcheckpass_test.qml b/tests/kcheckpass_test.qml index 4f34b55..baac6b1 100644 --- a/tests/kcheckpass_test.qml +++ b/tests/kcheckpass_test.qml @@ -1,55 +1,56 @@ /******************************************************************** KSld - the KDE Screenlocker Daemon This file is part of the KDE project. Copyright (C) 2017 Martin Gräßlin This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . *********************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.4 +import QtQuick.Controls 2.4 import QtQuick.Layouts 1.3 -Item { +ApplicationWindow { + visible: true ColumnLayout { anchors.fill: parent Label { id: message Connections { target: authenticator onFailed: { message.text = "Authentication failed"; } onSucceeded: { message.text = "Authentication succeeded"; } onGraceLockedChanged: { message.text = "" } } } TextField { id: password enabled: !authenticator.graceLocked echoMode: TextInput.Password } Button { text: "Authenticate" enabled: !authenticator.graceLocked onClicked: { authenticator.tryUnlock(password.text) } } } }