From fa2217c1880c33684fbe7c92f9504ab761f205cd Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.com>
Date: Thu, 6 Jun 2019 12:20:43 -0700
Subject: [PATCH] DEV-113: Remove headphones icon from status indicator in top
 bar

---
 .../simplifiedUI/topBar/SimplifiedTopBar.qml   | 18 ++++--------------
 .../hifi/simplifiedUI/topBar/images/focus.svg  | 13 -------------
 2 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 interface/resources/qml/hifi/simplifiedUI/topBar/images/focus.svg

diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
index 27a786ece2..36c882beb1 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
@@ -260,9 +260,7 @@ Rectangle {
             id: statusButton
             property string currentStatus
             anchors.centerIn: parent
-            anchors.horizontalCenterOffset: 1
-            anchors.verticalCenterOffset: 2
-            width: 13
+            width: 15
             height: width
             radius: width/2
             visible: false
@@ -270,7 +268,7 @@ Rectangle {
 
         ColorOverlay {
             anchors.fill: statusButton
-            opacity: statusButton.currentStatus ? 1 : 0
+            opacity: statusButton.currentStatus ? (statusButtonMouseArea.containsMouse ? 1.0 : 0.7) : 0.7
             source: statusButton
             color: if (statusButton.currentStatus === "busy") {
                 "#ff001a"
@@ -278,19 +276,11 @@ Rectangle {
                 "#009036"
             } else if (statusButton.currentStatus) {
                 "#ffed00"
+            } else {
+                "#7e8c81"
             }
         }
 
-        Image {
-            id: focusIcon
-            source: "./images/focus.svg"
-            opacity: statusButtonMouseArea.containsMouse ? 1.0 : (statusButton.currentStatus === "busy" ? 0.7 : 0.3)
-            anchors.centerIn: parent
-            width: 36
-            height: 20
-            fillMode: Image.PreserveAspectFit
-        }
-
         MouseArea {
             id: statusButtonMouseArea
             anchors.fill: parent
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/images/focus.svg b/interface/resources/qml/hifi/simplifiedUI/topBar/images/focus.svg
deleted file mode 100644
index f7950650c6..0000000000
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/images/focus.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="32" height="19.001" fill="none" version="1.1" viewBox="0 0 32 19.001" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
- <metadata>
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title/>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <path d="m7 19h-3.542c-0.46115 0.0089-0.91905-0.0192-1.3443-0.2001-0.42525-0.1808-0.80846-0.4496-1.125-0.7892-0.3234-0.3355-0.57737-0.7329-0.74698-1.1691-0.16962-0.4362-0.25146-0.9023-0.24076-1.3709v-5.47c-0.0066251-0.46326 0.078429-0.92318 0.25019-1.3526 0.17176-0.42944 0.42674-0.81971 0.74988-1.1478 0.32313-0.32808 0.70786-0.58732 1.1316-0.76244 0.42368-0.17511 0.87772-0.26255 1.3353-0.25716h1.4718c0.03732-0.87492 0.24704-1.7335 0.61682-2.5251s0.89216-1.5005 1.5364-2.0849c1.2696-1.2214 3.1558-1.8924 4.9071-1.87l8 2.2471e-5c1.7402-0.025877 3.6023 0.64637 4.8546 1.87 1.2793 1.2015 2.0626 2.8482 2.1927 4.61h1.3178c0.946-0.01712 1.8609 0.3419 2.5484 1 0.3479 0.31321 0.625 0.69864 0.8125 1.13 0.1875 0.43142 0.2809 0.89867 0.274 1.37v5.47c0.0037 0.4767-0.091 0.9488-0.2781 1.3863-0.1871 0.4374-0.376 0.8397-0.7219 1.163-0.3346 0.3376-0.5167 0.5951-0.9542 0.7753-0.4376 0.1803-1.2083 0.2298-1.6807 0.2247h-3.3624v-12.049c0.0051-0.65734-0.1179-1.3092-0.362-1.9184-0.2441-0.60915-0.6044-1.1636-1.0603-1.6316-0.4213-0.48067-0.9384-0.86553-1.5173-1.1292-0.5788-0.26371-1.4283-0.27101-2.0631-0.27147h-8c-0.6475-0.00706-1.4451-0.00352-2.0378 0.26031-0.59274 0.26384-1.1231 0.65262-1.5556 1.1404-0.45594 0.46802-0.81626 1.0225-1.0603 1.6316-0.24406 0.60916-0.35129 1.261-0.34623 1.9184zm-3.4717-2h1.4717v-8.4793h-1.4717c-0.92847 0-1.5283 0.49-1.5283 1.48v5.47c0.01975 0.99 0.59981 1.5293 1.5283 1.5293zm26.472-6.9993c8e-3 -0.84434-0.6554-1.4883-1.5049-1.48h-1.4478v8.4793h1.4478c0.8319 0.0109 1.5175-0.722 1.5049-1.5293z" fill="#fff"/>
-</svg>