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

Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2

Browse source
This commit is contained in:
Wayne Chen 2018-12-10 14:32:42 -08:00
commit 37aec8926a
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/LoginDialog/CompleteProfileBody.qml
View file

@ -79,7 +79,7 @@ Item {
id: loginErrorMessage; id: loginErrorMessage;
width: root.bannerWidth width: root.bannerWidth
color: "red"; color: "red";
font.family: signUpBody.fontFamily font.family: completeProfileBody.fontFamily
font.pixelSize: 18 font.pixelSize: 18
font.bold: completeProfileBody.fontBold font.bold: completeProfileBody.fontBold
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter

21
interface/resources/qml/LoginDialog/LoggingInBody.qml
View file

@ -17,8 +17,10 @@ import controlsUit 1.0 as HifiControlsUit
import stylesUit 1.0 as HifiStylesUit import stylesUit 1.0 as HifiStylesUit
Item { Item {
id: loggingInBody id: loggingInBody
clip: true
height: root.height
width: root.width
property int textFieldHeight: 31 property int textFieldHeight: 31
property int loggingInGlyphRightMargin: 10 property int loggingInGlyphRightMargin: 10
property string fontFamily: "Raleway" property string fontFamily: "Raleway"
@ -70,8 +72,9 @@ Item {
loggingInText.wrapMode = Text.NoWrap; loggingInText.wrapMode = Text.NoWrap;
if (loggingInBody.linkSteam) { if (loggingInBody.linkSteam) {
loggingInText.centerIn = loggingInHeader; loggingInGlyph.visible = true;
loggingInText.text = "Linking to Steam"; loggingInText.text = "Linking to Steam";
loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2;
loginDialog.linkSteam(); loginDialog.linkSteam();
} else if (loggingInBody.withSteam) { } else if (loggingInBody.withSteam) {
loggingInGlyph.visible = true; loggingInGlyph.visible = true;
@ -83,10 +86,8 @@ Item {
loggingInText.text = "Logging in to Oculus"; loggingInText.text = "Logging in to Oculus";
loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2; loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2;
} else { } else {
loggingInText.centerIn = loggingInHeader;
loggingInText.text = "Logging in"; loggingInText.text = "Logging in";
loggingInText.anchors.bottom = loggingInHeader.bottom; loggingInText.anchors.centerIn = loggingInHeader;
loggingInText.anchors.bottomMargin = hifi.dimensions.contentSpacing.y;
} }
loggingInSpinner.visible = true; loggingInSpinner.visible = true;
} }
@ -101,11 +102,15 @@ Item {
// reset the flag. // reset the flag.
loggingInGlyph.visible = false; loggingInGlyph.visible = false;
loggingInText.text = "You are now logged into Steam!"; loggingInText.text = "You are now logged into Steam!";
loggingInText.x = 0;
loggingInText.anchors.centerIn = loggingInHeader;
loggedInGlyph.visible = true; loggedInGlyph.visible = true;
} else if (loggingInBody.withOculus) { } else if (loggingInBody.withOculus) {
// reset the flag. // reset the flag.
loggingInGlyph.visible = false; loggingInGlyph.visible = false;
loggingInText.text = "You are now logged into Oculus!"; loggingInText.text = "You are now logged into Oculus!";
loggingInText.x = 0;
loggingInText.anchors.centerIn = loggingInHeader;
loggedInGlyph.text = hifi.glyphs.oculus; loggedInGlyph.text = hifi.glyphs.oculus;
loggedInGlyph.visible = true; loggedInGlyph.visible = true;
} else { } else {
@ -116,14 +121,12 @@ Item {
Item { Item {
id: mainContainer id: mainContainer
width: root.width anchors.fill: parent
height: root.height
onHeightChanged: d.resize(); onWidthChanged: d.resize(); onHeightChanged: d.resize(); onWidthChanged: d.resize();
Item { Item {
id: loggingInContainer id: loggingInContainer
width: parent.width anchors.fill: parent
height: parent.height
onHeightChanged: d.resize(); onWidthChanged: d.resize(); onHeightChanged: d.resize(); onWidthChanged: d.resize();
Item { Item {

2
interface/resources/qml/LoginDialog/UsernameCollisionBody.qml
View file

@ -57,7 +57,7 @@ Item {
hifi.dimensions.contentSpacing.y + buttons.height; hifi.dimensions.contentSpacing.y + buttons.height;
parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth)) parent.width = root.width = Math.max(d.minWidth, Math.min(d.maxWidth, targetWidth))
parent.height = root.height = Math.max(Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)), mainContainer.height + hifi.dimensions.contentSpacing.y)); parent.height = root.height = Math.max(Math.max(d.minHeight, Math.min(d.maxHeight, targetHeight)), mainContainer.height + hifi.dimensions.contentSpacing.y);
} }
} }