From b7baeea2ab0f999a755226b79242f78a472d5a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=A6=8C=20=EA=A6=AB=EA=A6=B6=20=EA=A6=8F=EA=A7=80?= =?UTF-8?q?=EA=A6=A6=EA=A6=BF=20=EA=A6=A7=20=EA=A6=AE=20=EA=A6=91=20?= =?UTF-8?q?=EA=A6=A9=20=EA=A6=AD=EA=A7=80?= Date: Thu, 19 Sep 2019 22:15:47 +0800 Subject: Replaced UIs whose replacements are ready in Larva and reorganise logical QML files --- Login.qml | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) (limited to 'Login.qml') diff --git a/Login.qml b/Login.qml index 67e4942..965d9ff 100644 --- a/Login.qml +++ b/Login.qml @@ -1,18 +1,32 @@ import QtQuick 2.12 -import "larva/features" +import QtQuick.Controls 2.12 +import QtQuick.Controls.Material 2.12 +import QtQuick.Layouts 1.12 -OnboardingForm { - signal logIn(string name, string password) - signal ticketNew(string queue, string requestor) - signal ticketSearch(string name) - function pushProfile() { - stackView.push("qrc:/pages/Profile.qml") +Page { + header: ToolBar { + background: Rectangle { + color: "#FAFFFFFF" + } + RowLayout { + ToolButton { + id: toolButton + icon.name: "back-button" + icon.source: "larva/components/icons/arrow-back-24px.svg" + highlighted: true + onClicked: + if (pageView.depth > 1) + pageView.pop() + else + drawer.open() + } + } } - objectName: "login" - width: appWindow.width - height: appWindow.height - logoImage.source: "kelakon-logo.png" - registerButton.onClicked: stackView.push("qrc:/pages/Email.qml") - loginButton.onClicked: stackView.push("qrc:/pages/LoginName.qml") + StackView { + id: contentView + anchors.topMargin: 432 + anchors.fill: parent + initialItem: LoginEmail{} + } } -- cgit v1.2.3