diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml index 245ae2856d..ca392244c4 100644 --- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml +++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml @@ -218,12 +218,8 @@ Item { onHeightChanged: d.resize(); onWidthChanged: d.resize(); Button { - id: signupButton - anchors.verticalCenter: parent.verticalCenter - width: 150 - text: qsTr("Sign Up") visible: !loginDialog.isSteamRunning() diff --git a/interface/resources/qml/LoginDialog/SignUpBody.qml b/interface/resources/qml/LoginDialog/SignUpBody.qml index 8c797d0c53..e19b8f469f 100644 --- a/interface/resources/qml/LoginDialog/SignUpBody.qml +++ b/interface/resources/qml/LoginDialog/SignUpBody.qml @@ -17,177 +17,177 @@ import "../controls-uit" import "../styles-uit" Item { - id: signupBody - clip: true - width: root.pane.width - height: root.pane.height + id: signupBody + clip: true + width: root.pane.width + height: root.pane.height - function signup() { - mainTextContainer.visible = false - toggleLoading(true) - loginDialog.signup(emailField.text, usernameField.text, passwordField.text) - } + function signup() { + mainTextContainer.visible = false + toggleLoading(true) + loginDialog.signup(emailField.text, usernameField.text, passwordField.text) + } - property bool keyboardEnabled: false - property bool keyboardRaised: false - property bool punctuationMode: false + property bool keyboardEnabled: false + property bool keyboardRaised: false + property bool punctuationMode: false - onKeyboardRaisedChanged: d.resize(); + onKeyboardRaisedChanged: d.resize(); - QtObject { - id: d - readonly property int minWidth: 480 - readonly property int maxWidth: 1280 - readonly property int minHeight: 120 - readonly property int maxHeight: 720 + QtObject { + id: d + readonly property int minWidth: 480 + readonly property int maxWidth: 1280 + readonly property int minHeight: 120 + readonly property int maxHeight: 720 - function resize() { - var targetWidth = Math.max(titleWidth, form.contentWidth); - var targetHeight = hifi.dimensions.contentSpacing.y + mainTextContainer.height + - 4 * hifi.dimensions.contentSpacing.y + form.height + - hifi.dimensions.contentSpacing.y + buttons.height; + function resize() { + var targetWidth = Math.max(titleWidth, form.contentWidth); + var targetHeight = hifi.dimensions.contentSpacing.y + mainTextContainer.height + + 4 * hifi.dimensions.contentSpacing.y + form.height + + hifi.dimensions.contentSpacing.y + buttons.height; - root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)); - root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) - + (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : hifi.dimensions.contentSpacing.y); - } - } + width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)); + height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)) + + (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : 0); + } + } - function toggleLoading(isLoading) { - linkAccountSpinner.visible = isLoading - form.visible = !isLoading + function toggleLoading(isLoading) { + linkAccountSpinner.visible = isLoading + form.visible = !isLoading - leftButton.visible = !isLoading - buttons.visible = !isLoading - } + leftButton.visible = !isLoading + buttons.visible = !isLoading + } - BusyIndicator { - id: linkAccountSpinner + BusyIndicator { + id: linkAccountSpinner - anchors { - top: parent.top - horizontalCenter: parent.horizontalCenter - topMargin: hifi.dimensions.contentSpacing.y - } + anchors { + top: parent.top + horizontalCenter: parent.horizontalCenter + topMargin: hifi.dimensions.contentSpacing.y + } - visible: false - running: true + visible: false + running: true - width: 48 - height: 48 - } + width: 48 + height: 48 + } - ShortcutText { - id: mainTextContainer - anchors { - top: parent.top - left: parent.left - margins: 0 - topMargin: hifi.dimensions.contentSpacing.y - } + ShortcutText { + id: mainTextContainer + anchors { + top: parent.top + left: parent.left + margins: 0 + topMargin: hifi.dimensions.contentSpacing.y + } - visible: false + visible: false - text: qsTr("There was an unknown error while creating your account.") - wrapMode: Text.WordWrap - color: hifi.colors.redAccent - horizontalAlignment: Text.AlignLeft - } + text: qsTr("There was an unknown error while creating your account.") + wrapMode: Text.WordWrap + color: hifi.colors.redAccent + horizontalAlignment: Text.AlignLeft + } - Column { - id: form - anchors { - top: mainTextContainer.bottom - left: parent.left - margins: 0 - topMargin: 2 * hifi.dimensions.contentSpacing.y - } - spacing: 2 * hifi.dimensions.contentSpacing.y + Column { + id: form + anchors { + top: mainTextContainer.bottom + left: parent.left + margins: 0 + topMargin: 2 * hifi.dimensions.contentSpacing.y + } + spacing: 2 * hifi.dimensions.contentSpacing.y - Row { - spacing: hifi.dimensions.contentSpacing.x + Row { + spacing: hifi.dimensions.contentSpacing.x - TextField { - id: emailField - anchors { - verticalCenter: parent.verticalCenter - } - width: 350 + TextField { + id: emailField + anchors { + verticalCenter: parent.verticalCenter + } + width: 350 - label: "Email" - } - } + label: "Email" + } + } - Row { - spacing: hifi.dimensions.contentSpacing.x + Row { + spacing: hifi.dimensions.contentSpacing.x - TextField { - id: usernameField - anchors { - verticalCenter: parent.verticalCenter - } - width: 350 + TextField { + id: usernameField + anchors { + verticalCenter: parent.verticalCenter + } + width: 350 - label: "Username" - } + label: "Username" + } - ShortcutText { - anchors { - verticalCenter: parent.verticalCenter - } + ShortcutText { + anchors { + verticalCenter: parent.verticalCenter + } - text: qsTr("No spaces / special chars.") + text: qsTr("No spaces / special chars.") - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter - color: hifi.colors.blueAccent - } - } + color: hifi.colors.blueAccent + } + } - Row { - spacing: hifi.dimensions.contentSpacing.x + Row { + spacing: hifi.dimensions.contentSpacing.x - TextField { - id: passwordField - anchors { - verticalCenter: parent.verticalCenter - } - width: 350 + TextField { + id: passwordField + anchors { + verticalCenter: parent.verticalCenter + } + width: 350 - label: "Password" - echoMode: TextInput.Password - } + label: "Password" + echoMode: TextInput.Password + } - ShortcutText { - anchors { - verticalCenter: parent.verticalCenter - } + ShortcutText { + anchors { + verticalCenter: parent.verticalCenter + } - text: qsTr("At least 6 characters") + text: qsTr("At least 6 characters") - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + horizontalAlignment: Text.AlignHCenter - color: hifi.colors.blueAccent - } - } + color: hifi.colors.blueAccent + } + } - } + } - // Override ScrollingWindow's keyboard that would be at very bottom of dialog. - Keyboard { - raised: keyboardEnabled && keyboardRaised - numeric: punctuationMode - anchors { - left: parent.left - right: parent.right - bottom: buttons.top - bottomMargin: keyboardRaised ? 2 * hifi.dimensions.contentSpacing.y : 0 - } - } + // Override ScrollingWindow's keyboard that would be at very bottom of dialog. + Keyboard { + raised: keyboardEnabled && keyboardRaised + numeric: punctuationMode + anchors { + left: parent.left + right: parent.right + bottom: buttons.top + bottomMargin: keyboardRaised ? 2 * hifi.dimensions.contentSpacing.y : 0 + } + } - Row { + Row { id: leftButton anchors { left: parent.left @@ -204,91 +204,91 @@ Item { text: qsTr("Existing User") onClicked: { - bodyLoader.setSource("LinkAccountBody.qml") - bodyLoader.item.width = root.pane.width - bodyLoader.item.height = root.pane.height + bodyLoader.setSource("LinkAccountBody.qml") + bodyLoader.item.width = root.pane.width + bodyLoader.item.height = root.pane.height } } } - Row { - id: buttons - anchors { - right: parent.right - bottom: parent.bottom - bottomMargin: hifi.dimensions.contentSpacing.y - } - spacing: hifi.dimensions.contentSpacing.x - onHeightChanged: d.resize(); onWidthChanged: d.resize(); + Row { + id: buttons + anchors { + right: parent.right + bottom: parent.bottom + bottomMargin: hifi.dimensions.contentSpacing.y + } + spacing: hifi.dimensions.contentSpacing.x + onHeightChanged: d.resize(); onWidthChanged: d.resize(); - Button { - id: linkAccountButton - anchors.verticalCenter: parent.verticalCenter - width: 200 + Button { + id: linkAccountButton + anchors.verticalCenter: parent.verticalCenter + width: 200 - text: qsTr("Sign Up") - color: hifi.buttons.blue + text: qsTr("Sign Up") + color: hifi.buttons.blue - onClicked: signupBody.signup() - } + onClicked: signupBody.signup() + } - Button { - anchors.verticalCenter: parent.verticalCenter + Button { + anchors.verticalCenter: parent.verticalCenter - text: qsTr("Cancel") + text: qsTr("Cancel") - onClicked: root.destroy() - } - } + onClicked: root.destroy() + } + } - Component.onCompleted: { - root.title = qsTr("Create an Account") - root.iconText = "<" - keyboardEnabled = HMD.active; - d.resize(); + Component.onCompleted: { + root.title = qsTr("Create an Account") + root.iconText = "<" + keyboardEnabled = HMD.active; + d.resize(); - emailField.forceActiveFocus(); - } + emailField.forceActiveFocus(); + } - Connections { - target: loginDialog - onHandleSignupCompleted: { - console.log("Sign Up Succeeded"); + Connections { + target: loginDialog + onHandleSignupCompleted: { + console.log("Sign Up Succeeded"); - // now that we have an account, login with that username and password - loginDialog.login(usernameField.text, passwordField.text) - } - onHandleSignupFailed: { - console.log("Sign Up Failed") - toggleLoading(false) + // now that we have an account, login with that username and password + loginDialog.login(usernameField.text, passwordField.text) + } + onHandleSignupFailed: { + console.log("Sign Up Failed") + toggleLoading(false) - mainTextContainer.text = errorString - mainTextContainer.visible = true - } - onHandleLoginCompleted: { - bodyLoader.setSource("WelcomeBody.qml", { "welcomeBack": false }) - bodyLoader.item.width = root.pane.width - bodyLoader.item.height = root.pane.height - } - onHandleLoginFailed: { - // we failed to login, show the LoginDialog so the user will try again - bodyLoader.setSource("LinkAccountBody.qml", { "failAfterSignUp": true }) - bodyLoader.item.width = root.pane.width - bodyLoader.item.height = root.pane.height - } - } + mainTextContainer.text = errorString + mainTextContainer.visible = true + } + onHandleLoginCompleted: { + bodyLoader.setSource("WelcomeBody.qml", { "welcomeBack": false }) + bodyLoader.item.width = root.pane.width + bodyLoader.item.height = root.pane.height + } + onHandleLoginFailed: { + // we failed to login, show the LoginDialog so the user will try again + bodyLoader.setSource("LinkAccountBody.qml", { "failAfterSignUp": true }) + bodyLoader.item.width = root.pane.width + bodyLoader.item.height = root.pane.height + } + } - Keys.onPressed: { - if (!visible) { - return - } + Keys.onPressed: { + if (!visible) { + return + } - switch (event.key) { - case Qt.Key_Enter: - case Qt.Key_Return: - event.accepted = true - signupBody.signup() - break - } - } + switch (event.key) { + case Qt.Key_Enter: + case Qt.Key_Return: + event.accepted = true + signupBody.signup() + break + } + } }