From 5b6ce8736d3a46c0f12a40aff572f048e8b7c971 Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Fri, 1 Mar 2019 11:28:00 -0800 Subject: [PATCH] adding new icons with gated icon --- .../icons/tablet-icons/mic-clip-i.svg | 5 ++- .../icons/tablet-icons/mic-gate-i.svg | 6 ++++ .../icons/tablet-icons/mic-mute-i.svg | 32 +++++-------------- .../icons/tablet-icons/mic-unmute-i.svg | 6 +++- .../qml/hifi/audio/MicBarApplication.qml | 3 +- 5 files changed, 25 insertions(+), 27 deletions(-) create mode 100644 interface/resources/icons/tablet-icons/mic-gate-i.svg diff --git a/interface/resources/icons/tablet-icons/mic-clip-i.svg b/interface/resources/icons/tablet-icons/mic-clip-i.svg index 8bc1b2b558..c1989db2d6 100644 --- a/interface/resources/icons/tablet-icons/mic-clip-i.svg +++ b/interface/resources/icons/tablet-icons/mic-clip-i.svg @@ -1,6 +1,9 @@ - + + + + diff --git a/interface/resources/icons/tablet-icons/mic-gate-i.svg b/interface/resources/icons/tablet-icons/mic-gate-i.svg new file mode 100644 index 0000000000..a5a5a621d7 --- /dev/null +++ b/interface/resources/icons/tablet-icons/mic-gate-i.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/interface/resources/icons/tablet-icons/mic-mute-i.svg b/interface/resources/icons/tablet-icons/mic-mute-i.svg index 9dc2c53443..0da394a5a2 100644 --- a/interface/resources/icons/tablet-icons/mic-mute-i.svg +++ b/interface/resources/icons/tablet-icons/mic-mute-i.svg @@ -1,25 +1,9 @@ - - - - - - - - - - - - - - - + + + + + + + + diff --git a/interface/resources/icons/tablet-icons/mic-unmute-i.svg b/interface/resources/icons/tablet-icons/mic-unmute-i.svg index f577a65bc2..ebfcc21e37 100644 --- a/interface/resources/icons/tablet-icons/mic-unmute-i.svg +++ b/interface/resources/icons/tablet-icons/mic-unmute-i.svg @@ -1,3 +1,7 @@ - + + + + + diff --git a/interface/resources/qml/hifi/audio/MicBarApplication.qml b/interface/resources/qml/hifi/audio/MicBarApplication.qml index 2bf49aa83b..30cef44bce 100644 --- a/interface/resources/qml/hifi/audio/MicBarApplication.qml +++ b/interface/resources/qml/hifi/audio/MicBarApplication.qml @@ -29,6 +29,7 @@ Rectangle { readonly property string unmutedIcon: "../../../icons/tablet-icons/mic-unmute-i.svg"; readonly property string mutedIcon: "../../../icons/tablet-icons/mic-mute-i.svg"; readonly property string clippingIcon: "../../../icons/tablet-icons/mic-clip-i.svg"; + readonly property string gatedIcon: "../../../icons/tablet-icons/mic-gate-i.svg"; property bool standalone: false; property var dragTarget: null; @@ -118,7 +119,7 @@ Rectangle { Item { Image { id: image; - source: muted ? mutedIcon : clipping ? clippingIcon : unmutedIcon; + source: muted ? mutedIcon : clipping ? clippingIcon : gated ? gatedIcon : unmutedIcon; width: 29; height: 32;