From 3a009baf606a6720122b64efc9fc3e18ba6e084c 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: Sun, 8 Sep 2019 15:34:39 +0800 Subject: Renamed the C++ to QML import --- pages/ConfirmPassword.qml | 10 ++-------- pages/Email.qml | 17 +++++------------ pages/ExistingLogin.qml | 12 ++++-------- pages/Password.qml | 17 +++++------------ 4 files changed, 16 insertions(+), 40 deletions(-) (limited to 'pages') diff --git a/pages/ConfirmPassword.qml b/pages/ConfirmPassword.qml index b7fdc3a..1f2dd2f 100644 --- a/pages/ConfirmPassword.qml +++ b/pages/ConfirmPassword.qml @@ -1,16 +1,10 @@ import QtQuick 2.12 -import id.co.darapsa.kelakon.user 0.1 +import KelakonUser 0.1 PasswordForm { width: stackView.width height: stackView.height - - backButton { - onClicked: { - stackView.pop() - } - } - + backButton.onClicked: stackView.pop() userEmail.y: 292 instructionLabel.text: qsTr("Re-Enter password") emailAddressLabel.text: User.emailAddress diff --git a/pages/Email.qml b/pages/Email.qml index d2a1df3..3f7a237 100644 --- a/pages/Email.qml +++ b/pages/Email.qml @@ -1,20 +1,13 @@ import QtQuick 2.12 -import id.co.darapsa.kelakon.user 0.1 +import KelakonUser 0.1 EmailForm { width: stackView.width height: stackView.height + backButton.onClicked: stackView.pop() - backButton { - onClicked: { - stackView.pop() - } - } - - loginButton { - onClicked: { - User.emailAddress = emailTextField.text - stackView.push("qrc:/pages/Password.qml") - } + loginButton.onClicked: { + User.emailAddress = emailTextField.text + stackView.push("qrc:/pages/Password.qml") } } diff --git a/pages/ExistingLogin.qml b/pages/ExistingLogin.qml index 6833c6a..8e78a09 100644 --- a/pages/ExistingLogin.qml +++ b/pages/ExistingLogin.qml @@ -1,12 +1,8 @@ import QtQuick 2.12 -import id.co.darapsa.kelakon.user 0.1 +import KelakonUser 0.1 ExistingLoginForm { - width: stackView.width - height: stackView.height - backButton { - onClicked: { - stackView.pop() - } - } + width: stackView.width + height: stackView.height + backButton.onClicked: stackView.pop() } diff --git a/pages/Password.qml b/pages/Password.qml index 4a1ae59..241f299 100644 --- a/pages/Password.qml +++ b/pages/Password.qml @@ -1,21 +1,14 @@ import QtQuick 2.12 -import id.co.darapsa.kelakon.user 0.1 +import KelakonUser 0.1 PasswordForm { width: stackView.width height: stackView.height - backButton { - onClicked: { - stackView.pop() - } - } - + backButton.onClicked: stackView.pop() emailAddressLabel.text: User.emailAddress - createPassButton { - onClicked: { - User.password = passTextField.text - stackView.push("qrc:/pages/ConfirmPassword.qml") - } + createPassButton.onClicked: { + User.password = passTextField.text + stackView.push("qrc:/pages/ConfirmPassword.qml") } } -- cgit v1.2.3