Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 13:38:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

modularizing qml font in login

Browse source
This commit is contained in:
Wayne Chen 2018-10-23 11:00:42 -07:00
parent 56656a9079
commit d5b7fe62db
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -25,6 +25,8 @@ Item {
width: root.pane.width width: root.pane.width
property bool isTablet: root.isTablet property bool isTablet: root.isTablet
property bool failAfterSignUp: false property bool failAfterSignUp: false
property string fontFamily: "Cairo"
property bool fontBold: true
property bool keyboardEnabled: false property bool keyboardEnabled: false
property bool keyboardRaised: false property bool keyboardRaised: false
@ -163,7 +165,7 @@ Item {
HifiControlsUit.TextField { HifiControlsUit.TextField {
id: usernameField id: usernameField
width: banner.width width: banner.width
font.family: "Cairo" font.family: linkAccountBody.fontFamily
placeholderText: "Username" placeholderText: "Username"
anchors { anchors {
top: parent.top top: parent.top
@ -177,7 +179,7 @@ Item {
HifiControlsUit.TextField { HifiControlsUit.TextField {
id: emailField id: emailField
width: banner.width width: banner.width
font.family: "Cairo" font.family: linkAccountBody.fontFamily
text: Settings.getValue("wallet/savedUsername", ""); text: Settings.getValue("wallet/savedUsername", "");
anchors { anchors {
top: parent.top top: parent.top
@ -197,7 +199,7 @@ Item {
HifiControlsUit.TextField { HifiControlsUit.TextField {
id: passwordField id: passwordField
width: banner.width width: banner.width
font.family: "Cairo" font.family: linkAccountBody.fontFamily
placeholderText: "Password" placeholderText: "Password"
activeFocusOnPress: true activeFocusOnPress: true
echoMode: passwordFieldMouseArea.showPassword ? TextInput.Normal : TextInput.Password echoMode: passwordFieldMouseArea.showPassword ? TextInput.Normal : TextInput.Password
@ -256,7 +258,7 @@ Item {
checked: !Settings.getValue("wallet/autoLogout", false); checked: !Settings.getValue("wallet/autoLogout", false);
text: qsTr("Keep Me Logged In") text: qsTr("Keep Me Logged In")
boxSize: 18; boxSize: 18;
labelFontFamily: "Cairo" labelFontFamily: linkAccountBody.fontFamily
labelFontSize: 18; labelFontSize: 18;
color: hifi.colors.white; color: hifi.colors.white;
anchors { anchors {
@ -293,10 +295,10 @@ Item {
lineHeight: 1 lineHeight: 1
color: "white" color: "white"
font.family: "Cairo" font.family: linkAccountBody.fontFamily
font.pixelSize: 24 font.pixelSize: 24
font.capitalization: Font.AllUppercase; font.capitalization: Font.AllUppercase;
font.bold: true font.bold: linkAccountBody.fontBold
lineHeightMode: Text.ProportionalHeight lineHeightMode: Text.ProportionalHeight
} }
MouseArea { MouseArea {
@ -313,9 +315,9 @@ Item {
width: d.minWidthButton width: d.minWidthButton
height: d.minHeightButton height: d.minHeightButton
text: qsTr("Log In") text: qsTr("Log In")
fontFamily: "Cairo" fontFamily: linkAccountBody.fontFamily
fontSize: signUpButton.fontSize fontSize: signUpButton.fontSize
fontBold: true fontBold: linkAccountBody.fontBold
anchors { anchors {
top: cancelContainer.top top: cancelContainer.top
right: passwordField.right right: passwordField.right
@ -338,7 +340,7 @@ Item {
id: cantAccessText id: cantAccessText
z: 10 z: 10
anchors.centerIn: parent anchors.centerIn: parent
font.family: "Cairo" font.family: linkAccountBody.fontFamily
font.pixelSize: 14 font.pixelSize: 14
text: "<a href='https://highfidelity.com/users/password/new'> Can't access your account?</a>" text: "<a href='https://highfidelity.com/users/password/new'> Can't access your account?</a>"
@ -370,9 +372,9 @@ Item {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
lineHeight: 1 lineHeight: 1
color: "white" color: "white"
font.family: "Cairo" font.family: linkAccountBody.fontFamily
font.pixelSize: 48 font.pixelSize: 48
font.bold: true font.bold: linkAccountBody.fontBold
lineHeightMode: Text.ProportionalHeight lineHeightMode: Text.ProportionalHeight
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
} }
@ -383,9 +385,9 @@ Item {
width: d.minWidthButton width: d.minWidthButton
height: d.minHeightButton height: d.minHeightButton
color: hifi.buttons.blue color: hifi.buttons.blue
fontFamily: "Cairo" fontFamily: linkAccountBody.fontFamily
fontSize: 21 fontSize: 24
fontBold: true fontBold: linkAccountBody.fontBold
anchors { anchors {
bottom: parent.bottom bottom: parent.bottom
bottomMargin: 0.1 * parent.height bottomMargin: 0.1 * parent.height
@ -424,12 +426,12 @@ Item {
width: signUpButton.width width: signUpButton.width
height: signUpButton.height height: signUpButton.height
text: qsTr("Log In") text: qsTr("Log In")
fontFamily: "Cairo" fontFamily: linkAccountBody.fontFamily
fontSize: signUpButton.fontSize fontSize: signUpButton.fontSize
fontBold: true fontBold: linkAccountBody.fontBold
anchors { anchors {
top: parent.top top: parent.top
topMargin: 0.245 * parent.height topMargin: (parent.height / 2) - loginButton.height
left: parent.left left: parent.left
leftMargin: (parent.width - loginButton.width) / 2 leftMargin: (parent.width - loginButton.width) / 2
} }
@ -447,7 +449,7 @@ Item {
anchors { anchors {
top: loginButton.bottom top: loginButton.bottom
topMargin: 0.04 * parent.height topMargin: hifi.dimensions.contentSpacing.y
left: parent.left left: parent.left
leftMargin: (parent.width - steamLoginButton.width) / 2 leftMargin: (parent.width - steamLoginButton.width) / 2
} }
@ -528,9 +530,9 @@ Item {
font.capitalization: Font.AllUppercase; font.capitalization: Font.AllUppercase;
verticalAlignment: Text.AlignVCenter; verticalAlignment: Text.AlignVCenter;
horizontalAlignment: Text.AlignHCenter; horizontalAlignment: Text.AlignHCenter;
font.family: "Cairo" font.family: linkAccountBody.fontFamily
font.pixelSize: signUpButton.fontSize; font.pixelSize: signUpButton.fontSize;
font.bold: true font.bold: linkAccountBody.fontBold
color: enabled ? hifi.buttons.textColor[control.color] color: enabled ? hifi.buttons.textColor[control.color]
: hifi.buttons.disabledTextColor[control.colorScheme] : hifi.buttons.disabledTextColor[control.colorScheme]
} }
@ -553,9 +555,9 @@ Item {
lineHeight: 1 lineHeight: 1
color: "white" color: "white"
font.family: "Cairo" font.family: linkAccountBody.fontFamily
font.pixelSize: 24 font.pixelSize: 24
font.bold: true font.bold: linkAccountBody.fontBold
lineHeightMode: Text.ProportionalHeight lineHeightMode: Text.ProportionalHeight
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
} }