From 88d8163b04e8b740c1433530a8821f94dae7ae3b Mon Sep 17 00:00:00 2001
From: Wayne Chen <chen.wayne@outlook.com>
Date: Wed, 6 Mar 2019 17:29:32 -0800
Subject: [PATCH] updating compile failure + icons/settings update

---
 interface/resources/qml/hifi/audio/Audio.qml | 60 +++++++++++++++++---
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/interface/resources/qml/hifi/audio/Audio.qml b/interface/resources/qml/hifi/audio/Audio.qml
index 9e9a8c0022..569cd23176 100644
--- a/interface/resources/qml/hifi/audio/Audio.qml
+++ b/interface/resources/qml/hifi/audio/Audio.qml
@@ -154,7 +154,23 @@ Rectangle {
                 }
                 AudioControls.CheckBox {
                     spacing: muteMic.spacing
-                    text: qsTr("Push To Talk");
+                    text: qsTr("Show audio level meter");
+                    checked: AvatarInputs.showAudioTools;
+                    onClicked: {
+                        AvatarInputs.showAudioTools = checked;
+                        checked = Qt.binding(function() { return AvatarInputs.showAudioTools; }); // restore binding
+                    }
+                    onXChanged: rightMostInputLevelPos = x + width
+                }
+            }
+
+            Separator {}
+
+            ColumnLayout {
+                spacing: muteMic.spacing;
+                AudioControls.CheckBox {
+                    spacing: muteMic.spacing
+                    text: qsTr("Push To Talk (T)");
                     checked: isVR ? AudioScriptingInterface.pushToTalkHMD : AudioScriptingInterface.pushToTalkDesktop;
                     onClicked: {
                         if (isVR) {
@@ -171,15 +187,41 @@ Rectangle {
                         }); // restore binding
                     }
                 }
-                AudioControls.CheckBox {
-                    spacing: muteMic.spacing
-                    text: qsTr("Show audio level meter");
-                    checked: AvatarInputs.showAudioTools;
-                    onClicked: {
-                        AvatarInputs.showAudioTools = checked;
-                        checked = Qt.binding(function() { return AvatarInputs.showAudioTools; }); // restore binding
+                Item {
+                    id: pttTextContainer
+                    x: margins.paddings;
+                    width: rightMostInputLevelPos
+                    height: pttTextMetrics.height
+                    visible: true
+                    TextMetrics {
+                        id: pttTextMetrics
+                        text: pttText.text
+                        font: pttText.font
+                    }
+                    RalewayRegular {
+                        id: pttText
+                        wrapMode: Text.WordWrap
+                        color: hifi.colors.white;
+                        width: parent.width;
+                        font.italic: true
+                        size: 16;
+                        text: isVR ? qsTr("Press and hold grip triggers on both of your controllers to unmute.") :
+                            qsTr("Press and hold the button \"T\" to unmute.");
+                        onTextChanged: {
+                            if (pttTextMetrics.width > rightMostInputLevelPos) {
+                                pttTextContainer.height = Math.ceil(pttTextMetrics.width / rightMostInputLevelPos) * pttTextMetrics.height;
+                            } else {
+                                pttTextContainer.height = pttTextMetrics.height;
+                            }
+                        }
+                    }
+                    Component.onCompleted: {
+                        if (pttTextMetrics.width > rightMostInputLevelPos) {
+                            pttTextContainer.height = Math.ceil(pttTextMetrics.width / rightMostInputLevelPos) * pttTextMetrics.height;
+                        } else {
+                            pttTextContainer.height = pttTextMetrics.height;
+                        }
                     }
-                    onXChanged: rightMostInputLevelPos = x + width
                 }
             }