From 103abf08436a417cf988e60ee04941850e12a47a Mon Sep 17 00:00:00 2001
From: "kali kaneko (leap communications)" <kali@leap.se>
Date: Tue, 15 Sep 2020 00:49:09 +0200
Subject: [PATCH] [pkg] use qtquick.controls 1
---
gui/qml/LoginDialog.qml | 3 +--
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 44a1d793..8e28d59c 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 fc47be0d..4bd87bac 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
--
GitLab