on xenial help sign in
On the PC platform (as opposed to running on $devices), use the "mute" action instead of silent mode

Approved by: Albert Astals Cid, Unity8 CI Bot

commit1951ac0f1960844186b32538ce075360313b4b3c authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 22 Sep 2016, 07:42 (10 years ago) parent300443370409eb
2 files changed+3−4
qml/Components/VolumeControl.qml+3−3 qml/Shell.qml−1
qml/Components/VolumeControl.qml+3−3
@@ -17,6 +17,7 @@
1717import QtQuick 2.4
1818import QMenuModel 0.1 as QMenuModel
1919import GlobalShortcut 1.0
20+import Unity.Platform 1.0
2021
2122Item {
2223 id: root
@@ -27,8 +28,6 @@ Item {
2728 readonly property int stepUp: 1
2829 readonly property int stepDown: -1
2930
30− property var indicators // passed from Shell.qml
31−
3231 GlobalShortcut {
3332 id: muteShortcut
3433 shortcut: Qt.Key_VolumeMute
@@ -42,7 +41,8 @@ Item {
4241 objectPath: "/com/canonical/indicator/sound"
4342
4443 property variant actionObject: action("volume")
45− property variant muteActionObject: indicators.indicatorsModel.profile === "desktop" ? action("mute") : action("silent-mode")
44+ // temporary workaround for lp:1623166
45+ property variant muteActionObject: Platform.isPC ? action("mute") : action("silent-mode")
4646 }
4747
4848 function volumeUp() {
qml/Shell.qml−1
@@ -215,7 +215,6 @@ StyledItem {
215215
216216 VolumeControl {
217217 id: volumeControl
218− indicators: panel.indicators
219218 }
220219
221220 DashCommunicator {