From e119afdeada368d895e7fd547c0aff0823adfda3 Mon Sep 17 00:00:00 2001
From: dante ruiz <dante@highfidelity.io>
Date: Mon, 24 Jun 2019 14:35:59 -0700
Subject: [PATCH] terms of service

---
 .../cmake/modules/MacOSXBundleInfo.plist.in   |  2 +-
 launchers/darwin/nib/DisplayNameScreen.xib    | 32 ++++++++++++++++++-
 launchers/darwin/src/DisplayNameScreen.m      |  5 +++
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/launchers/darwin/cmake/modules/MacOSXBundleInfo.plist.in b/launchers/darwin/cmake/modules/MacOSXBundleInfo.plist.in
index 4c87bff3cf..3fe8e80f7a 100644
--- a/launchers/darwin/cmake/modules/MacOSXBundleInfo.plist.in
+++ b/launchers/darwin/cmake/modules/MacOSXBundleInfo.plist.in
@@ -32,6 +32,6 @@
 	<key>CFBundleName</key>
 	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
 	<key>CFBundleDisplayName</key>
-	<string>CFBundleName</string>
+	<string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
 </dict>
 </plist>
diff --git a/launchers/darwin/nib/DisplayNameScreen.xib b/launchers/darwin/nib/DisplayNameScreen.xib
index e56f2bf66b..f75491fc13 100644
--- a/launchers/darwin/nib/DisplayNameScreen.xib
+++ b/launchers/darwin/nib/DisplayNameScreen.xib
@@ -69,8 +69,17 @@
                         <action selector="hyperLink:" target="YVh-OH-vU8" id="JfS-ot-wAP"/>
                     </connections>
                 </textField>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0CN-kS-xZ5">
+                    <rect key="frame" x="66" y="68" width="266" height="17"/>
+                    <autoresizingMask key="autoresizingMask"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="By Signing in, you agree to the High Fidelity" id="zSf-YA-osu">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
                 <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xeX-qc-ccB" customClass="HFButton">
-                    <rect key="frame" x="205" y="84" width="104" height="42"/>
+                    <rect key="frame" x="205" y="111" width="104" height="42"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="square" title="LOG IN" bezelStyle="shadowlessSquare" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="6Ba-S9-5qW">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
@@ -81,6 +90,18 @@
                         <action selector="login:" target="YVh-OH-vU8" id="uzF-yC-tu1"/>
                     </connections>
                 </button>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QtF-Xs-rht" customClass="Hyperlink">
+                    <rect key="frame" x="336" y="68" width="115" height="17"/>
+                    <autoresizingMask key="autoresizingMask"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" title="Terms of Service" id="O5x-BW-FLk">
+                        <font key="font" metaFont="system"/>
+                        <color key="textColor" name="linkColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="linkColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                    <connections>
+                        <action selector="termsOfService:" target="YVh-OH-vU8" id="bgc-08-8Lj"/>
+                    </connections>
+                </textField>
             </subviews>
             <point key="canvasLocation" x="138.5" y="154"/>
         </customView>
@@ -91,5 +112,14 @@
                 <outlet property="smallLogo" destination="j8K-TD-h7e" id="OVd-p3-nu6"/>
             </connections>
         </customObject>
+        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="wWT-mi-6An">
+            <rect key="frame" x="0.0" y="0.0" width="37" height="17"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="1Uh-1I-CcU">
+                <font key="font" usesAppearanceFont="YES"/>
+                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+            </textFieldCell>
+        </textField>
     </objects>
 </document>
diff --git a/launchers/darwin/src/DisplayNameScreen.m b/launchers/darwin/src/DisplayNameScreen.m
index 7a402d792b..581eabc4ee 100644
--- a/launchers/darwin/src/DisplayNameScreen.m
+++ b/launchers/darwin/src/DisplayNameScreen.m
@@ -31,4 +31,9 @@
 {
     [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.highfidelity.com/hq-support"]];
 }
+
+- (IBAction)termsOfService:(id)sender
+{
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.highfidelity.com/termsofservice"]];
+}
 @end