From 179a445f597e25feec658b35eb1f2d132c41223c Mon Sep 17 00:00:00 2001 From: David Kelly Date: Thu, 6 Apr 2017 15:21:10 -0700 Subject: [PATCH] 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.
" + + "2. Once the other person puts their hand onto yours, you'll see your connection form.
" + + "3. After about 3 seconds, you're connected!" + property string hmdNotMountedInstructions: + "1. Press and hold the 'x' key to extend your arm.
" + + "2. Once the other person puts their hand onto yours, you'll see your connection form.
" + + "3. After about 3 seconds, you're connected!"; + property string notLoggedInInstructions: "You must be logged into your High Fidelity account to make connections.
" + property string instructions: + "When you meet someone you want to remember later, you can connect with a handshake:

" + // Text - text: HMD.isMounted ? - "When you meet someone you want to remember later, you can connect with a handshake:

" + - "1. Put your hand out onto their hand and squeeze your controller's grip button on its side.
" + - "2. Once the other person puts their hand onto yours, you'll see your connection form.
" + - "3. After about 3 seconds, you're connected!" - : - "When you meet someone you want to remember later, you can connect with a handshake:

" + - "1. Press and hold the 'x' key to extend your arm.
" + - "2. Once the other person puts their hand onto yours, you'll see your connection form.
" + - "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 } }