From 179a445f597e25feec658b35eb1f2d132c41223c Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Thu, 6 Apr 2017 15:21:10 -0700
Subject: [PATCH 1/3] updated connection instructions

---
 interface/resources/qml/hifi/Pal.qml | 31 +++++++++++++++++++---------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index d627fb54f9..b378ee3c61 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -916,17 +916,28 @@ Rectangle {
                 color: hifi.colors.darkGray
                 wrapMode: Text.WordWrap
                 textFormat: Text.StyledText;
+                property string hmdMountedInstructions:
+                    "1. Put your hand out onto their hand and squeeze your controller's grip button on its side.<br>" +
+                    "2. Once the other person puts their hand onto yours, you'll see your connection form.<br>" +
+                    "3. After about 3 seconds, you're connected!"
+                property string hmdNotMountedInstructions:
+                    "1. Press and hold the 'x' key to extend your arm.<br>" +
+                    "2. Once the other person puts their hand onto yours, you'll see your connection form.<br>" +
+                    "3. After about 3 seconds, you're connected!";
+                property string notLoggedInInstructions: "<b><font color='red'>You must be logged into your High Fidelity account to make connections.</b></font><br>"
+                property string instructions:
+                    "<b>When you meet someone you want to remember later, you can <font color='purple'>connect</font> with a handshake:</b><br><br>"
+
                 // Text
-                text: HMD.isMounted ?
-                "<b>When you meet someone you want to remember later, you can <font color='purple'>connect</font> with a handshake:</b><br><br>" +
-                "1. Put your hand out onto their hand and squeeze your controller's grip button on its side.<br>" +
-                "2. Once the other person puts their hand onto yours, you'll see your connection form.<br>" +
-                "3. After about 3 seconds, you're connected!"
-                :
-                "<b>When you meet someone you want to remember later, you can <font color='purple'>connect</font> with a handshake:</b><br><br>" +
-                "1. Press and hold the 'x' key to extend your arm.<br>" +
-                "2. Once the other person puts their hand onto yours, you'll see your connection form.<br>" +
-                "3. After about 3 seconds, you're connected!";
+                text:
+                    Account.isLoggedIn() ?
+                        HMD.isMounted ?
+                            instructions + hmdMountedInstructions
+                        : instructions + hmdNotMountedInstructions
+                    :
+                        HMD.isMounted ?
+                            notLoggedInInstructions + instructions + hmdMountedInstructions
+                        : notLoggedInInstructions + instructions + hmdNotMountedInstructions
             }
 
         }

From 3ea6cac45aac79ee125ead7dc5702c11eb02634e Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Mon, 10 Apr 2017 08:05:01 -0700
Subject: [PATCH 2/3] HMD.mounted instead of HMD.isMounted

---
 interface/resources/qml/hifi/Pal.qml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 8814342f02..6f815e79f9 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -921,17 +921,10 @@ Rectangle {
                 property string notLoggedInInstructions: "<b><font color='red'>You must be logged into your High Fidelity account to make connections.</b></font><br>"
                 property string instructions:
                     "<b>When you meet someone you want to remember later, you can <font color='purple'>connect</font> with a handshake:</b><br><br>"
-
                 // Text
                 text:
-                    Account.isLoggedIn() ?
-                        HMD.isMounted ?
-                            instructions + hmdMountedInstructions
-                        : instructions + hmdNotMountedInstructions
-                    :
-                        HMD.isMounted ?
-                            notLoggedInInstructions + instructions + hmdMountedInstructions
-                        : notLoggedInInstructions + instructions + hmdNotMountedInstructions
+                    Account.isLoggedIn() ? ( HMD.mounted ? instructions + hmdMountedInstructions : instructions + hmdNotMountedInstructions)
+                    : ( HMD.mounted ? notLoggedInInstructions + instructions + hmdMountedInstructions : notLoggedInInstructions + instructions + hmdNotMountedInstructions
             }
 
         }

From 082d0964d26859c77140205527557ff9c7cf3835 Mon Sep 17 00:00:00 2001
From: David Kelly <david@highfidelity.io>
Date: Mon, 10 Apr 2017 11:08:45 -0700
Subject: [PATCH 3/3] oops

---
 interface/resources/qml/hifi/Pal.qml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 6f815e79f9..1e72d71b18 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -924,7 +924,7 @@ Rectangle {
                 // Text
                 text:
                     Account.isLoggedIn() ? ( HMD.mounted ? instructions + hmdMountedInstructions : instructions + hmdNotMountedInstructions)
-                    : ( HMD.mounted ? notLoggedInInstructions + instructions + hmdMountedInstructions : notLoggedInInstructions + instructions + hmdNotMountedInstructions
+                    : ( HMD.mounted ? notLoggedInInstructions + instructions + hmdMountedInstructions : notLoggedInInstructions + instructions + hmdNotMountedInstructions)
             }
 
         }