Signup ready

2025-08-28 02:56:38 +02:00 · 2017-09-28 21:35:41 +02:00 · 2017-09-28 21:35:41 +02:00 · 769c57208c
commit 769c57208c
parent 8d23bf38ac
4 changed files with 120 additions and 160 deletions
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@ -45,8 +45,8 @@ Item {
        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;
+                    4 * hifi.dimensions.contentSpacing.y + form.height/* +
+                                hifi.dimensions.contentSpacing.y + buttons.height*/;

            if (additionalInformation.visible) {
                targetWidth = Math.max(targetWidth, additionalInformation.width);
@ -56,7 +56,7 @@ Item {
            parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth));
            parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
                    + (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : hifi.dimensions.contentSpacing.y);
-            console.log("sign in h:", targetHeight, parent.height)
+            console.log("sign in h:", targetHeight, parent.height, form.height)
        }
    }

@ -67,9 +67,6 @@ Item {
        if (loginDialog.isSteamRunning()) {
            additionalInformation.visible = !isLoading
        }
-
-        leftButton.visible = !isLoading
-        buttons.visible = !isLoading
    }

    BusyIndicator {
@ -173,11 +170,6 @@ Item {

        InfoItem {
            id: additionalInformation
-            anchors {
-                left: parent.left
-                margins: 0
-                topMargin: hifi.dimensions.contentSpacing.y
-            }

            visible: loginDialog.isSteamRunning()

@ -189,65 +181,59 @@ Item {
            horizontalAlignment: Text.AlignHCenter
        }

-        Column {
-            //width: parent.width
+        Row {
+            id: buttons
            spacing: hifi.dimensions.contentSpacing.y*2
+            onHeightChanged: d.resize(); onWidthChanged: d.resize();
            anchors.horizontalCenter: parent.horizontalCenter
-            //padding: 10

-            Row {
-                id: buttons
-                spacing: hifi.dimensions.contentSpacing.y*2
-                onHeightChanged: d.resize(); onWidthChanged: d.resize();
-                anchors.horizontalCenter: parent.horizontalCenter
+            Button {
+                id: linkAccountButton
+                anchors.verticalCenter: parent.verticalCenter
+                width: 200

-                Button {
-                    id: linkAccountButton
-                    anchors.verticalCenter: parent.verticalCenter
-                    width: 200
+                text: qsTr(loginDialog.isSteamRunning() ? "Link Account" : "Login")
+                color: hifi.buttons.blue

-                    text: qsTr(loginDialog.isSteamRunning() ? "Link Account" : "Login")
-                    color: hifi.buttons.blue
-
-                    onClicked: linkAccountBody.login()
-                }
-
-                Button {
-                    anchors.verticalCenter: parent.verticalCenter
-                    text: qsTr("Cancel")
-                    onClicked: root.tryDestroy()
-                }
+                onClicked: linkAccountBody.login()
            }

-            Row {
-                id: leftButton
+            Button {
+                anchors.verticalCenter: parent.verticalCenter
+                text: qsTr("Cancel")
+                onClicked: root.tryDestroy()
+            }
+        }

-                anchors.horizontalCenter: parent.horizontalCenter
-                spacing: hifi.dimensions.contentSpacing.x
-                onHeightChanged: d.resize(); onWidthChanged: d.resize();
+        Row {
+            id: leftButton

-                RalewaySemiBold {
-                    size: hifi.fontSizes.inputLabel
-                    anchors.verticalCenter: parent.verticalCenter
-                    text: qsTr("Don't have an account?")
-                }
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: hifi.dimensions.contentSpacing.y*2
+            onHeightChanged: d.resize(); onWidthChanged: d.resize();

-                Button {
-                    anchors.verticalCenter: parent.verticalCenter
+            RalewaySemiBold {
+                size: hifi.fontSizes.inputLabel
+                anchors.verticalCenter: parent.verticalCenter
+                text: qsTr("Don't have an account?")
+            }

-                    text: qsTr("Sign Up")
-                    visible: !loginDialog.isSteamRunning()
+            Button {
+                anchors.verticalCenter: parent.verticalCenter

-                    onClicked: {
-                        bodyLoader.setSource("SignUpBody.qml")
-                        bodyLoader.item.width = root.pane.width
-                        bodyLoader.item.height = root.pane.height
-                    }
+                text: qsTr("Sign Up")
+                visible: !loginDialog.isSteamRunning()
+
+                onClicked: {
+                    bodyLoader.setSource("SignUpBody.qml")
+                    bodyLoader.item.width = root.pane.width
+                    bodyLoader.item.height = root.pane.height
                }
            }
        }
    }

+
    // Override ScrollingWindow's keyboard that would be at very bottom of dialog.
    Keyboard {
        raised: keyboardEnabled && keyboardRaised
@ -266,7 +252,7 @@ Item {
        root.title = qsTr("Sign Into High Fidelity")
        root.iconText = "<"
        keyboardEnabled = HMD.active;
-        d.resize();
+        //d.resize();

        if (failAfterSignUp) {
            mainTextContainer.text = "Account created successfully."
@ -313,11 +299,11 @@ Item {
        }

        switch (event.key) {
-            case Qt.Key_Enter:
-            case Qt.Key_Return:
-                event.accepted = true
-                linkAccountBody.login()
-                break
+        case Qt.Key_Enter:
+        case Qt.Key_Return:
+            event.accepted = true
+            linkAccountBody.login()
+            break
        }
    }
 }
--- a/interface/resources/qml/LoginDialog/SignUpBody.qml
+++ b/interface/resources/qml/LoginDialog/SignUpBody.qml
@ -44,13 +44,13 @@ Item {
        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;
+                                4 * hifi.dimensions.contentSpacing.y + form.height/* +
+                                hifi.dimensions.contentSpacing.y + buttons.height*/;

            parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth));
            parent.height = root.height = Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight))
                + (keyboardEnabled && keyboardRaised ? (200 + 2 * hifi.dimensions.contentSpacing.y) : 0);
-            //console.log("sign up h:", parent.height)
+            console.log("sign up h:", parent.height, targetHeight, form.height)
        }
    }

@ -97,44 +97,31 @@ Item {

    Column {
        id: form
+        width: parent.width
+        onHeightChanged: d.resize(); onWidthChanged: d.resize();
+
        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
-
-            TextField {
-                id: emailField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 350
-
-                label: "Email"
-            }
+        TextField {
+            id: emailField
+            width: parent.width
+            label: "Email"
        }

-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
-
-            TextField {
-                id: usernameField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 350
-
-                label: "Username"
-            }
+        TextField {
+            id: usernameField
+            width: parent.width
+            label: "Username"

            ShortcutText {
                anchors {
-                    verticalCenter: parent.verticalCenter
+                    verticalCenter: parent.textFieldLabel.verticalCenter
+                    left: parent.textFieldLabel.right
+                    leftMargin: 10
                }

                text: qsTr("No spaces / special chars.")
@ -146,23 +133,17 @@ Item {
            }
        }

-        Row {
-            spacing: hifi.dimensions.contentSpacing.x
-
-            TextField {
-                id: passwordField
-                anchors {
-                    verticalCenter: parent.verticalCenter
-                }
-                width: 350
-
-                label: "Password"
-                echoMode: TextInput.Password
-            }
+        TextField {
+            id: passwordField
+            width: parent.width
+            label: "Password"
+            echoMode: TextInput.Password

            ShortcutText {
                anchors {
-                    verticalCenter: parent.verticalCenter
+                    verticalCenter: parent.textFieldLabel.verticalCenter
+                    left: parent.textFieldLabel.right
+                    leftMargin: 10
                }

                text: qsTr("At least 6 characters")
@ -174,6 +155,51 @@ Item {
            }
        }

+        Row {
+            id: leftButton
+            anchors.horizontalCenter: parent.horizontalCenter
+
+            spacing: hifi.dimensions.contentSpacing.x
+            onHeightChanged: d.resize(); onWidthChanged: d.resize();
+
+            Button {
+                anchors.verticalCenter: parent.verticalCenter
+
+                text: qsTr("Existing User")
+
+                onClicked: {
+                    bodyLoader.setSource("LinkAccountBody.qml")
+                    bodyLoader.item.width = root.pane.width
+                    bodyLoader.item.height = root.pane.height
+                }
+            }
+        }
+
+        Row {
+            id: buttons
+            anchors.horizontalCenter: parent.horizontalCenter
+            spacing: hifi.dimensions.contentSpacing.x
+            onHeightChanged: d.resize(); onWidthChanged: d.resize();
+
+            Button {
+                id: linkAccountButton
+                anchors.verticalCenter: parent.verticalCenter
+                width: 200
+
+                text: qsTr("Sign Up")
+                color: hifi.buttons.blue
+
+                onClicked: signupBody.signup()
+            }
+
+            Button {
+                anchors.verticalCenter: parent.verticalCenter
+
+                text: qsTr("Cancel")
+
+                onClicked: root.tryDestroy()
+            }
+        }
    }

    // Override ScrollingWindow's keyboard that would be at very bottom of dialog.
@ -183,65 +209,11 @@ Item {
        anchors {
            left: parent.left
            right: parent.right
-            bottom: buttons.top
+            bottom: parent.bottom
            bottomMargin: keyboardRaised ? 2 * hifi.dimensions.contentSpacing.y : 0
        }
    }

-    Row {
-        id: leftButton
-        anchors {
-            left: parent.left
-            bottom: parent.bottom
-            bottomMargin: hifi.dimensions.contentSpacing.y
-        }
-
-        spacing: hifi.dimensions.contentSpacing.x
-        onHeightChanged: d.resize(); onWidthChanged: d.resize();
-
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-
-            text: qsTr("Existing User")
-
-            onClicked: {
-                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();
-
-        Button {
-            id: linkAccountButton
-            anchors.verticalCenter: parent.verticalCenter
-            width: 200
-
-            text: qsTr("Sign Up")
-            color: hifi.buttons.blue
-
-            onClicked: signupBody.signup()
-        }
-
-        Button {
-            anchors.verticalCenter: parent.verticalCenter
-
-            text: qsTr("Cancel")
-
-            onClicked: root.tryDestroy()
-        }
-    }
-
    Component.onCompleted: {
        root.title = qsTr("Create an Account")
        root.iconText = "<"
--- a/interface/resources/qml/dialogs/TabletLoginDialog.qml
+++ b/interface/resources/qml/dialogs/TabletLoginDialog.qml
@ -96,7 +96,7 @@ TabletModalWindow {
        id: mfRoot

        width: root.width
-        height: root.height + frameMarginTop
+        height: root.height //+ frameMarginTop

        anchors {
            horizontalCenter: parent.horizontalCenter
--- a/interface/src/main.cpp
+++ b/interface/src/main.cpp
@ -48,7 +48,9 @@ int main(int argc, const char* argv[]) {
    static QString BUG_SPLAT_APPLICATION_NAME = "Interface";
    CrashReporter crashReporter { BUG_SPLAT_DATABASE, BUG_SPLAT_APPLICATION_NAME, BuildInfo::VERSION };
 #endif
-
+#ifdef Q_OS_UNIX
+    QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar);
+#endif
    disableQtBearerPoll(); // Fixes wifi ping spikes

    QElapsedTimer startupTime;