diff options
| author | kali kaneko (leap communications) <kali@leap.se> | 2020-09-15 00:49:09 +0200 |
|---|---|---|
| committer | kali kaneko (leap communications) <kali@leap.se> | 2020-09-25 12:33:43 +0200 |
| commit | 103abf08436a417cf988e60ee04941850e12a47a (patch) | |
| tree | 84a0107794527ffce7833d7206842f9b19306509 | |
| parent | b84dbb2d754f3e2b16aef44e0ee295eab4e51d5c (diff) | |
[pkg] use qtquick.controls 1
| -rw-r--r-- | gui/qml/LoginDialog.qml | 3 | ||||
| -rw-r--r-- | gui/qml/main.qml | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gui/qml/LoginDialog.qml b/gui/qml/LoginDialog.qml index 44a1d79..8e28d59 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 fc47be0..4bd87ba 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 |