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

more fixing of logging in

Browse source
This commit is contained in:
Wayne Chen 2018-12-10 11:51:34 -08:00
parent 2a37ed21b2
commit e53e8435eb
1 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
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,28 +72,22 @@ Item {
loggingInText.wrapMode = Text.NoWrap; loggingInText.wrapMode = Text.NoWrap;
if (loggingInBody.linkSteam) { if (loggingInBody.linkSteam) {
loggingInGlyph.visible = true;
loggingInText.text = "Linking to Steam"; loggingInText.text = "Linking to Steam";
loggingInText.left = loggingInHeader.left; loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2;
loggingInText.leftMargin = (loggingInHeader.width - loggingInTextMetrics.width) / 2;
loginDialog.linkSteam(); loginDialog.linkSteam();
} else if (loggingInBody.withSteam) { } else if (loggingInBody.withSteam) {
loggingInGlyph.visible = true; loggingInGlyph.visible = true;
loggingInText.text = "Logging in to Steam"; loggingInText.text = "Logging in to Steam";
loggingInText.left = loggingInHeader.left;
loggingInText.leftMargin = 0;
loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2; loggingInText.x = loggingInHeader.width/2 - loggingInTextMetrics.width/2 + loggingInGlyphTextMetrics.width/2;
} else if (loggingInBody.withOculus) { } else if (loggingInBody.withOculus) {
loggingInGlyph.text = hifi.glyphs.oculus; loggingInGlyph.text = hifi.glyphs.oculus;
loggingInGlyph.visible = true; loggingInGlyph.visible = true;
loggingInText.text = "Logging in to Oculus"; loggingInText.text = "Logging in to Oculus";
loggingInText.left = loggingInHeader.left;
loggingInText.leftMargin = 0;
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;
} }
@ -106,17 +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.left = loggingInHeader.left;
loggingInText.leftMargin = (loggingInHeader.width - loggingInTextMetrics.width) / 2;
loggingInText.x = 0; 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.left = loggingInHeader.left;
loggingInText.leftMargin = (loggingInHeader.width - loggingInTextMetrics.width) / 2;
loggingInText.x = 0; 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 {
@ -127,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 {