From 90a5b25600de2b0ec135e7a375cd41cf2c8093c8 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 16 May 2019 14:13:41 -0700
Subject: [PATCH] A bunch of changes here
---
.../hifi/simplifiedUI/avatarApp/AvatarApp.qml | 7 ++-
.../components/AvatarAppListDelegate.qml | 8 ++-
.../components/DisplayNameHeader.qml | 2 +
.../simplifiedUI/images/defaultAvatar.svg | 14 +++++
.../inputDeviceButton/InputDeviceButton.qml | 29 +++------
.../inputDeviceButton/images/mic-clip-i.svg | 30 ++++++---
.../inputDeviceButton/images/mic-gate-i.svg | 16 ++++-
.../inputDeviceButton/images/mic-mute-a.svg | 16 ++++-
.../inputDeviceButton/images/mic-mute-i.svg | 16 ++++-
.../inputDeviceButton/images/mic-ptt-a.svg | 18 +++++-
.../inputDeviceButton/images/mic-ptt-i.svg | 22 +------
.../inputDeviceButton/images/mic-unmute-a.svg | 58 +++++++++++++++++-
.../inputDeviceButton/images/mic-unmute-i.svg | 16 ++++-
.../simplifiedUI/topBar/SimplifiedTopBar.qml | 40 ++++++------
.../topBar/images/defaultAvatar.jpg | Bin 36764 -> 0 bytes
.../topBar/images/outputDeviceLoud.svg | 16 +----
.../topBar/images/updatedIcons.zip | Bin 7619 -> 0 bytes
scripts/system/simplifiedUI/simplifiedUI.js | 29 +++++----
18 files changed, 225 insertions(+), 112 deletions(-)
create mode 100644 interface/resources/qml/hifi/simplifiedUI/images/defaultAvatar.svg
delete mode 100644 interface/resources/qml/hifi/simplifiedUI/topBar/images/defaultAvatar.jpg
delete mode 100644 interface/resources/qml/hifi/simplifiedUI/topBar/images/updatedIcons.zip
diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml b/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml
index a659ff4e0c..57bec2250f 100644
--- a/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml
@@ -92,7 +92,7 @@ Rectangle {
AvatarAppComponents.DisplayNameHeader {
id: displayNameHeader
- previewUrl: avatarPreviewUrl
+ previewUrl: root.avatarPreviewUrl
loading: !inventoryContentsList.visible
anchors.top: parent.top
anchors.topMargin: 30
@@ -210,7 +210,10 @@ Rectangle {
downloadUrl = avatarAppInventoryModel.get(i).download_url;
previewUrl = avatarAppInventoryModel.get(i).preview;
if (MyAvatar.skeletonModelURL === downloadUrl) {
- avatarPreviewUrl = previewUrl;
+ if (previewUrl.indexOf("missing.png") > -1) {
+ previewUrl = "../../images/defaultAvatar.svg"; // Extra `../` because the image is stored 2 levels up from `DisplayNameHeader.qml`
+ }
+ root.avatarPreviewUrl = previewUrl;
return;
}
}
diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml
index 7c6ad1b09c..cdfa06190c 100644
--- a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml
@@ -51,12 +51,14 @@ Rectangle {
Image {
id: itemPreviewImage
- source: root.itemPreviewImageUrl
+ source: root.itemPreviewImageUrl.indexOf("missing.png") > -1 ? "../../images/defaultAvatar.svg" : root.itemPreviewImageUrl
anchors.left: parent.left
anchors.leftMargin: 20
anchors.verticalCenter: parent.verticalCenter
- height: 60
- width: height
+ width: 60
+ height: width
+ sourceSize.width: width
+ sourceSize.height: height
fillMode: Image.PreserveAspectCrop
mipmap: true
layer.enabled: true
diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml
index 6bf3d34d6f..a6be398e53 100644
--- a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml
@@ -43,6 +43,8 @@ Item {
anchors.verticalCenter: parent.verticalCenter
height: 100
width: height
+ sourceSize.width: width
+ sourceSize.height: height
fillMode: Image.PreserveAspectCrop
layer.enabled: true
layer.effect: OpacityMask {
diff --git a/interface/resources/qml/hifi/simplifiedUI/images/defaultAvatar.svg b/interface/resources/qml/hifi/simplifiedUI/images/defaultAvatar.svg
new file mode 100644
index 0000000000..05779e7d40
--- /dev/null
+++ b/interface/resources/qml/hifi/simplifiedUI/images/defaultAvatar.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24" height="24" fill="none" version="1.1" viewBox="0 0 24 24" 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>
+ <circle cx="11.949" cy="11.964" r="11.39" fill="#7e8c81"/>
+ <path d="m23.745 12.04c-0.0052 3.1016-1.2376 6.075-3.4279 8.2709-2.1903 2.196-5.1606 3.4359-8.2621 3.4492-1.5474 0.0197-3.0828-0.2751-4.5129-0.8664s-2.7253-1.4669-3.807-2.5737c-1.1196-1.0656-2.0066-2.3513-2.6055-3.7762-0.59888-1.4249-0.89659-2.9583-0.87448-4.5038 0.020961-3.123 1.2709-6.1122 3.4793-8.3206 2.2084-2.2084 5.1976-3.4584 8.3207-3.4793 1.5455-0.022107 3.0789 0.27564 4.5038 0.87451 1.4249 0.59887 2.7106 1.486 3.7762 2.6055 1.1014 1.0842 1.9714 2.3806 2.5576 3.8106 0.5861 1.43 0.8761 2.9641 0.8524 4.5094zm-1.4099 0c0.0065-2.3801-0.8132-4.6889-2.3191-6.5321s-3.6048-3.1068-5.9385-3.5751-4.7575-0.11223-6.858 1.0074c-2.1004 1.1196-3.7473 2.9334-4.6595 5.1318-0.91222 2.1984-1.0333 4.6453-0.34259 6.9231 0.69073 2.2777 2.1505 4.2453 4.1301 5.5667 1.9796 1.3215 4.3565 1.9151 6.725 1.6795s4.5819-1.2858 6.2624-2.9714c0.9643-0.9386 1.7275-2.0636 2.2433-3.3065 0.5157-1.243 0.7732-2.5779 0.7568-3.9235zm-5.0001 2.54c0.344 0.2396 0.6217 0.5625 0.807 0.9385 0.1854 0.376 0.2725 0.7928 0.253 1.2116v1.33c-0.7887 0.8354-1.7709 1.4639-2.86 1.83-1.2053 0.4836-2.4913 0.7347-3.79 0.7399-2.2438-0.046-4.3872-0.9391-6-2.5v-1.3999c-0.01361-0.4395 0.09632-0.8739 0.31729-1.254 0.22096-0.38 0.5441-0.6905 0.93271-0.8961 0.8787-0.5034 1.8775-0.7591 2.89-0.7399h4.84c0.9392-0.0381 1.8665 0.2208 2.65 0.7399zm-2.81-8.59c-0.2959-0.31606-0.6537-0.56791-1.0511-0.73993-0.3974-0.17203-0.8259-0.26055-1.2589-0.26007-0.4439-0.00473-0.8842 0.08156-1.2935 0.25355s-0.77911 0.42603-1.0865 0.74645c-0.31483 0.29483-0.56596 0.651-0.73794 1.0466-0.17198 0.39556-0.26117 0.82213-0.26206 1.2534-0.00132 0.44161 0.0847 0.87913 0.25309 1.2874 0.16838 0.40825 0.41582 0.77917 0.72808 1.0915 0.31227 0.3122 0.6832 0.5597 1.0915 0.7281 0.4082 0.1684 0.8457 0.2544 1.2873 0.253 0.4334 0.0029 0.8626-0.0845 1.2604-0.2566 0.3977-0.1722 0.7552-0.4254 1.0496-0.7434 0.3214-0.3066 0.5761-0.6762 0.7482-1.0857 0.172-0.40951 0.2578-0.85011 0.2518-1.2942 0.0048-0.42373-0.076-0.84405-0.2376-1.2358-0.1615-0.39177-0.4004-0.74692-0.7024-1.0442z" fill="#fff"/>
+</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
index 506c2a72bc..cb10cc5eef 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
@@ -48,9 +48,6 @@ Rectangle {
}
}
- height: 30
- width: 34
-
opacity: 0.7
onLevelChanged: {
@@ -67,13 +64,8 @@ Rectangle {
MouseArea {
id: mouseArea
-
- anchors {
- left: icon.left
- right: bar.right
- top: icon.top
- bottom: icon.bottom
- }
+
+ anchors.fill: parent
hoverEnabled: true
scrollGestureEnabled: false
@@ -109,9 +101,10 @@ Rectangle {
Item {
id: icon
anchors.verticalCenter: parent.verticalCenter
- anchors.left: parent.left
- width: parent.width - bar.width - bar.anchors.leftMargin
- height: parent.height
+ anchors.right: parent.horizontalCenter
+ anchors.rightMargin: 2
+ width: 13
+ height: 21
Item {
anchors.fill: parent
@@ -136,14 +129,12 @@ Rectangle {
Item {
id: bar
- anchors {
- left: icon.right
- leftMargin: 0
- verticalCenter: icon.verticalCenter
- }
+ anchors.verticalCenter: parent.verticalCenter
+ anchors.left: parent.horizontalCenter
+ anchors.leftMargin: 2
width: 4
- height: parent.height
+ height: 21
Rectangle { // base
id: baseBar
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-clip-i.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-clip-i.svg
index f912c1e744..8b694c7f3d 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-clip-i.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-clip-i.svg
@@ -1,10 +1,20 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.3383 4.13446L23.8713 5.60152C21.9374 3.46761 19.2033 2.06723 16.0691 2.06723C13.0683 2.06723 10.4009 3.40093 8.46707 5.40147L7 3.9344C9.26728 1.53375 12.5348 0 16.0691 0C19.7368 0 23.071 1.60044 25.3383 4.13446ZM21.9376 7.53584L20.4705 9.0029C19.4703 7.66921 17.8698 6.86899 16.0693 6.86899C14.4022 6.86899 12.9351 7.66921 11.8682 8.80285L10.4011 7.33578C11.8015 5.80203 13.802 4.80176 16.0693 4.80176C18.4033 4.80176 20.5372 5.86871 21.9376 7.53584ZM17.9575 30.1572C17.9575 31.1771 17.1307 32.0039 16.1108 32.0039C15.0909 32.0039 14.2642 31.1771 14.2642 30.1572C14.2642 29.1373 15.0909 28.3105 16.1108 28.3105C17.1307 28.3105 17.9575 29.1373 17.9575 30.1572ZM18.3632 11.0801H14.1597L15.0116 25.8539H17.4867L18.3632 11.0801Z" fill="#EA4C5F"/>
-</g>
-<defs>
-<clipPath id="clip0">
-<rect width="32" height="32" fill="white"/>
-</clipPath>
-</defs>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18.338" height="32" fill="none" version="1.1" viewBox="0 0 18.338 32" 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>
+ <g transform="translate(-7)" clip-path="url(#clip0)">
+ <path d="m25.338 4.1345-1.467 1.4671c-1.9339-2.1339-4.668-3.5343-7.8022-3.5343-3.0008 0-5.6682 1.3337-7.602 3.3342l-1.4671-1.4671c2.2673-2.4006 5.5348-3.9344 9.0691-3.9344 3.6677 0 7.0019 1.6004 9.2692 4.1345zm-3.4007 3.4014-1.4671 1.4671c-1.0002-1.3337-2.6007-2.1339-4.4012-2.1339-1.6671 0-3.1342 0.80022-4.2011 1.9339l-1.4671-1.4671c1.4004-1.5338 3.4009-2.534 5.6682-2.534 2.334 0 4.4679 1.067 5.8683 2.7341zm-3.9801 22.621c0 1.0199-0.8268 1.8467-1.8467 1.8467s-1.8466-0.8268-1.8466-1.8467 0.8267-1.8467 1.8466-1.8467 1.8467 0.8268 1.8467 1.8467zm0.4057-19.077h-4.2035l0.8519 14.774h2.4751z" clip-rule="evenodd" fill="#ea4c5f" fill-rule="evenodd"/>
+ </g>
+ <defs>
+ <clipPath id="clip0">
+ <rect width="32" height="32" fill="#fff"/>
+ </clipPath>
+ </defs>
+</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-gate-i.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-gate-i.svg
index 8255174532..ac70ce66cb 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-gate-i.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-gate-i.svg
@@ -1,3 +1,13 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M16.1999 4.72587C17.5049 4.72587 18.5628 3.66795 18.5628 2.36294C18.5628 1.05792 17.5049 0 16.1999 0C14.8948 0 13.8369 1.05792 13.8369 2.36294C13.8369 3.66795 14.8948 4.72587 16.1999 4.72587ZM18.6667 11.8004V14.7337H13.7334V11.8004C13.7334 10.467 14.8667 9.40039 16.2 9.40039C17.6 9.40039 18.6667 10.467 18.6667 11.8004ZM13.7334 20.1332V17.2666H18.6667V20.1332C18.6667 21.4665 17.5333 22.5332 16.2 22.5332C14.8667 22.5332 13.7334 21.4665 13.7334 20.1332ZM23.6665 20.6V17.0667C23.6665 16.4 23.0665 15.9334 22.4665 15.9334C21.7998 15.9334 21.3332 16.4667 21.3332 17.1333V20.6C21.3332 23.0666 19.0665 25.0666 16.3332 25.0666C13.5999 25.0666 11.3333 23.0666 11.3333 20.6V17.0667C11.3333 16.4 10.8666 15.8667 10.2666 15.8667C9.59999 15.8 9 16.2667 9 16.9333V20.6C9 23.9999 11.6666 26.7999 15.1333 27.3332V29.5998H12.2666C11.6 29.5998 11.0666 30.1332 11.0666 30.7998C11.0666 31.4665 11.6 31.9998 12.2666 31.9998H20.4665C21.1332 31.9998 21.6665 31.4665 21.6665 30.7998C21.6665 30.1332 21.1332 29.5998 20.4665 29.5998H17.5332V27.3332C20.9998 26.7332 23.6665 23.9999 23.6665 20.6Z" fill="#00B4EF" fill-opacity="0.7"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14.666" height="32" fill="none" version="1.1" viewBox="0 0 14.666 32" 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.1999 4.7259c1.305 0 2.3629-1.0579 2.3629-2.3629 0-1.305-1.0579-2.3629-2.3629-2.3629-1.3051 0-2.363 1.0579-2.363 2.3629 0 1.305 1.0579 2.3629 2.363 2.3629zm2.4668 7.0745v2.9333h-4.9333v-2.9333c0-1.3334 1.1333-2.4 2.4666-2.4 1.4 0 2.4667 1.0666 2.4667 2.4zm-4.9333 8.3328v-2.8666h4.9333v2.8666c0 1.3333-1.1334 2.4-2.4667 2.4s-2.4666-1.0667-2.4666-2.4zm9.9331 0.4668v-3.5333c0-0.6667-0.6-1.1333-1.2-1.1333-0.6667 0-1.1333 0.5333-1.1333 1.1999v3.4667c0 2.4666-2.2667 4.4666-5 4.4666s-4.9999-2-4.9999-4.4666v-3.5333c0-0.6667-0.4667-1.2-1.0667-1.2-0.66661-0.0667-1.2666 0.4-1.2666 1.0666v3.6667c0 3.3999 2.6666 6.1999 6.1333 6.7332v2.2666h-2.8667c-0.6666 0-1.2 0.5334-1.2 1.2 0 0.6667 0.5334 1.2 1.2 1.2h8.1999c0.6667 0 1.2-0.5333 1.2-1.2 0-0.6666-0.5333-1.2-1.2-1.2h-2.9333v-2.2666c3.4666-0.6 6.1333-3.3333 6.1333-6.7332z" clip-rule="evenodd" fill="#00b4ef" fill-opacity=".7" fill-rule="evenodd"/>
+</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-a.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-a.svg
index 67eafc27c8..eb36c2dd55 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-a.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-a.svg
@@ -1,3 +1,13 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.6441 4.13328L24.1775 5.59992C22.2442 3.46662 19.5109 2.06664 16.3776 2.06664C13.3776 2.06664 10.711 3.39995 8.77768 5.39993L7.31104 3.93328C9.57767 1.53331 12.8443 0 16.3776 0C20.0442 0 23.3775 1.59998 25.6441 4.13328ZM20.7777 9.00072L22.2444 7.53408C20.8444 5.86743 18.7111 4.80078 16.3778 4.80078C14.1111 4.80078 12.1112 5.80077 10.7112 7.33408L12.1778 8.80073C13.2445 7.66741 14.7111 6.86742 16.3778 6.86742C18.1777 6.86742 19.7777 7.66741 20.7777 9.00072ZM18.8803 12.0758V11.7496C18.8803 10.4445 17.7763 9.40039 16.4775 9.40039C15.1787 9.40039 14.0747 10.4445 14.0747 11.7496V16.2521L18.8803 12.0758ZM14.543 21.5129L12.6113 23.2103C13.4959 24.2599 14.9141 24.9311 16.4774 24.9311C19.14 24.9311 21.348 22.9735 21.348 20.559V17.1658C21.348 16.5132 21.8026 15.9912 22.452 15.9912C23.0364 15.9912 23.6209 16.448 23.6209 17.1005V20.559C23.6209 23.887 21.0233 26.6277 17.6464 27.1498V29.3684H20.5038C21.1532 29.3684 21.6727 29.8905 21.6727 30.543C21.6727 31.1956 21.1532 31.7176 20.5038 31.7176H12.5161C11.8667 31.7176 11.3471 31.1956 11.3471 30.543C11.3471 29.8905 11.8667 29.3684 12.5161 29.3684H15.3085V27.1498C13.5328 26.915 11.9589 26.0045 10.8771 24.7343L8.9443 26.4327C8.48972 26.8242 7.77537 26.759 7.38573 26.3022L7.25585 26.1717C6.8662 25.7149 6.93114 24.9971 7.38573 24.6056L23.8806 9.98853C24.3352 9.597 25.0495 9.66226 25.4392 10.119L25.5691 10.2495C25.9587 10.7716 25.8938 11.4241 25.5041 11.8809L18.8803 17.7015V20.1017C18.8803 21.4068 17.7763 22.4509 16.4775 22.4509C15.6689 22.4509 14.9744 22.0838 14.543 21.5129ZM10.5679 15.9919C11.1523 15.9919 11.6069 16.5139 11.6069 17.1664V18.4715L9.33398 20.4944V17.0359C9.39892 16.4486 9.91845 15.9266 10.5679 15.9919Z" fill="#EA4C5F"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18.831" height="31.718" fill="none" version="1.1" viewBox="0 0 18.831 31.718" 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="m18.644 4.1333-1.4666 1.4666c-1.9333-2.1333-4.6666-3.5333-7.7999-3.5333-3 0-5.6666 1.3333-7.5999 3.3333l-1.4666-1.4666c2.2666-2.4 5.5333-3.9333 9.0666-3.9333 3.6666 0 6.9999 1.6 9.2665 4.1333zm-4.8664 4.8674 1.4667-1.4666c-1.4-1.6666-3.5333-2.7333-5.8666-2.7333-2.2667 0-4.2666 0.99999-5.6666 2.5333l1.4666 1.4666c1.0667-1.1333 2.5333-1.9333 4.2-1.9333 1.7999 0 3.3999 0.79999 4.3999 2.1333zm-1.8974 3.0751v-0.3262c0-1.3051-1.104-2.3492-2.4028-2.3492-1.2988 0-2.4028 1.0441-2.4028 2.3492v4.5025zm-4.3373 9.4371-1.9317 1.6974c0.8846 1.0496 2.3028 1.7208 3.8661 1.7208 2.6626 0 4.8706-1.9576 4.8706-4.3721v-3.3932c0-0.6526 0.4546-1.1746 1.104-1.1746 0.5844 0 1.1689 0.4568 1.1689 1.1093v3.4585c0 3.328-2.5976 6.0687-5.9745 6.5908v2.2186h2.8574c0.6494 0 1.1689 0.5221 1.1689 1.1746 0 0.6526-0.5195 1.1746-1.1689 1.1746h-7.9877c-0.6494 0-1.169-0.522-1.169-1.1746 0-0.6525 0.5196-1.1746 1.169-1.1746h2.7924v-2.2186c-1.7757-0.2348-3.3496-1.1453-4.4314-2.4155l-1.9328 1.6984c-0.45458 0.3915-1.1689 0.3263-1.5586-0.1305l-0.12988-0.1305c-0.38965-0.4568-0.32471-1.1746 0.12988-1.5661l16.495-14.617c0.4546-0.39153 1.1689-0.32627 1.5586 0.13047l0.1299 0.1305c0.3896 0.5221 0.3247 1.1746-0.065 1.6314l-6.6238 5.8206v2.4002c0 1.3051-1.104 2.3492-2.4028 2.3492-0.8086 0-1.5031-0.3671-1.9345-0.938zm-3.9751-5.521c0.5844 0 1.039 0.522 1.039 1.1745v1.3051l-2.2729 2.0229v-3.4585c0.06494-0.5873 0.58447-1.1093 1.2339-1.044z" clip-rule="evenodd" fill="#ea4c5f" fill-rule="evenodd"/>
+</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-i.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-i.svg
index 63af1b0da8..ebca81f370 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-i.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-mute-i.svg
@@ -1,3 +1,13 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M25.6441 4.13328L24.1775 5.59992C22.2442 3.46662 19.5109 2.06664 16.3776 2.06664C13.3776 2.06664 10.711 3.39995 8.77768 5.39993L7.31104 3.93328C9.57767 1.53331 12.8443 0 16.3776 0C20.0442 0 23.3775 1.59998 25.6441 4.13328ZM20.7777 9.00072L22.2444 7.53408C20.8444 5.86743 18.7111 4.80078 16.3778 4.80078C14.1111 4.80078 12.1112 5.80077 10.7112 7.33408L12.1778 8.80073C13.2445 7.66741 14.7111 6.86742 16.3778 6.86742C18.1777 6.86742 19.7777 7.66741 20.7777 9.00072ZM18.8803 12.0758V11.7496C18.8803 10.4445 17.7763 9.40039 16.4775 9.40039C15.1787 9.40039 14.0747 10.4445 14.0747 11.7496V16.2521L18.8803 12.0758ZM14.543 21.5129L12.6113 23.2103C13.4959 24.2599 14.9141 24.9311 16.4774 24.9311C19.14 24.9311 21.348 22.9735 21.348 20.559V17.1658C21.348 16.5132 21.8026 15.9912 22.452 15.9912C23.0364 15.9912 23.6209 16.448 23.6209 17.1005V20.559C23.6209 23.887 21.0233 26.6277 17.6464 27.1498V29.3684H20.5038C21.1532 29.3684 21.6727 29.8905 21.6727 30.543C21.6727 31.1956 21.1532 31.7176 20.5038 31.7176H12.5161C11.8667 31.7176 11.3471 31.1956 11.3471 30.543C11.3471 29.8905 11.8667 29.3684 12.5161 29.3684H15.3085V27.1498C13.5328 26.915 11.9589 26.0045 10.8771 24.7343L8.9443 26.4327C8.48972 26.8242 7.77537 26.759 7.38573 26.3022L7.25585 26.1717C6.8662 25.7149 6.93114 24.9971 7.38573 24.6056L23.8806 9.98853C24.3352 9.597 25.0495 9.66226 25.4392 10.119L25.5691 10.2495C25.9587 10.7716 25.8938 11.4241 25.5041 11.8809L18.8803 17.7015V20.1017C18.8803 21.4068 17.7763 22.4509 16.4775 22.4509C15.6689 22.4509 14.9744 22.0838 14.543 21.5129ZM10.5679 15.9919C11.1523 15.9919 11.6069 16.5139 11.6069 17.1664V18.4715L9.33398 20.4944V17.0359C9.39893 16.4486 9.91845 15.9266 10.5679 15.9919Z" fill="#EA4C5F"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18.831" height="31.718" fill="none" version="1.1" viewBox="0 0 18.831 31.718" 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="m18.644 4.1333-1.4666 1.4666c-1.9333-2.1333-4.6666-3.5333-7.7999-3.5333-3 0-5.6666 1.3333-7.5999 3.3333l-1.4666-1.4666c2.2666-2.4 5.5333-3.9333 9.0666-3.9333 3.6666 0 6.9999 1.6 9.2665 4.1333zm-4.8664 4.8674 1.4667-1.4666c-1.4-1.6666-3.5333-2.7333-5.8666-2.7333-2.2667 0-4.2666 0.99999-5.6666 2.5333l1.4666 1.4666c1.0667-1.1333 2.5333-1.9333 4.2-1.9333 1.7999 0 3.3999 0.79999 4.3999 2.1333zm-1.8974 3.0751v-0.3262c0-1.3051-1.104-2.3492-2.4028-2.3492-1.2988 0-2.4028 1.0441-2.4028 2.3492v4.5025zm-4.3373 9.4371-1.9317 1.6974c0.8846 1.0496 2.3028 1.7208 3.8661 1.7208 2.6626 0 4.8706-1.9576 4.8706-4.3721v-3.3932c0-0.6526 0.4546-1.1746 1.104-1.1746 0.5844 0 1.1689 0.4568 1.1689 1.1093v3.4585c0 3.328-2.5976 6.0687-5.9745 6.5908v2.2186h2.8574c0.6494 0 1.1689 0.5221 1.1689 1.1746 0 0.6526-0.5195 1.1746-1.1689 1.1746h-7.9877c-0.6494 0-1.169-0.522-1.169-1.1746 0-0.6525 0.5196-1.1746 1.169-1.1746h2.7924v-2.2186c-1.7757-0.2348-3.3496-1.1453-4.4314-2.4155l-1.9328 1.6984c-0.45458 0.3915-1.1689 0.3263-1.5586-0.1305l-0.12988-0.1305c-0.38965-0.4568-0.32471-1.1746 0.12988-1.5661l16.495-14.617c0.4546-0.39153 1.1689-0.32627 1.5586 0.13047l0.1299 0.1305c0.3896 0.5221 0.3247 1.1746-0.065 1.6314l-6.6238 5.8206v2.4002c0 1.3051-1.104 2.3492-2.4028 2.3492-0.8086 0-1.5031-0.3671-1.9345-0.938zm-3.9751-5.521c0.5844 0 1.039 0.522 1.039 1.1745v1.3051l-2.2729 2.0229v-3.4585c0.06495-0.5873 0.58447-1.1093 1.2339-1.044z" clip-rule="evenodd" fill="#ea4c5f" fill-rule="evenodd"/>
+</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-a.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-a.svg
index e6df3c69d7..3ce7c0ca51 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-a.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-a.svg
@@ -1 +1,17 @@
-<svg id="Art" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50"><defs><style>.cls-1{fill-rule:evenodd;}</style></defs><title>mic-ptt-a</title><path class="cls-1" d="M34.52,10.09l-1.85,1.85a13.19,13.19,0,0,0-9.82-4.46,13.35,13.35,0,0,0-9.58,4.2L11.42,9.84a15.66,15.66,0,0,1,23.1.25Zm-6.13,6.13,1.85-1.85a9.62,9.62,0,0,0-14.53-.25L17.55,16a7.34,7.34,0,0,1,5.3-2.44A6.85,6.85,0,0,1,28.39,16.22ZM23,16a3.58,3.58,0,0,1,1.51.3,3.68,3.68,0,0,1,1.26.88,3.88,3.88,0,0,1,.84,1.3A3.94,3.94,0,0,1,26.9,20v5.07a1.91,1.91,0,0,1,.48-.05A3.93,3.93,0,0,1,30,26.07a3.38,3.38,0,0,1,1.5-.32,3.27,3.27,0,0,1,2.77,1.36,2.75,2.75,0,0,1,.85-.1,3.35,3.35,0,0,1,1.33.25,3.18,3.18,0,0,1,1.12.76,3.23,3.23,0,0,1,.73,1.13,3.32,3.32,0,0,1,.24,1.32v3.31a12.27,12.27,0,0,1-.43,3.41l-1.36,5.65a2.67,2.67,0,0,1-1,1.55A2.89,2.89,0,0,1,34,45H23a4.47,4.47,0,0,1-1.76-.43,3.88,3.88,0,0,1-1.36-1.12L14.1,35.7a3.72,3.72,0,0,1-.8-2.35,3.64,3.64,0,0,1,.28-1.5,3.75,3.75,0,0,1,.84-1.27,3.9,3.9,0,0,1,2.77-1.18,4.5,4.5,0,0,1,2,.54V19.88a4.06,4.06,0,0,1,1.13-2.78,3.74,3.74,0,0,1,1.25-.83A3.85,3.85,0,0,1,23,16Zm0,2a1.89,1.89,0,0,0-.74.12,2,2,0,0,0-1.06,1,1.92,1.92,0,0,0-.15.74V35.21l-2.32-3.06a2,2,0,0,0-.7-.59,1.88,1.88,0,0,0-.9-.2,1.85,1.85,0,0,0-.74.15,2,2,0,0,0-.63.43,2,2,0,0,0-.4.63,1.9,1.9,0,0,0-.13.74,2,2,0,0,0,.38,1.17l5.86,7.79a1.79,1.79,0,0,0,.68.57A1.74,1.74,0,0,0,23,43H34a1.23,1.23,0,0,0,.59-.15.88.88,0,0,0,.24-.23.71.71,0,0,0,.13-.31l1.37-5.6a12,12,0,0,0,.37-3V30.43a1.7,1.7,0,0,0-.43-1.07,1.31,1.31,0,0,0-.47-.37,1.35,1.35,0,0,0-.59-.11,1.46,1.46,0,0,0-.55.11,1.23,1.23,0,0,0-.46.32,1.64,1.64,0,0,0-.43,1.07h-.48v-1a1.52,1.52,0,0,0-.12-.66,1.61,1.61,0,0,0-.37-.56,1.63,1.63,0,0,0-1.22-.54,2,2,0,0,0-1.23.54,1.77,1.77,0,0,0-.36.53,1.57,1.57,0,0,0-.11.64v1h-.49V29a2.22,2.22,0,0,0-.58-1.44,1.71,1.71,0,0,0-.62-.44A1.88,1.88,0,0,0,27.4,27a2,2,0,0,0-.74.13,1.85,1.85,0,0,0-.63.41,2,2,0,0,0-.53,1.36v1.5h-.57V20a2,2,0,0,0-.54-1.44,1.75,1.75,0,0,0-.63-.44A1.73,1.73,0,0,0,23,18Z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Art" width="27.121" height="40.121" version="1.1" viewBox="0 0 27.121 40.121" 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>mic-ptt-a</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs>
+ <style>.cls-1{fill-rule:evenodd;}</style>
+ </defs>
+ <title>mic-ptt-a</title>
+ <path class="cls-1" d="m23.1 5.2112-1.85 1.85a13.19 13.19 0 0 0-9.82-4.46 13.35 13.35 0 0 0-9.58 4.2l-1.85-1.84a15.66 15.66 0 0 1 23.1 0.25zm-6.13 6.13 1.85-1.85a9.62 9.62 0 0 0-14.53-0.25l1.84 1.88a7.34 7.34 0 0 1 5.3-2.44 6.85 6.85 0 0 1 5.54 2.66zm-5.39-0.22a3.58 3.58 0 0 1 1.51 0.3 3.68 3.68 0 0 1 1.26 0.88 3.88 3.88 0 0 1 0.84 1.3 3.94 3.94 0 0 1 0.29 1.52v5.07a1.91 1.91 0 0 1 0.48-0.05 3.93 3.93 0 0 1 2.62 1.05 3.38 3.38 0 0 1 1.5-0.32 3.27 3.27 0 0 1 2.77 1.36 2.75 2.75 0 0 1 0.85-0.1 3.35 3.35 0 0 1 1.33 0.25 3.18 3.18 0 0 1 1.12 0.76 3.23 3.23 0 0 1 0.73 1.13 3.32 3.32 0 0 1 0.24 1.32v3.31a12.27 12.27 0 0 1-0.43 3.41l-1.36 5.65a2.67 2.67 0 0 1-1 1.55 2.89 2.89 0 0 1-1.75 0.61h-11a4.47 4.47 0 0 1-1.76-0.43 3.88 3.88 0 0 1-1.36-1.12l-5.78-7.75a3.72 3.72 0 0 1-0.8-2.35 3.64 3.64 0 0 1 0.28-1.5 3.75 3.75 0 0 1 0.84-1.27 3.9 3.9 0 0 1 2.77-1.18 4.5 4.5 0 0 1 2 0.54v-10.06a4.06 4.06 0 0 1 1.13-2.78 3.74 3.74 0 0 1 1.25-0.83 3.85 3.85 0 0 1 1.43-0.27zm0 2a1.89 1.89 0 0 0-0.74 0.12 2 2 0 0 0-1.06 1 1.92 1.92 0 0 0-0.15 0.74v15.35l-2.32-3.06a2 2 0 0 0-0.7-0.59 1.88 1.88 0 0 0-0.9-0.2 1.85 1.85 0 0 0-0.74 0.15 2 2 0 0 0-0.63 0.43 2 2 0 0 0-0.4 0.63 1.9 1.9 0 0 0-0.13 0.74 2 2 0 0 0 0.38 1.17l5.86 7.79a1.79 1.79 0 0 0 0.68 0.57 1.74 1.74 0 0 0 0.85 0.16h11a1.23 1.23 0 0 0 0.59-0.15 0.88 0.88 0 0 0 0.24-0.23 0.71 0.71 0 0 0 0.13-0.31l1.37-5.6a12 12 0 0 0 0.37-3v-3.28a1.7 1.7 0 0 0-0.43-1.07 1.31 1.31 0 0 0-0.47-0.37 1.35 1.35 0 0 0-0.59-0.11 1.46 1.46 0 0 0-0.55 0.11 1.23 1.23 0 0 0-0.46 0.32 1.64 1.64 0 0 0-0.43 1.07h-0.48v-1a1.52 1.52 0 0 0-0.12-0.66 1.61 1.61 0 0 0-0.37-0.56 1.63 1.63 0 0 0-1.22-0.54 2 2 0 0 0-1.23 0.54 1.77 1.77 0 0 0-0.36 0.53 1.57 1.57 0 0 0-0.11 0.64v1h-0.49v-1.33a2.22 2.22 0 0 0-0.58-1.44 1.71 1.71 0 0 0-0.62-0.44 1.88 1.88 0 0 0-0.79-0.12 2 2 0 0 0-0.74 0.13 1.85 1.85 0 0 0-0.63 0.41 2 2 0 0 0-0.53 1.36v1.5h-0.57v-10.4a2 2 0 0 0-0.54-1.44 1.75 1.75 0 0 0-0.63-0.44 1.73 1.73 0 0 0-0.76-0.12z" fill-rule="evenodd"/>
+</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-i.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-i.svg
index 2141ea5229..3bf1f1bf9e 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-i.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-ptt-i.svg
@@ -1,24 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
-<svg version="1.1" id="Art" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
- viewBox="0 0 50 50" style="enable-background:new 0 0 50 50;" xml:space="preserve">
+<svg id="Art" width="27.2" height="40.433" version="1.1" viewBox="0 0 27.2 40.433" xml:space="preserve" 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>
<style type="text/css">
.st0{fill:#FFFFFF;}
</style>
-<path class="st0" d="M16.7,13.2c-0.3,0.3-0.7,0.6-1,0.9l1.8,1.9c1.4-1.5,3.3-2.4,5.3-2.4c2.2,0,4.2,0.9,5.5,2.7l1.8-1.8
- C26.8,10.3,20.8,9.8,16.7,13.2z M32.7,11.9l1.9-1.9c-0.3-0.3-0.6-0.7-1-1c-6.3-5.9-16.2-5.6-22.1,0.7l1.9,1.8
- c2.5-2.6,5.9-4.2,9.6-4.2C26.6,7.5,30.2,9.1,32.7,11.9z M38.3,29.1c-0.2-0.4-0.4-0.8-0.7-1.1c-0.3-0.3-0.7-0.6-1.1-0.8
- C36,27.1,35.6,27,35.1,27c-0.3,0-0.6,0-0.8,0.1c-0.6-0.9-1.7-1.4-2.8-1.4c-0.5,0-1,0.1-1.5,0.3c-0.7-0.7-1.6-1-2.6-1.1
- c-0.2,0-0.3,0-0.5,0.1V20c0-0.5-0.1-1-0.3-1.5c-0.2-0.5-0.5-0.9-0.8-1.3c-0.4-0.4-0.8-0.7-1.3-0.9C24,16.1,23.5,16,23,16
- c-0.5,0-1,0.1-1.4,0.3c-0.5,0.2-0.9,0.5-1.3,0.8c-0.7,0.7-1.1,1.7-1.1,2.8v10.1c-0.6-0.3-1.3-0.5-2-0.5c-1,0-2,0.4-2.8,1.2
- c-0.4,0.4-0.6,0.8-0.8,1.3c-0.2,0.5-0.3,1-0.3,1.5c0,0.9,0.3,1.7,0.8,2.4l5.8,7.8c0.4,0.5,0.8,0.9,1.4,1.1c0.6,0.3,1.2,0.4,1.8,0.4
- h11c0.6,0,1.2-0.2,1.8-0.6c0.5-0.4,0.9-0.9,1-1.6l1.4-5.6c0.3-1.1,0.4-2.3,0.4-3.4v-3.3C38.6,30,38.5,29.6,38.3,29.1z M36.7,33.7
- c0,1-0.1,2-0.4,3L35,42.3c0,0.1-0.1,0.2-0.1,0.3c-0.1,0.1-0.1,0.2-0.2,0.2C34.4,42.9,34.2,43,34,43H23c-0.3,0-0.6,0-0.8-0.2
- c-0.3-0.1-0.5-0.3-0.7-0.6l-5.9-7.8c-0.2-0.3-0.4-0.7-0.4-1.2c0-0.3,0-0.5,0.1-0.7c0.1-0.2,0.2-0.4,0.4-0.6c0.2-0.2,0.4-0.3,0.6-0.4
- c0.2-0.1,0.5-0.2,0.7-0.2c0.3,0,0.6,0.1,0.9,0.2c0.3,0.1,0.5,0.3,0.7,0.6l2.3,3.1V19.9c0-0.3,0.1-0.5,0.2-0.7c0.2-0.5,0.6-0.8,1.1-1
- C22.5,18,22.7,18,23,18c0.3,0,0.5,0,0.8,0.1c0.2,0.1,0.5,0.2,0.6,0.4c0.4,0.4,0.6,0.9,0.5,1.4v10.4h0.6v-1.5c0-0.5,0.2-1,0.5-1.4
- c0.2-0.2,0.4-0.3,0.6-0.4c0.2-0.1,0.5-0.1,0.7-0.1c0.3,0,0.5,0,0.8,0.1c0.2,0.1,0.4,0.2,0.6,0.4c0.4,0.4,0.6,0.9,0.6,1.4v1.3h0.5v-1
- c0-0.2,0-0.4,0.1-0.6c0.1-0.2,0.2-0.4,0.4-0.5c0.3-0.3,0.8-0.5,1.2-0.5c0.5,0,0.9,0.2,1.2,0.5c0.2,0.2,0.3,0.3,0.4,0.6
- c0.1,0.2,0.1,0.4,0.1,0.7v1h0.5c0-0.4,0.2-0.8,0.4-1.1c0.1-0.1,0.3-0.3,0.5-0.3c0.2-0.1,0.4-0.1,0.6-0.1c0.2,0,0.4,0,0.6,0.1
- c0.2,0.1,0.3,0.2,0.5,0.4c0.3,0.3,0.4,0.7,0.4,1.1V33.7z"/>
+<path class="st0" d="m5.2 8.4327c-0.3 0.3-0.7 0.6-1 0.9l1.8 1.9c1.4-1.5 3.3-2.4 5.3-2.4 2.2 0 4.2 0.9 5.5 2.7l1.8-1.8c-3.3-4.2-9.3-4.7-13.4-1.3zm16-1.3 1.9-1.9c-0.3-0.3-0.6-0.7-1-1-6.3-5.9-16.2-5.6-22.1 0.7l1.9 1.8c2.5-2.6 5.9-4.2 9.6-4.2 3.6 0.2 7.2 1.8 9.7 4.6zm5.6 17.2c-0.2-0.4-0.4-0.8-0.7-1.1s-0.7-0.6-1.1-0.8c-0.5-0.1-0.9-0.2-1.4-0.2-0.3 0-0.6 0-0.8 0.1-0.6-0.9-1.7-1.4-2.8-1.4-0.5 0-1 0.1-1.5 0.3-0.7-0.7-1.6-1-2.6-1.1-0.2 0-0.3 0-0.5 0.1v-5c0-0.5-0.1-1-0.3-1.5s-0.5-0.9-0.8-1.3c-0.4-0.4-0.8-0.7-1.3-0.9s-1-0.3-1.5-0.3-1 0.1-1.4 0.3c-0.5 0.2-0.9 0.5-1.3 0.8-0.7 0.7-1.1 1.7-1.1 2.8v10.1c-0.6-0.3-1.3-0.5-2-0.5-1 0-2 0.4-2.8 1.2-0.4 0.4-0.6 0.8-0.8 1.3s-0.3 1-0.3 1.5c0 0.9 0.3 1.7 0.8 2.4l5.8 7.8c0.4 0.5 0.8 0.9 1.4 1.1 0.6 0.3 1.2 0.4 1.8 0.4h11c0.6 0 1.2-0.2 1.8-0.6 0.5-0.4 0.9-0.9 1-1.6l1.4-5.6c0.3-1.1 0.4-2.3 0.4-3.4v-3.3c-0.1-0.7-0.2-1.1-0.4-1.6zm-1.6 4.6c0 1-0.1 2-0.4 3l-1.3 5.6c0 0.1-0.1 0.2-0.1 0.3-0.1 0.1-0.1 0.2-0.2 0.2-0.3 0.1-0.5 0.2-0.7 0.2h-11c-0.3 0-0.6 0-0.8-0.2-0.3-0.1-0.5-0.3-0.7-0.6l-5.9-7.8c-0.2-0.3-0.4-0.7-0.4-1.2 0-0.3 0-0.5 0.1-0.7s0.2-0.4 0.4-0.6 0.4-0.3 0.6-0.4 0.5-0.2 0.7-0.2c0.3 0 0.6 0.1 0.9 0.2s0.5 0.3 0.7 0.6l2.3 3.1v-15.3c0-0.3 0.1-0.5 0.2-0.7 0.2-0.5 0.6-0.8 1.1-1 0.3-0.2 0.5-0.2 0.8-0.2s0.5 0 0.8 0.1c0.2 0.1 0.5 0.2 0.6 0.4 0.4 0.4 0.6 0.9 0.5 1.4v10.4h0.6v-1.5c0-0.5 0.2-1 0.5-1.4 0.2-0.2 0.4-0.3 0.6-0.4s0.5-0.1 0.7-0.1c0.3 0 0.5 0 0.8 0.1 0.2 0.1 0.4 0.2 0.6 0.4 0.4 0.4 0.6 0.9 0.6 1.4v1.3h0.5v-1c0-0.2 0-0.4 0.1-0.6s0.2-0.4 0.4-0.5c0.3-0.3 0.8-0.5 1.2-0.5 0.5 0 0.9 0.2 1.2 0.5 0.2 0.2 0.3 0.3 0.4 0.6 0.1 0.2 0.1 0.4 0.1 0.7v1h0.5c0-0.4 0.2-0.8 0.4-1.1 0.1-0.1 0.3-0.3 0.5-0.3 0.2-0.1 0.4-0.1 0.6-0.1s0.4 0 0.6 0.1 0.3 0.2 0.5 0.4c0.3 0.3 0.4 0.7 0.4 1.1z" fill="#fff"/>
</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-a.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-a.svg
index 0bf7677017..0bd0b0c238 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-a.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-a.svg
@@ -1,3 +1,57 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M23.8664 5.59992L25.3331 4.13328C23.0664 1.59998 19.7332 0 16.0665 0C12.5333 0 9.26664 1.53331 7 3.93328L8.46665 5.39993C10.4 3.39995 13.0666 2.06664 16.0665 2.06664C19.1998 2.06664 21.9331 3.46662 23.8664 5.59992ZM20.4664 8.99975L21.9331 7.5331C20.5331 5.86646 18.3998 4.7998 16.0665 4.7998C13.7999 4.7998 11.7999 5.79979 10.3999 7.3331L11.8665 8.79975C12.9332 7.66643 14.3998 6.86644 16.0665 6.86644C17.8665 6.86644 19.4664 7.66643 20.4664 8.99975ZM18.5334 11.8004V14.7337H13.6001V11.8004C13.6001 10.467 14.7334 9.40039 16.0667 9.40039C17.4667 9.40039 18.5334 10.467 18.5334 11.8004ZM13.6001 17.2666V20.1332C13.6001 21.4665 14.7334 22.5332 16.0667 22.5332C17.4 22.5332 18.5334 21.4665 18.5334 20.1332V17.2666H13.6001ZM23.5332 17.0667V20.6C23.5332 23.9999 20.8665 26.7332 17.3999 27.3332V29.5998H20.3332C20.9999 29.5998 21.5332 30.1332 21.5332 30.7998C21.5332 31.4665 20.9999 31.9998 20.3332 31.9998H12.1333C11.4667 31.9998 10.9333 31.4665 10.9333 30.7998C10.9333 30.1332 11.4667 29.5998 12.1333 29.5998H14.9999V27.3332C11.5333 26.7999 8.8667 23.9999 8.8667 20.6V16.9333C8.8667 16.2667 9.46669 15.8 10.1333 15.8667C10.7333 15.8667 11.2 16.4 11.2 17.0667V20.6C11.2 23.0666 13.4666 25.0666 16.1999 25.0666C18.9332 25.0666 21.1999 23.0666 21.1999 20.6V17.1333C21.1999 16.4667 21.6665 15.9334 22.3332 15.9334C22.9332 15.9334 23.5332 16.4 23.5332 17.0667Z" fill="white"/>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="18.333099"
+ height="31.9998"
+ viewBox="0 0 18.333099 31.9998"
+ version="1.1"
+ id="svg4"
+ sodipodi:docname="mic-unmute-a.svg"
+ style="fill:none"
+ inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+ <metadata
+ id="metadata10">
+ <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></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <defs
+ id="defs8" />
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="2560"
+ inkscape:window-height="1377"
+ id="namedview6"
+ showgrid="false"
+ inkscape:zoom="7.375"
+ inkscape:cx="9"
+ inkscape:cy="15.9998"
+ inkscape:window-x="2552"
+ inkscape:window-y="-8"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg4" />
+ <path
+ d="M 16.8664,5.59992 18.3331,4.13328 C 16.0664,1.59998 12.7332,0 9.0665,0 5.5333,0 2.26664,1.53331 0,3.93328 L 1.46665,5.39993 C 3.4,3.39995 6.0666,2.06664 9.0665,2.06664 c 3.1333,0 5.8666,1.39998 7.7999,3.53328 z m -3.4,3.39983 1.4667,-1.46665 c -1.4,-1.66664 -3.5333,-2.7333 -5.8666,-2.7333 -2.2666,0 -4.2666,0.99999 -5.6666,2.5333 l 1.4666,1.46665 c 1.0667,-1.13332 2.5333,-1.93331 4.2,-1.93331 1.8,0 3.3999,0.79999 4.3999,2.13331 z m -1.933,2.80065 v 2.9333 H 6.6001 v -2.9333 c 0,-1.3334 1.1333,-2.40001 2.4666,-2.40001 1.4,0 2.4667,1.06661 2.4667,2.40001 z m -4.9333,5.4662 v 2.8666 c 0,1.3333 1.1333,2.4 2.4666,2.4 1.3333,0 2.4667,-1.0667 2.4667,-2.4 v -2.8666 z m 9.9331,-0.1999 V 20.6 c 0,3.3999 -2.6667,6.1332 -6.1333,6.7332 v 2.2666 h 2.9333 c 0.6667,0 1.2,0.5334 1.2,1.2 0,0.6667 -0.5333,1.2 -1.2,1.2 H 5.1333 c -0.6666,0 -1.2,-0.5333 -1.2,-1.2 0,-0.6666 0.5334,-1.2 1.2,-1.2 H 7.9999 V 27.3332 C 4.5333,26.7999 1.8667,23.9999 1.8667,20.6 v -3.6667 c 0,-0.6666 0.59999,-1.1333 1.2666,-1.0666 0.6,0 1.0667,0.5333 1.0667,1.2 V 20.6 c 0,2.4666 2.2666,4.4666 4.9999,4.4666 2.7333,0 5,-2 5,-4.4666 v -3.4667 c 0,-0.6666 0.4666,-1.1999 1.1333,-1.1999 0.6,0 1.2,0.4666 1.2,1.1333 z"
+ id="path2"
+ inkscape:connector-curvature="0"
+ style="clip-rule:evenodd;fill:#ffffff;fill-rule:evenodd" />
</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-i.svg b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-i.svg
index 0bf7677017..121873dd1b 100644
--- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-i.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/images/mic-unmute-i.svg
@@ -1,3 +1,13 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M23.8664 5.59992L25.3331 4.13328C23.0664 1.59998 19.7332 0 16.0665 0C12.5333 0 9.26664 1.53331 7 3.93328L8.46665 5.39993C10.4 3.39995 13.0666 2.06664 16.0665 2.06664C19.1998 2.06664 21.9331 3.46662 23.8664 5.59992ZM20.4664 8.99975L21.9331 7.5331C20.5331 5.86646 18.3998 4.7998 16.0665 4.7998C13.7999 4.7998 11.7999 5.79979 10.3999 7.3331L11.8665 8.79975C12.9332 7.66643 14.3998 6.86644 16.0665 6.86644C17.8665 6.86644 19.4664 7.66643 20.4664 8.99975ZM18.5334 11.8004V14.7337H13.6001V11.8004C13.6001 10.467 14.7334 9.40039 16.0667 9.40039C17.4667 9.40039 18.5334 10.467 18.5334 11.8004ZM13.6001 17.2666V20.1332C13.6001 21.4665 14.7334 22.5332 16.0667 22.5332C17.4 22.5332 18.5334 21.4665 18.5334 20.1332V17.2666H13.6001ZM23.5332 17.0667V20.6C23.5332 23.9999 20.8665 26.7332 17.3999 27.3332V29.5998H20.3332C20.9999 29.5998 21.5332 30.1332 21.5332 30.7998C21.5332 31.4665 20.9999 31.9998 20.3332 31.9998H12.1333C11.4667 31.9998 10.9333 31.4665 10.9333 30.7998C10.9333 30.1332 11.4667 29.5998 12.1333 29.5998H14.9999V27.3332C11.5333 26.7999 8.8667 23.9999 8.8667 20.6V16.9333C8.8667 16.2667 9.46669 15.8 10.1333 15.8667C10.7333 15.8667 11.2 16.4 11.2 17.0667V20.6C11.2 23.0666 13.4666 25.0666 16.1999 25.0666C18.9332 25.0666 21.1999 23.0666 21.1999 20.6V17.1333C21.1999 16.4667 21.6665 15.9334 22.3332 15.9334C22.9332 15.9334 23.5332 16.4 23.5332 17.0667Z" fill="white"/>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18.333" height="32" fill="none" version="1.1" viewBox="0 0 18.333 32" 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="m16.866 5.5999 1.4667-1.4666c-2.2667-2.5333-5.5999-4.1333-9.2666-4.1333-3.5332 0-6.7999 1.5333-9.0665 3.9333l1.4666 1.4666c1.9334-2 4.6-3.3333 7.5998-3.3333 3.1333 0 5.8666 1.4 7.7999 3.5333zm-3.4 3.3998 1.4667-1.4666c-1.4-1.6666-3.5333-2.7333-5.8666-2.7333-2.2666 0-4.2666 0.99999-5.6666 2.5333l1.4666 1.4666c1.0667-1.1333 2.5333-1.9333 4.2-1.9333 1.8 0 3.3999 0.79999 4.3999 2.1333zm-1.933 2.8006v2.9333h-4.9333v-2.9333c0-1.3334 1.1333-2.4 2.4666-2.4 1.4 0 2.4667 1.0666 2.4667 2.4zm-4.9333 5.4662v2.8666c0 1.3333 1.1333 2.4 2.4666 2.4s2.4667-1.0667 2.4667-2.4v-2.8666zm9.9331-0.1999v3.5333c0 3.3999-2.6667 6.1332-6.1333 6.7332v2.2666h2.9333c0.6667 0 1.2 0.5334 1.2 1.2 0 0.6667-0.5333 1.2-1.2 1.2h-8.1999c-0.6666 0-1.2-0.5333-1.2-1.2 0-0.6666 0.5334-1.2 1.2-1.2h2.8666v-2.2666c-3.4666-0.5333-6.1332-3.3333-6.1332-6.7332v-3.6667c0-0.6666 0.59999-1.1333 1.2666-1.0666 0.6 0 1.0667 0.5333 1.0667 1.2v3.5333c0 2.4666 2.2666 4.4666 4.9999 4.4666s5-2 5-4.4666v-3.4667c0-0.6666 0.4666-1.1999 1.1333-1.1999 0.6 0 1.2 0.4666 1.2 1.1333z" clip-rule="evenodd" fill="#fff" fill-rule="evenodd"/>
+</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
index be8ff3f2c3..6622da33d9 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
@@ -122,21 +122,14 @@ Rectangle {
width: 48
height: width
- AnimatedImage {
- visible: avatarButtonImage.source === ""
- anchors.centerIn: parent
- width: parent.width - 10
- height: width
- source: "../images/loading.gif"
- }
-
Image {
id: avatarButtonImage
- visible: source !== ""
- source: ""
+ source: "./images/defaultAvatar.svg"
anchors.centerIn: parent
- width: parent.width - 10
+ width: 32
height: width
+ sourceSize.width: width
+ sourceSize.height: height
mipmap: true
fillMode: Image.PreserveAspectCrop
layer.enabled: true
@@ -194,7 +187,9 @@ Rectangle {
id: inputDeviceButton
anchors.verticalCenter: parent.verticalCenter
anchors.left: avatarButtonContainer.right
- anchors.leftMargin: 8
+ anchors.leftMargin: 6
+ width: 32
+ height: width
}
@@ -202,8 +197,8 @@ Rectangle {
id: outputDeviceButtonContainer
anchors.verticalCenter: parent.verticalCenter
anchors.left: inputDeviceButton.right
- anchors.leftMargin: 24
- width: 30
+ anchors.leftMargin: 2
+ width: 32
height: width
Image {
@@ -252,13 +247,13 @@ Rectangle {
id: hmdButtonContainer
anchors.verticalCenter: parent.verticalCenter
anchors.right: settingsButtonContainer.left
- anchors.rightMargin: 8
- width: 48
+ anchors.rightMargin: 14
+ width: 32
height: width
Image {
id: displayModeImage
- source: HMD.active ? "./images/vrMode.svg" : "./images/desktopMode.svg"
+ source: HMD.active ? "./images/desktopMode.svg" : "./images/vrMode.svg"
anchors.centerIn: parent
width: 29
height: 16
@@ -295,7 +290,7 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right
anchors.rightMargin: 16
- width: 48
+ width: 32
height: width
Image {
@@ -340,6 +335,9 @@ Rectangle {
downloadUrl = topBarInventoryModel.get(i).download_url;
previewUrl = topBarInventoryModel.get(i).preview;
if (MyAvatar.skeletonModelURL === downloadUrl) {
+ if (previewUrl.indexOf("missing.png") > -1) {
+ previewUrl = "../images/defaultAvatar.svg";
+ }
avatarButtonImage.source = previewUrl;
return;
}
@@ -354,7 +352,11 @@ Rectangle {
switch (message.method) {
case "updateAvatarThumbnailURL":
- avatarButtonImage.source = message.data.avatarThumbnailURL;
+ if (message.data.avatarThumbnailURL.indexOf("defaultAvatar.svg") > -1) {
+ avatarButtonImage.source = "../images/defaultAvatar.svg";
+ } else {
+ avatarButtonImage.source = message.data.avatarThumbnailURL;
+ }
break;
case "updateOutputMuted":
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/images/defaultAvatar.jpg b/interface/resources/qml/hifi/simplifiedUI/topBar/images/defaultAvatar.jpg
deleted file mode 100644
index 821be6c584d86455df30a882481ae210048bb294..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 36764
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
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/images/outputDeviceLoud.svg b/interface/resources/qml/hifi/simplifiedUI/topBar/images/outputDeviceLoud.svg
index 987f6eecdf..ebd844c471 100644
--- a/interface/resources/qml/hifi/simplifiedUI/topBar/images/outputDeviceLoud.svg
+++ b/interface/resources/qml/hifi/simplifiedUI/topBar/images/outputDeviceLoud.svg
@@ -1,13 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="15.629" height="26.476" fill="none" version="1.1" viewBox="0 0 15.629 26.476" 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="m10.341 1.0357c0.3782-0.48138 0.9083-0.82052 1.5039-0.96216 0.5956-0.14164 1.2216-0.07743 1.7761 0.18216 0.6142 0.17933 1.1481 0.56434 1.5122 1.0905 0.3641 0.52616 0.5363 1.1615 0.4878 1.7995v0.55001 1.41c0 0.58-0.05 1.18-0.08 1.83s0 1.3 0 2v14.34c0.0746 0.634-0.0599 1.2749-0.383 1.8255-0.3231 0.5505-0.8172 0.9805-1.407 1.2245-0.3071 0.0833-0.6223 0.1336-0.94 0.15-0.4473 0.0083-0.8906-0.0856-1.2961-0.2745-0.4055-0.1888-0.7625-0.4678-1.0439-0.8155-2-2.19-3.39-3.7-4.22-4.53-0.07888-0.0913-0.17528-0.1657-0.28351-0.219-0.10822-0.0532-0.22607-0.0842-0.34649-0.091h-1.33c-0.5977 0.0074-1.1954-0.0194-1.79-0.08-0.33315-0.0238-0.6578-0.116-0.95373-0.2708-0.29594-0.1549-0.55679-0.3691-0.76624-0.6292-0.45471-0.5112-0.72881-1.1577-0.78003-1.84v-8.82c-0.010075-0.39268 0.068268-0.7826 0.22925-1.1409 0.16098-0.35831 0.40047-0.67584 0.70074-0.92909 0.627-0.54844 1.4373-0.84114 2.27-0.82001h2.42c0.12092-0.00919 0.23886-0.04218 0.34698-0.09709 0.10812-0.05492 0.20428-0.13068 0.28302-0.2229 0.97334-1.12 2.3367-2.6733 4.09-4.66zm-1.1 5.86c-0.36 0.37-0.91001 1-1.64 1.8-0.21506 0.26203-0.52331 0.4305-0.85999 0.47h-3.83v8.28h3.91c0.11347-5e-3 0.22682 0.0127 0.33331 0.0522s0.20395 0.1 0.28668 0.1778l2.11 2.35c0.21717 0.2771 0.45449 0.5378 0.70999 0.78l1 1.09c0.1508 0.1381 0.2821 0.2962 0.39 0.47l0.47 0.47 0.31 0.55v-20.24l-1.17 1.41c-0.92 1.04-1.55 1.78-2.02 2.34z" fill="#000"/>
-</svg>
+<svg width="37" height="30" viewBox="0 0 37 30" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.3409 3.26221C10.7191 2.78082 11.2492 2.44169 11.8448 2.30005C12.4404 2.15841 13.0664 2.22262 13.6209 2.48221C14.2351 2.66154 14.769 3.04655 15.1331 3.57271C15.4972 4.09887 15.6694 4.73419 15.6209 5.37221V5.92221C15.6209 6.28221 15.6209 6.75222 15.6209 7.33222C15.6209 7.91222 15.5709 8.51222 15.5409 9.16222C15.5109 9.81222 15.5409 10.4622 15.5409 11.1622V25.5022C15.6155 26.1362 15.481 26.7772 15.1579 27.3277C14.8348 27.8783 14.3407 28.3082 13.7509 28.5522C13.4438 28.6355 13.1286 28.6858 12.8109 28.7022C12.3636 28.7105 11.9203 28.6167 11.5148 28.4278C11.1093 28.2389 10.7523 27.96 10.4709 27.6122C8.47089 25.4222 7.08086 23.9122 6.25086 23.0822C6.17198 22.991 6.07558 22.9165 5.96735 22.8632C5.85913 22.81 5.74128 22.779 5.62086 22.7722H4.2909C3.6932 22.7796 3.09552 22.7529 2.50086 22.6922C2.16771 22.6685 1.84306 22.5763 1.54713 22.4214C1.25119 22.2666 0.990343 22.0524 0.780891 21.7922C0.326177 21.281 0.052082 20.6345 0.000862083 19.9522V11.1322C-0.0092129 10.7395 0.0691302 10.3496 0.23011 9.99131C0.39109 9.633 0.630579 9.31546 0.930855 9.06221C1.55785 8.51378 2.36813 8.22108 3.20087 8.24221H5.62086C5.74178 8.23302 5.85972 8.20003 5.96784 8.14511C6.07596 8.0902 6.17212 8.01444 6.25086 7.92221C7.2242 6.80221 8.58756 5.24888 10.3409 3.26221ZM9.24091 9.12221C8.88091 9.49221 8.3309 10.1222 7.6009 10.9222C7.38584 11.1843 7.07759 11.3527 6.74091 11.3922H2.9109V19.6722H6.82087C6.93434 19.6672 7.04769 19.6849 7.15418 19.7244C7.26067 19.7639 7.35813 19.8244 7.44086 19.9022L9.55091 22.2522C9.76808 22.5293 10.0054 22.79 10.2609 23.0322L11.2609 24.1222C11.4117 24.2603 11.543 24.4185 11.6509 24.5922L12.1209 25.0622L12.4309 25.6122V5.37221L11.2609 6.78221C10.3409 7.82221 9.71091 8.56221 9.24091 9.12221ZM15.5709 19.9022C15.1686 19.8681 14.7831 19.7255 14.4555 19.4895C14.1279 19.2535 13.8706 18.933 13.7109 18.5622C13.2004 17.571 12.9341 16.4722 12.9341 15.3572C12.9341 14.2423 13.2004 13.1434 13.7109 12.1522C13.853 11.7695 14.1087 11.4394 14.4439 11.2062C14.7791 10.9731 15.1776 10.8482 15.5859 10.8482C15.9942 10.8482 16.3927 10.9731 16.7279 11.2062C17.063 11.4394 17.3188 11.7695 17.4609 12.1522C17.9795 13.1409 18.2504 14.2407 18.2504 15.3572C18.2504 16.4737 17.9795 17.5735 17.4609 18.5622C17.3007 18.9386 17.0393 19.2631 16.7056 19.4997C16.3719 19.7363 15.9791 19.8756 15.5709 19.9022V19.9022ZM20.1809 9.67221C20.0232 9.34642 19.9922 8.97366 20.0938 8.62628C20.1954 8.2789 20.4225 7.98166 20.7309 7.79221C20.9097 7.6647 21.116 7.58107 21.3332 7.54807C21.5503 7.51506 21.7723 7.5336 21.9809 7.60221C22.201 7.65794 22.4027 7.77035 22.5659 7.92826C22.729 8.08616 22.848 8.28405 22.9109 8.50222C23.5341 10.0827 23.9541 11.7359 24.1609 13.4222C24.4946 16.4726 24.0934 19.5585 22.9909 22.4222C22.9088 22.6526 22.7764 22.8618 22.6035 23.0348C22.4305 23.2077 22.2213 23.3401 21.9909 23.4222C21.7492 23.4972 21.4921 23.508 21.2449 23.4537C20.9977 23.3993 20.7689 23.2817 20.5809 23.1122C20.3488 22.8991 20.1871 22.6204 20.1174 22.3131C20.0477 22.0058 20.0733 21.6846 20.1909 21.3922C20.5106 20.4732 20.7711 19.5346 20.9709 18.5822C20.9709 18.2122 21.0909 17.6922 21.1709 17.0122C21.2509 16.3322 21.3109 15.8422 21.3609 15.5322C21.2593 13.5313 20.8616 11.5565 20.1809 9.67221V9.67221ZM28.3809 25.2222C28.2965 25.5742 28.0975 25.8881 27.815 26.1144C27.5326 26.3408 27.1828 26.4666 26.8209 26.4722C26.6016 26.4666 26.3863 26.4119 26.1909 26.3122C25.9795 26.2513 25.7853 26.1419 25.6238 25.9925C25.4624 25.8432 25.3381 25.6582 25.2609 25.4522C25.1546 25.2324 25.0994 24.9914 25.0994 24.7472C25.0994 24.503 25.1546 24.262 25.2609 24.0422C26.4984 21.187 27.0859 18.0923 26.9809 14.9822C26.9255 12.238 26.3697 9.52691 25.3409 6.98221C25.2351 6.82532 25.1612 6.6491 25.1235 6.46364C25.0859 6.27818 25.0851 6.08712 25.1213 5.90137C25.1576 5.71562 25.23 5.53884 25.3346 5.38112C25.4392 5.2234 25.5739 5.08785 25.7309 4.98221C25.9286 4.805 26.1694 4.68303 26.4293 4.6286C26.6891 4.57418 26.9587 4.58922 27.2109 4.67221C27.4619 4.71235 27.6968 4.82153 27.8893 4.98754C28.0818 5.15354 28.2243 5.36984 28.3009 5.61222C29.0763 7.5246 29.6526 9.51174 30.0209 11.5422C30.1309 12.7922 30.2009 13.7122 30.2609 14.2822C30.3208 14.4841 30.3577 14.6921 30.3709 14.9022C30.3828 15.112 30.3828 15.3224 30.3709 15.5322C30.3318 18.8596 29.6563 22.1487 28.3809 25.2222ZM33.0709 29.1222C34.4616 26.5692 35.4499 23.8168 36.0009 20.9622C36.6094 17.6609 36.6635 14.2813 36.1609 10.9622C35.6869 7.39499 34.5145 3.95616 32.7109 0.842212C32.6296 0.647428 32.5043 0.474075 32.345 0.335666C32.1856 0.197256 31.9964 0.0975397 31.7922 0.0442991C31.5879 -0.0089415 31.3741 -0.0142696 31.1675 0.0287351C30.9608 0.0717399 30.767 0.161905 30.6009 0.292209C30.2413 0.497258 29.9758 0.83449 29.8609 1.23221C29.7942 1.42785 29.7766 1.63691 29.8097 1.84095C29.8428 2.04498 29.9257 2.23774 30.0509 2.40221C31.6624 5.19518 32.712 8.27635 33.1409 11.4722C33.5858 14.4122 33.5453 17.4053 33.0209 20.3322C32.5565 22.8758 31.6602 25.321 30.3709 27.5622C30.2678 27.7371 30.2038 27.9322 30.1831 28.1341C30.1623 28.336 30.1855 28.54 30.2509 28.7322C30.3063 28.9299 30.4002 29.1147 30.5272 29.276C30.6542 29.4373 30.8118 29.5719 30.9909 29.6722C31.2239 29.8212 31.4943 29.901 31.7709 29.9022C32.0352 29.8898 32.2922 29.8121 32.5191 29.676C32.746 29.5398 32.9356 29.3496 33.0709 29.1222Z" fill="black"/>
+</svg>
diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/images/updatedIcons.zip b/interface/resources/qml/hifi/simplifiedUI/topBar/images/updatedIcons.zip
deleted file mode 100644
index 205133e4c98e958659ebb6d1c8208e15eded01cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 7619
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
E0o-)w2mk;8
diff --git a/scripts/system/simplifiedUI/simplifiedUI.js b/scripts/system/simplifiedUI/simplifiedUI.js
index 3f22f376cf..c6181d2ad9 100644
--- a/scripts/system/simplifiedUI/simplifiedUI.js
+++ b/scripts/system/simplifiedUI/simplifiedUI.js
@@ -15,7 +15,6 @@
// START CONFIG OPTIONS
var DOCKED_QML_SUPPORTED = true;
-var REMOVE_EXISTING_UI = true;
var TOOLBAR_NAME = "com.highfidelity.interface.toolbar.system";
var DEFAULT_SCRIPTS_PATH_PREFIX = ScriptDiscoveryService.defaultScriptsPath + "/";
// END CONFIG OPTIONS
@@ -24,7 +23,7 @@ var DEFAULT_SCRIPTS_PATH_PREFIX = ScriptDiscoveryService.defaultScriptsPath + "/
var DEFAULT_SCRIPTS_SEPARATE = [
DEFAULT_SCRIPTS_PATH_PREFIX + "system/controllers/controllerScripts.js"
];
-function loadSeparateDefaults() {
+function loadNewSeparateDefaults() {
for (var i in DEFAULT_SCRIPTS_SEPARATE) {
Script.load(DEFAULT_SCRIPTS_SEPARATE[i]);
}
@@ -36,7 +35,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
DEFAULT_SCRIPTS_PATH_PREFIX + "system/progress.js",
DEFAULT_SCRIPTS_PATH_PREFIX + "system/away.js"
];
-function runDefaultsTogether() {
+function runNewDefaultsTogether() {
for (var i in DEFAULT_SCRIPTS_COMBINED) {
Script.include(DEFAULT_SCRIPTS_COMBINED[i]);
}
@@ -47,10 +46,13 @@ function runDefaultsTogether() {
// Until then, users are required to access some functionality from the top menu bar.
//var MENU_NAMES = ["File", "Edit", "Display", "View", "Navigate", "Settings", "Developer", "Help"];
var MENU_NAMES = ["File", "Edit", "View", "Navigate", "Help"];
-function removeDesktopMenu() {
- MENU_NAMES.forEach(function(menu) {
- Menu.removeMenu(menu);
- });
+var keepMenusSetting = Settings.getValue("simplifiedUI/keepMenus", false);
+function maybeRemoveDesktopMenu() {
+ if (!keepMenusSetting) {
+ MENU_NAMES.forEach(function(menu) {
+ Menu.removeMenu(menu);
+ });
+ }
}
@@ -436,18 +438,21 @@ function ensureFirstPersonCameraInHMD(isHMDMode) {
var simplifiedNametag = Script.require("../simplifiedNametag/simplifiedNametag.js");
var oldShowAudioTools;
var oldShowBubbleTools;
+var keepExistingUIAndScriptsSetting = Settings.getValue("simplifiedUI/keepExistingUIAndScripts", false);
function startup() {
- if (REMOVE_EXISTING_UI) {
+ maybeRemoveDesktopMenu();
+
+ if (!keepExistingUIAndScriptsSetting) {
pauseCurrentScripts();
- removeDesktopMenu();
- runDefaultsTogether();
- loadSeparateDefaults();
+ runNewDefaultsTogether();
+ loadNewSeparateDefaults();
if (!HMD.active) {
var toolbar = Toolbars.getToolbar(TOOLBAR_NAME);
toolbar.writeProperty("visible", false);
}
}
+
loadSimplifiedTopBar();
simplifiedNametag.create();
@@ -476,7 +481,7 @@ function restoreScripts() {
function shutdown() {
restoreScripts();
- if (REMOVE_EXISTING_UI) {
+ if (!keepExistingUIAndScriptsSetting) {
Window.confirm("You'll have to restart Interface to get full functionality back. Clicking yes or no will dismiss this dialog.");
if (!HMD.active) {