From fc6c4222e177c3146436f4f06a996dbde29635ec Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sun, 30 Apr 2017 19:15:04 +0300 Subject: [PATCH] support configuration of audio indicator --- containment/contents/config/main.xml | 3 +++ containment/contents/ui/main.qml | 1 + plasmoid/contents/ui/TaskDelegate.qml | 2 +- plasmoid/contents/ui/main.qml | 3 ++- shell/contents/configuration/TasksConfig.qml | 12 ++++++++++++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/containment/contents/config/main.xml b/containment/contents/config/main.xml index 2f63a0498..b61bd94e5 100644 --- a/containment/contents/config/main.xml +++ b/containment/contents/config/main.xml @@ -175,5 +175,8 @@ false + + true + diff --git a/containment/contents/ui/main.qml b/containment/contents/ui/main.qml index 3c1c30e69..43b1c9340 100644 --- a/containment/contents/ui/main.qml +++ b/containment/contents/ui/main.qml @@ -61,6 +61,7 @@ DragDrop.DropArea { property bool exposeAltSession: globalSettings ? globalSettings.exposeAltSession : false property bool immutable: plasmoid.immutable + property bool indicateAudioStreams: plasmoid.configuration.indicateAudioStreams property bool inStartup: true property bool isHorizontal: plasmoid.formFactor === PlasmaCore.Types.Horizontal property bool isVertical: !isHorizontal diff --git a/plasmoid/contents/ui/TaskDelegate.qml b/plasmoid/contents/ui/TaskDelegate.qml index 9c88eba6e..b6b19b0ed 100644 --- a/plasmoid/contents/ui/TaskDelegate.qml +++ b/plasmoid/contents/ui/TaskDelegate.qml @@ -138,7 +138,7 @@ MouseArea{ ////// Audio streams ////// property Item audioStreamOverlay property var audioStreams: [] - readonly property bool hasAudioStream: plasmoid.configuration.indicateAudioStreams && audioStreams.length > 0 + readonly property bool hasAudioStream: root.indicateAudioStreams && audioStreams.length > 0 readonly property bool playingAudio: hasAudioStream && audioStreams.some(function (item) { return !item.corked }) diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml index 9c841e25e..dc6526d72 100644 --- a/plasmoid/contents/ui/main.qml +++ b/plasmoid/contents/ui/main.qml @@ -131,6 +131,7 @@ Item { property bool dockIsHidden: latteDock ? latteDock.dockIsHidden : false property bool exposeAltSession: latteDock ? latteDock.exposeAltSession : false property bool highlightWindows: latteDock ? latteDock.highlightWindows: plasmoid.configuration.highlightWindows + property bool indicateAudioStreams: latteDock ? latteDock.indicateAudioStreams : plasmoid.configuration.indicateAudioStreams property bool reverseLinesPosition: latteDock ? latteDock.reverseLinesPosition : plasmoid.configuration.reverseLinesPosition property bool dotsOnActive: latteDock ? latteDock.dotsOnActive : plasmoid.configuration.dotsOnActive property bool showGlow: latteDock ? latteDock.showGlow : plasmoid.configuration.showGlow @@ -667,7 +668,7 @@ Item { Loader { id: pulseAudio source: "PulseAudio.qml" - active: plasmoid.configuration.indicateAudioStreams + active: root.indicateAudioStreams } /* IconsModel{ diff --git a/shell/contents/configuration/TasksConfig.qml b/shell/contents/configuration/TasksConfig.qml index 720e06ef3..595ed7ebc 100644 --- a/shell/contents/configuration/TasksConfig.qml +++ b/shell/contents/configuration/TasksConfig.qml @@ -149,6 +149,18 @@ PlasmaComponents.Page { } } + PlasmaComponents.CheckBox { + id: audioIndicatorChk + Layout.leftMargin: units.smallSpacing * 2 + text: i18n("Show indicator for audio streams") + checked: plasmoid.configuration.indicateAudioStreams +// tooltip: i18n("Show an audio indicator for the user to mute/unmute an app") + + onClicked: { + plasmoid.configuration.indicateAudioStreams = checked + } + } + RowLayout { Layout.leftMargin: units.smallSpacing * 2 visible: plasmoid.configuration.advanced