From 4ec18075127443dc01cbff28b5761a3656ec7a75 Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Fri, 2 Oct 2020 10:08:52 -0400
Subject: [PATCH] mainview: make ambiguous shortcuts activate
For hang up call shortcut, use onActivatedAmbiguously since
we have two existences.
Gitlab: #126
Change-Id: I46167b95212821c88651a06700013aeec38a96a3
---
src/mainview/MainView.qml | 1 +
src/mainview/components/CallStackView.qml | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/mainview/MainView.qml b/src/mainview/MainView.qml
index 2f175fe8d..80c4e75df 100644
--- a/src/mainview/MainView.qml
+++ b/src/mainview/MainView.qml
@@ -738,6 +738,7 @@ Window {
sequence: "Ctrl+D"
context: Qt.ApplicationShortcut
onActivated: CallAdapter.hangUpThisCall()
+ onActivatedAmbiguously: CallAdapter.hangUpThisCall()
}
Shortcut {
diff --git a/src/mainview/components/CallStackView.qml b/src/mainview/components/CallStackView.qml
index f2f800687..0dba8313a 100644
--- a/src/mainview/components/CallStackView.qml
+++ b/src/mainview/components/CallStackView.qml
@@ -36,6 +36,7 @@ Rectangle {
sequence: "Ctrl+D"
context: Qt.ApplicationShortcut
onActivated: CallAdapter.hangUpThisCall()
+ onActivatedAmbiguously: CallAdapter.hangUpThisCall()
}
// When selected conversation is changed,
--
GitLab