From 482922d98673a4f73558c14e168321d5222df336 Mon Sep 17 00:00:00 2001
From: Kasen IO <kasenvr@gmail.com>
Date: Tue, 4 Aug 2020 01:28:19 -0400
Subject: [PATCH] First pass at making login dialog more clear.

---
 .../qml/LoginDialog/LinkAccountBody.qml       | 37 ++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/interface/resources/qml/LoginDialog/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
index 6f437bb991..ec3f0d263e 100644
--- a/interface/resources/qml/LoginDialog/LinkAccountBody.qml
+++ b/interface/resources/qml/LoginDialog/LinkAccountBody.qml
@@ -45,6 +45,7 @@ Item {
     property bool lostFocus: false
 
     readonly property bool loginDialogPoppedUp: loginDialog.getLoginDialogPoppedUp()
+    // If not logging into domain, then we must be logging into the metaverse...
     readonly property bool isLoggingInToDomain: loginDialog.getDomainLoginRequested()
     readonly property string domainAuthProvider: loginDialog.getDomainLoginAuthProvider()
 
@@ -105,8 +106,9 @@ Item {
             loginErrorMessage.wrapMode = Text.WordWrap;
             errorContainer.height = (loginErrorMessageTextMetrics.width / displayNameField.width) * loginErrorMessageTextMetrics.height;
         }
+        loginDialogText.text = (!isLoggingInToDomain) ? "Log In to Metaverse" : "Log In to Domain";
         loginButton.text = (!linkAccountBody.linkSteam && !linkAccountBody.linkOculus) ? "Log In" : "Link Account";
-        loginButton.text = (!isLoggingInToDomain) ? "Log In" : "Log In to Domain";
+        loginButton.text = (!isLoggingInToDomain) ? "Log In to Metaverse" : "Log In to Domain";
         loginButton.color = hifi.buttons.blue;
         displayNameField.placeholderText = "Display Name (optional)";
         var savedDisplayName = Settings.getValue("Avatar/displayName", "");
@@ -140,6 +142,21 @@ Item {
             visible: false;
             anchors.fill: parent;
         }
+        
+        Text {
+            id: loginDialogText
+            text: qsTr("Log In")
+            anchors {
+                left: parent.left
+            }
+            lineHeight: 1
+            color: "white"
+            font.family: linkAccountBody.fontFamily
+            font.pixelSize: linkAccountBody.textFieldFontSize
+            font.bold: linkAccountBody.fontBold
+            verticalAlignment: Text.AlignVCenter
+            horizontalAlignment: Text.AlignHCenter
+        }
 
         Item {
             id: loginContainer
@@ -626,6 +643,24 @@ Item {
                     root.tryDestroy();
                 }
             }
+            
+            Text {
+                id: loginSkipTipText
+                text: qsTr("Not all domains require you to have a metaverse account. \n Some domains have their own login dialogs.")
+                visible: !linkAccountBody.isLoggingInToDomain
+                anchors {
+                    top: dismissButton.bottom
+                    topMargin: hifi.dimensions.contentSpacing.y
+                    left: parent.left
+                }
+                lineHeight: 1
+                color: "white"
+                font.family: linkAccountBody.fontFamily
+                font.pixelSize: linkAccountBody.textFieldFontSize
+                font.bold: linkAccountBody.fontBold
+                verticalAlignment: Text.AlignVCenter
+                horizontalAlignment: Text.AlignHCenter
+            }
         }
     }