From 22c96e782219f6ebfdba3c2bf94b2c875dd7e741 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Thu, 3 Oct 2019 12:34:45 -0700 Subject: [PATCH] Update styling of qt launcher --- .../qt/resources/qml/HFBase/CreateAccountBase.qml | 12 +++++------- launchers/qt/resources/qml/HFBase/LoginBase.qml | 11 ++++------- launchers/qt/resources/qml/HFControls/HFButton.qml | 7 +++++++ .../qt/resources/qml/HFControls/HFTextError.qml | 7 +++++++ .../qt/resources/qml/HFControls/HFTextField.qml | 1 + 5 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 launchers/qt/resources/qml/HFControls/HFTextError.qml diff --git a/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml b/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml index 65f983074a..84633da3ac 100644 --- a/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml +++ b/launchers/qt/resources/qml/HFBase/CreateAccountBase.qml @@ -53,16 +53,15 @@ Item { } } - HFTextRegular { + HFTextError { id: error + width: 425 height: 22 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter - color: "#FF9999" - visible: LauncherState.lastSignupErrorMessage.length > 0 text: LauncherState.lastSignupErrorMessage anchors { @@ -167,9 +166,6 @@ Item { Text { - width: 214 - height: 12 - text: "Already have an account?" font.family: "Graphik" font.pixelSize: 14 @@ -177,13 +173,15 @@ Item { anchors { top: button.bottom - topMargin: 19 + topMargin: 16 left: button.left } MouseArea { anchors.fill: parent + cursorShape: Qt.PointingHandCursor + onClicked: { console.log("clicked"); LauncherState.gotoLogin(); diff --git a/launchers/qt/resources/qml/HFBase/LoginBase.qml b/launchers/qt/resources/qml/HFBase/LoginBase.qml index 69c712b887..8238989eb6 100644 --- a/launchers/qt/resources/qml/HFBase/LoginBase.qml +++ b/launchers/qt/resources/qml/HFBase/LoginBase.qml @@ -48,7 +48,7 @@ Item { } } - HFTextRegular { + HFTextError { id: error width: 425 height: 22 @@ -56,8 +56,6 @@ Item { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter - color: "#FF9999" - visible: LauncherState.lastLoginErrorMessage.length > 0 text: LauncherState.lastLoginErrorMessage anchors { @@ -141,9 +139,6 @@ Item { } Text { - width: 214 - height: 12 - text: "Create New Account" font.family: "Graphik" font.pixelSize: 14 @@ -151,13 +146,15 @@ Item { anchors { top: button.bottom - topMargin: 19 + topMargin: 16 left: button.left } MouseArea { anchors.fill: parent + cursorShape: Qt.PointingHandCursor + onClicked: { console.log("clicked"); LauncherState.gotoSignup(); diff --git a/launchers/qt/resources/qml/HFControls/HFButton.qml b/launchers/qt/resources/qml/HFControls/HFButton.qml index a1ebb50ee8..0c2bdb0617 100644 --- a/launchers/qt/resources/qml/HFControls/HFButton.qml +++ b/launchers/qt/resources/qml/HFControls/HFButton.qml @@ -31,4 +31,11 @@ Button { verticalAlignment: Text.AlignVCenter elide: Text.ElideRight } + + MouseArea { + id: mouseArea + cursorShape: Qt.PointingHandCursor + anchors.fill: parent + onPressed: mouse.accepted = false + } } diff --git a/launchers/qt/resources/qml/HFControls/HFTextError.qml b/launchers/qt/resources/qml/HFControls/HFTextError.qml new file mode 100644 index 0000000000..f1862c764c --- /dev/null +++ b/launchers/qt/resources/qml/HFControls/HFTextError.qml @@ -0,0 +1,7 @@ +import QtQuick 2.3 +import QtQuick 2.1 + +HFTextRegular { + color: "#FF9999" +} + diff --git a/launchers/qt/resources/qml/HFControls/HFTextField.qml b/launchers/qt/resources/qml/HFControls/HFTextField.qml index e5abab7b52..d758fcc2dc 100644 --- a/launchers/qt/resources/qml/HFControls/HFTextField.qml +++ b/launchers/qt/resources/qml/HFControls/HFTextField.qml @@ -41,6 +41,7 @@ TextField { MouseArea { anchors.fill: parent + cursorShape: Qt.PointingHandCursor onClicked: { if (control.echoMode === TextInput.Password) { control.echoMode = TextInput.Normal;