diff --git a/gui/qml/LoginDialog.qml b/gui/qml/LoginDialog.qml index 44a1d7936acb141b8bbf2f6914c55d3df77205ac..8e28d59c2832c762488eef5da9b3e8d891b5c60a 100644 --- a/gui/qml/LoginDialog.qml +++ b/gui/qml/LoginDialog.qml @@ -3,8 +3,8 @@ import QtQuick.Dialogs 1.2 import QtQuick.Controls 1.4 Dialog { - standardButtons: StandardButton.Ok title: qsTr("Login") + standardButtons: Dialog.Ok Column { anchors.fill: parent @@ -27,7 +27,6 @@ Dialog { } } - visible: false onAccepted: backend.login(username.text, password.text) onRejected: backend.quit() diff --git a/gui/qml/main.qml b/gui/qml/main.qml index fc47be0db9ea7cb40e8c60cc9d4f67a0155c6045..4bd87bacfe4a9ae0e8df0d8a3fc87e4115ae8fb1 100644 --- a/gui/qml/main.qml +++ b/gui/qml/main.qml @@ -1,5 +1,5 @@ import QtQuick 2.9 -import QtQuick.Controls 2.2 +import QtQuick.Controls 1.4 import QtQuick.Dialogs 1.2 import QtQuick.Extras 1.2 import Qt.labs.platform 1.1 @@ -25,6 +25,8 @@ ApplicationWindow { donate.visible = true } if (ctx.loginDialog == 'true') { + console.debug(jsonModel.getJson()) + console.debug("DEBUG: should display login") login.visible = true } if (ctx.loginOk == 'true') { @@ -267,7 +269,6 @@ ApplicationWindow { id: about visible: false } - LoginDialog { id: login