Skip to content
Snippets Groups Projects
Unverified Commit 103abf08 authored by Kali Kaneko's avatar Kali Kaneko
Browse files

[pkg] use qtquick.controls 1

parent b84dbb2d
No related branches found
No related tags found
No related merge requests found
...@@ -3,8 +3,8 @@ import QtQuick.Dialogs 1.2 ...@@ -3,8 +3,8 @@ import QtQuick.Dialogs 1.2
import QtQuick.Controls 1.4 import QtQuick.Controls 1.4
Dialog { Dialog {
standardButtons: StandardButton.Ok
title: qsTr("Login") title: qsTr("Login")
standardButtons: Dialog.Ok
Column { Column {
anchors.fill: parent anchors.fill: parent
...@@ -27,7 +27,6 @@ Dialog { ...@@ -27,7 +27,6 @@ Dialog {
} }
} }
visible: false
onAccepted: backend.login(username.text, password.text) onAccepted: backend.login(username.text, password.text)
onRejected: backend.quit() onRejected: backend.quit()
......
import QtQuick 2.9 import QtQuick 2.9
import QtQuick.Controls 2.2 import QtQuick.Controls 1.4
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtQuick.Extras 1.2 import QtQuick.Extras 1.2
import Qt.labs.platform 1.1 import Qt.labs.platform 1.1
...@@ -25,6 +25,8 @@ ApplicationWindow { ...@@ -25,6 +25,8 @@ ApplicationWindow {
donate.visible = true donate.visible = true
} }
if (ctx.loginDialog == 'true') { if (ctx.loginDialog == 'true') {
console.debug(jsonModel.getJson())
console.debug("DEBUG: should display login")
login.visible = true login.visible = true
} }
if (ctx.loginOk == 'true') { if (ctx.loginOk == 'true') {
...@@ -267,7 +269,6 @@ ApplicationWindow { ...@@ -267,7 +269,6 @@ ApplicationWindow {
id: about id: about
visible: false visible: false
} }
LoginDialog { LoginDialog {
id: login id: login
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment