From 88198bb4245b560be61c7f07c388ed0edc287531 Mon Sep 17 00:00:00 2001
From: Bhushan Shah <bhush94@gmail.com>
Date: Tue, 17 Nov 2020 10:46:03 +0530
Subject: [PATCH] lockscreen: do not bind the shortcuts in lockscreen
 indicators

Otherwise we have screenlocker occupying the shortcut keys and they do
not work in the shell when we want to use regularly.

If screen is locked, the kglobalaccell will handle the volume keys
automatically by itself and we do not need to handle it in the
lockscreen.
---
 .../contents/lockscreen/indicators/Volume.qml | 98 -------------------
 1 file changed, 98 deletions(-)

diff --git a/look-and-feel/contents/lockscreen/indicators/Volume.qml b/look-and-feel/contents/lockscreen/indicators/Volume.qml
index 0283cebc..3da27213 100644
--- a/look-and-feel/contents/lockscreen/indicators/Volume.qml
+++ b/look-and-feel/contents/lockscreen/indicators/Volume.qml
@@ -64,69 +64,6 @@ PlasmaCore.IconItem {
         return output && output.name === dummyOutputName;
     }
 
-    function boundVolume(volume) {
-        return Math.max(PulseAudio.MinimalVolume, Math.min(volume, maxVolumeValue));
-    }
-
-    function volumePercent(volume, max){
-        if(!max) {
-            max = PulseAudio.NormalVolume;
-        }
-        return Math.round(volume / max * 100.0);
-    }
-
-    function playFeedback(sinkIndex) {
-        if(!volumeFeedback){
-            return;
-        }
-        if(sinkIndex == undefined) {
-            sinkIndex = paSinkModel.preferredSink.index;
-        }
-        feedback.play(sinkIndex)
-    }
-
-    function increaseVolume() {
-        if (!paSinkModel.preferredSink || isDummyOutput(paSinkModel.preferredSink)) {
-            return;
-        }
-
-        var volume = boundVolume(paSinkModel.preferredSink.volume + volumeStep);
-        var percent = volumePercent(volume, maxVolumeValue);
-        paSinkModel.preferredSink.muted = percent == 0;
-        paSinkModel.preferredSink.volume = volume;
-        osd.show(percent);
-        playFeedback();
-
-    }
-
-    function decreaseVolume() {
-        if (!paSinkModel.preferredSink || isDummyOutput(paSinkModel.preferredSink)) {
-            return;
-        }
-
-        var volume = boundVolume(paSinkModel.preferredSink.volume - volumeStep);
-        var percent = volumePercent(volume, maxVolumeValue);
-        paSinkModel.preferredSink.muted = percent == 0;
-        paSinkModel.preferredSink.volume = volume;
-        osd.show(percent);
-        playFeedback();
-    }
-
-
-
-    function muteVolume() {
-        if (!paSinkModel.preferredSink || isDummyOutput(paSinkModel.preferredSink)) {
-            return;
-        }
-
-        var toMute = !paSinkModel.preferredSink.muted;
-        paSinkModel.preferredSink.muted = toMute;
-        osd.show(toMute ? 0 : volumePercent(paSinkModel.preferredSink.volume, maxVolumeValue));
-        if (!toMute) {
-            playFeedback();
-        }
-    }
-
     SinkModel {
         id: paSinkModel
     }
@@ -138,39 +75,4 @@ PlasmaCore.IconItem {
     VolumeFeedback {
         id: feedback
     }
-
-    GlobalActionCollection {
-        // KGlobalAccel cannot transition from kmix to something else, so if
-        // the user had a custom shortcut set for kmix those would get lost.
-        // To avoid this we hijack kmix name and actions. Entirely mental but
-        // best we can do to not cause annoyance for the user.
-        // The display name actually is updated to whatever registered last
-        // though, so as far as user visible strings go we should be fine.
-        // As of 2015-07-21:
-        //   componentName: kmix
-        //   actions: increase_volume, decrease_volume, mute
-        name: "kmix"
-        displayName: main.displayName
-
-        GlobalAction {
-            objectName: "increase_volume"
-            text: i18n("Increase Volume")
-            shortcut: Qt.Key_VolumeUp
-            onTriggered: increaseVolume()
-        }
-
-        GlobalAction {
-            objectName: "decrease_volume"
-            text: i18n("Decrease Volume")
-            shortcut: Qt.Key_VolumeDown
-            onTriggered: decreaseVolume()
-        }
-
-        GlobalAction {
-            objectName: "mute"
-            text: i18n("Mute")
-            shortcut: Qt.Key_VolumeMute
-            onTriggered: muteVolume()
-        }
-    }
 }