diff --git a/interface/resources/images/Audio-Loudness-Icons/vol-0.svg b/interface/resources/images/Audio-Loudness-Icons/vol-0.svg deleted file mode 100755 index 72f247c238..0000000000 --- a/interface/resources/images/Audio-Loudness-Icons/vol-0.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/interface/resources/images/Audio-Loudness-Icons/vol-1.svg b/interface/resources/images/Audio-Loudness-Icons/vol-1.svg deleted file mode 100755 index 9570b9ae6c..0000000000 --- a/interface/resources/images/Audio-Loudness-Icons/vol-1.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/interface/resources/images/Audio-Loudness-Icons/vol-2.svg b/interface/resources/images/Audio-Loudness-Icons/vol-2.svg deleted file mode 100755 index a2175be39e..0000000000 --- a/interface/resources/images/Audio-Loudness-Icons/vol-2.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - diff --git a/interface/resources/images/Audio-Loudness-Icons/vol-3.svg b/interface/resources/images/Audio-Loudness-Icons/vol-3.svg deleted file mode 100755 index 21b1095941..0000000000 --- a/interface/resources/images/Audio-Loudness-Icons/vol-3.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - diff --git a/interface/resources/images/Audio-Loudness-Icons/vol-4.svg b/interface/resources/images/Audio-Loudness-Icons/vol-4.svg deleted file mode 100755 index de0b4027eb..0000000000 --- a/interface/resources/images/Audio-Loudness-Icons/vol-4.svg +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index a7651e24d9..1db83a0223 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -214,13 +214,6 @@ Rectangle { movable: false resizable: false } - //TableViewColumn { - // role: "personalMute" - // title: "MUTE" - // width: actionButtonWidth - // movable: false - // resizable: false - //} TableViewColumn { role: "ignore" title: "IGNORE" @@ -283,12 +276,19 @@ Rectangle { // Anchors anchors.left: parent.left } - HifiControls.Button { + HifiControls.GlyphButton { + function getGlyph() { + var fileName = "vol_"; + if (model["personalMute"]) { + fileName += "x_"; + } + fileName += (4.0*(model ? model.avgAudioLevel : 0.0)).toFixed(0); + return hifi.glyphs[fileName]; + } id: avgAudioVolume visible: isAvgAudio + glyph: getGlyph() width: 32 - height: 32 - iconSource: getImage() anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter onClicked: { @@ -298,22 +298,6 @@ Rectangle { Users["personalMute"](model.sessionId, newValue) UserActivityLogger["palAction"](newValue ? "personalMute" : "un-personalMute", model.sessionId) } - HiFiGlyphs { - function getGlyph() { - var fileName = "vol-"; - if (model["personalMute"]) { - fileName += "x-"; - } - fileName += (4.0*(model ? model.avgAudioLevel : 0.0)).toFixed(0); - return hifi.glyphs[fileName]; - } - text: getGlyph() - size: parent.height*1.3 - anchors.fill: parent - horizontalAlignment: Text.AlignHCenter - color: enabled ? hifi.buttons.textColor[actionButton.color] - : hifi.buttons.disabledTextColor[actionButton.colorScheme] - } } // This CheckBox belongs in the columns that contain the stateful action buttons ("Mute" & "Ignore" for now) // KNOWN BUG with the Checkboxes: When clicking in the center of the sorting header, the checkbox diff --git a/interface/resources/qml/styles-uit/HifiConstants.qml b/interface/resources/qml/styles-uit/HifiConstants.qml index e261e2198f..031e80283e 100644 --- a/interface/resources/qml/styles-uit/HifiConstants.qml +++ b/interface/resources/qml/styles-uit/HifiConstants.qml @@ -318,5 +318,15 @@ Item { readonly property string deg: "\\" readonly property string px: "|" readonly property string editPencil: "\ue00d" + readonly property string vol_0: "\ue00e" + readonly property string vol_1: "\ue00f" + readonly property string vol_2: "\ue010" + readonly property string vol_3: "\ue011" + readonly property string vol_4: "\ue012" + readonly property string vol_x_0: "\ue013" + readonly property string vol_x_1: "\ue014" + readonly property string vol_x_2: "\ue015" + readonly property string vol_x_3: "\ue016" + readonly property string vol_x_4: "\ue017" } }