mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-09 05:48:26 +02:00
Update styling of qt launcher
This commit is contained in:
parent
9abc9f5f70
commit
22c96e7822
5 changed files with 24 additions and 14 deletions
|
@ -53,16 +53,15 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
HFTextRegular {
|
HFTextError {
|
||||||
id: error
|
id: error
|
||||||
|
|
||||||
width: 425
|
width: 425
|
||||||
height: 22
|
height: 22
|
||||||
|
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
|
||||||
color: "#FF9999"
|
|
||||||
|
|
||||||
visible: LauncherState.lastSignupErrorMessage.length > 0
|
visible: LauncherState.lastSignupErrorMessage.length > 0
|
||||||
text: LauncherState.lastSignupErrorMessage
|
text: LauncherState.lastSignupErrorMessage
|
||||||
anchors {
|
anchors {
|
||||||
|
@ -167,9 +166,6 @@ Item {
|
||||||
|
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
width: 214
|
|
||||||
height: 12
|
|
||||||
|
|
||||||
text: "Already have an account?"
|
text: "Already have an account?"
|
||||||
font.family: "Graphik"
|
font.family: "Graphik"
|
||||||
font.pixelSize: 14
|
font.pixelSize: 14
|
||||||
|
@ -177,13 +173,15 @@ Item {
|
||||||
|
|
||||||
anchors {
|
anchors {
|
||||||
top: button.bottom
|
top: button.bottom
|
||||||
topMargin: 19
|
topMargin: 16
|
||||||
left: button.left
|
left: button.left
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
||||||
|
cursorShape: Qt.PointingHandCursor
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
console.log("clicked");
|
console.log("clicked");
|
||||||
LauncherState.gotoLogin();
|
LauncherState.gotoLogin();
|
||||||
|
|
|
@ -48,7 +48,7 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
HFTextRegular {
|
HFTextError {
|
||||||
id: error
|
id: error
|
||||||
width: 425
|
width: 425
|
||||||
height: 22
|
height: 22
|
||||||
|
@ -56,8 +56,6 @@ Item {
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
|
||||||
color: "#FF9999"
|
|
||||||
|
|
||||||
visible: LauncherState.lastLoginErrorMessage.length > 0
|
visible: LauncherState.lastLoginErrorMessage.length > 0
|
||||||
text: LauncherState.lastLoginErrorMessage
|
text: LauncherState.lastLoginErrorMessage
|
||||||
anchors {
|
anchors {
|
||||||
|
@ -141,9 +139,6 @@ Item {
|
||||||
}
|
}
|
||||||
|
|
||||||
Text {
|
Text {
|
||||||
width: 214
|
|
||||||
height: 12
|
|
||||||
|
|
||||||
text: "Create New Account"
|
text: "Create New Account"
|
||||||
font.family: "Graphik"
|
font.family: "Graphik"
|
||||||
font.pixelSize: 14
|
font.pixelSize: 14
|
||||||
|
@ -151,13 +146,15 @@ Item {
|
||||||
|
|
||||||
anchors {
|
anchors {
|
||||||
top: button.bottom
|
top: button.bottom
|
||||||
topMargin: 19
|
topMargin: 16
|
||||||
left: button.left
|
left: button.left
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
||||||
|
cursorShape: Qt.PointingHandCursor
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
console.log("clicked");
|
console.log("clicked");
|
||||||
LauncherState.gotoSignup();
|
LauncherState.gotoSignup();
|
||||||
|
|
|
@ -31,4 +31,11 @@ Button {
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: mouseArea
|
||||||
|
cursorShape: Qt.PointingHandCursor
|
||||||
|
anchors.fill: parent
|
||||||
|
onPressed: mouse.accepted = false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
7
launchers/qt/resources/qml/HFControls/HFTextError.qml
Normal file
7
launchers/qt/resources/qml/HFControls/HFTextError.qml
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
import QtQuick 2.3
|
||||||
|
import QtQuick 2.1
|
||||||
|
|
||||||
|
HFTextRegular {
|
||||||
|
color: "#FF9999"
|
||||||
|
}
|
||||||
|
|
|
@ -41,6 +41,7 @@ TextField {
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
cursorShape: Qt.PointingHandCursor
|
||||||
onClicked: {
|
onClicked: {
|
||||||
if (control.echoMode === TextInput.Password) {
|
if (control.echoMode === TextInput.Password) {
|
||||||
control.echoMode = TextInput.Normal;
|
control.echoMode = TextInput.Normal;
|
||||||
|
|
Loading…
Reference in a new issue