From edb135776af2edf7d5d743dfad97a94315018659 Mon Sep 17 00:00:00 2001
From: milad <milad@miladnazeri.com>
Date: Tue, 24 Sep 2019 16:44:34 -0700
Subject: [PATCH] Added selfie view and updated help

---
 .../helpApp/controls/ControlsTable.qml        |  6 ++---
 .../settingsApp/general/General.qml           | 22 +++++++++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml
index b647d5ca24..ad4ecec707 100644
--- a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml
@@ -699,8 +699,8 @@ Item {
                 spacing: controlsTableRoot.rowPadding
 
                 HifiStylesUit.GraphikRegular {
-                    id: mirrorText
-                    text: "Mirror Mode"
+                    id: selfieText
+                    text: "Selfie"
                     width: paintedWidth
                     height: parent.height
                     horizontalAlignment: Text.AlignLeft
@@ -711,7 +711,7 @@ Item {
 
                 HifiStylesUit.GraphikRegular {
                     text: "See your own avatar"
-                    width: parent.width - mirrorText.width - parent.spacing - controlsTableRoot.rowPadding
+                    width: parent.width - selfieText.width - parent.spacing - controlsTableRoot.rowPadding
                     height: parent.height
                     horizontalAlignment: Text.AlignLeft
                     verticalAlignment: Text.AlignVCenter
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
index 24fff2dae4..3fd64cde49 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
@@ -239,6 +239,16 @@ Flickable {
                         Camera.mode = "third person"
                     }
                 }
+
+                SimplifiedControls.RadioButton {
+                    id: selfie
+                    text: "Selfie"
+                    checked: Camera.mode === "mirror"
+                    visible: true
+                    onClicked: {
+                        Camera.mode = "mirror"
+                    }
+                }
                 
                 Connections {
                     target: Camera
@@ -248,6 +258,18 @@ Flickable {
                             firstPerson.checked = true
                         } else if (Camera.mode === "third person") {
                             thirdPerson.checked = true
+                        } else if (Camera.mode === "mirror" && HMD.active) {
+                            selfie.checked = true
+                        }
+                    }
+                }
+
+                Connections {
+                    target: HMD
+
+                    onDisplayModeChanged {
+                        if (isHMDMode) {
+                            selfie.visible = false;
                         }
                     }
                 }