mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 03:18:07 +00:00
Add keyboard shortcuts to accept/decline call
This commit is contained in:
parent
97b1d11adb
commit
396bd56d50
7 changed files with 163 additions and 5 deletions
|
|
@ -100,6 +100,7 @@
|
||||||
#include "tool/Utils.hpp"
|
#include "tool/Utils.hpp"
|
||||||
#include "tool/accessibility/AccessibilityHelper.hpp"
|
#include "tool/accessibility/AccessibilityHelper.hpp"
|
||||||
#include "tool/accessibility/FocusHelper.hpp"
|
#include "tool/accessibility/FocusHelper.hpp"
|
||||||
|
#include "tool/accessibility/KeyboardShortcuts.hpp"
|
||||||
#include "tool/native/DesktopTools.hpp"
|
#include "tool/native/DesktopTools.hpp"
|
||||||
#include "tool/providers/AvatarProvider.hpp"
|
#include "tool/providers/AvatarProvider.hpp"
|
||||||
#include "tool/providers/EmojiProvider.hpp"
|
#include "tool/providers/EmojiProvider.hpp"
|
||||||
|
|
@ -643,6 +644,10 @@ void App::initCore() {
|
||||||
tr("info_popup_configuration_failed_message").arg(message), false);
|
tr("info_popup_configuration_failed_message").arg(message), false);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//---------------------------------------------------------------------------------------------
|
||||||
|
lDebug() << log().arg("Creating KeyboardShortcuts");
|
||||||
|
KeyboardShortcuts::create(getMainWindow());
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
Qt::QueuedConnection);
|
Qt::QueuedConnection);
|
||||||
|
|
|
||||||
|
|
@ -188,6 +188,15 @@ QSharedPointer<CallCore> CallList::getNextCall() {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QSharedPointer<CallCore> CallList::getFirstIncommingPendingCall() {
|
||||||
|
auto callList = getSharedList<CallCore>();
|
||||||
|
auto it = std::find_if(callList.begin(), callList.end(), [](const QSharedPointer<CallCore> call) {
|
||||||
|
return call->getState() == LinphoneEnums::CallState::IncomingReceived;
|
||||||
|
});
|
||||||
|
if (it == callList.end()) return nullptr;
|
||||||
|
return *it;
|
||||||
|
}
|
||||||
|
|
||||||
void CallList::onStateChanged() {
|
void CallList::onStateChanged() {
|
||||||
auto call = dynamic_cast<CallCore *>(sender());
|
auto call = dynamic_cast<CallCore *>(sender());
|
||||||
switch (call->getState()) {
|
switch (call->getState()) {
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,8 @@ public:
|
||||||
// At the moment, it select the last call in the list.
|
// At the moment, it select the last call in the list.
|
||||||
QSharedPointer<CallCore> getNextCall();
|
QSharedPointer<CallCore> getNextCall();
|
||||||
|
|
||||||
|
QSharedPointer<CallCore> getFirstIncommingPendingCall();
|
||||||
|
|
||||||
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
|
||||||
signals:
|
signals:
|
||||||
void lUpdate();
|
void lUpdate();
|
||||||
|
|
|
||||||
|
|
@ -28,8 +28,9 @@ list(APPEND _LINPHONEAPP_SOURCES
|
||||||
|
|
||||||
tool/ui/DashRectangle.cpp
|
tool/ui/DashRectangle.cpp
|
||||||
|
|
||||||
tool/accessibility/FocusHelper.cpp
|
|
||||||
tool/accessibility/AccessibilityHelper.cpp
|
tool/accessibility/AccessibilityHelper.cpp
|
||||||
|
tool/accessibility/KeyboardShortcuts.cpp
|
||||||
|
tool/accessibility/FocusHelper.cpp
|
||||||
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
88
Linphone/tool/accessibility/KeyboardShortcuts.cpp
Normal file
88
Linphone/tool/accessibility/KeyboardShortcuts.cpp
Normal file
|
|
@ -0,0 +1,88 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2010-2025 Belledonne Communications SARL.
|
||||||
|
*
|
||||||
|
* This file is part of linphone-desktop
|
||||||
|
* (see https://www.linphone.org).
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "KeyboardShortcuts.hpp"
|
||||||
|
#include "core/App.hpp"
|
||||||
|
#include "core/call/CallList.hpp"
|
||||||
|
#include "tool/Utils.hpp"
|
||||||
|
#include <QKeySequence>
|
||||||
|
#include <linphone++/linphone.hh>
|
||||||
|
|
||||||
|
DEFINE_ABSTRACT_OBJECT(KeyboardShortcuts)
|
||||||
|
|
||||||
|
std::shared_ptr<KeyboardShortcuts> KeyboardShortcuts::gKeyboardShortcuts;
|
||||||
|
|
||||||
|
KeyboardShortcuts::KeyboardShortcuts(QQuickWindow *window) {
|
||||||
|
mustBeInMainThread(getClassName());
|
||||||
|
|
||||||
|
mWindow = window;
|
||||||
|
|
||||||
|
// Define shortcuts
|
||||||
|
mAcceptCallShortcut = new QShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_A), mWindow);
|
||||||
|
mDeclineCallShortcut = new QShortcut(QKeySequence(Qt::CTRL | Qt::SHIFT | Qt::Key_D), mWindow);
|
||||||
|
|
||||||
|
// Make some shortcut active for the whole app
|
||||||
|
mAcceptCallShortcut->setContext(Qt::ApplicationShortcut);
|
||||||
|
mDeclineCallShortcut->setContext(Qt::ApplicationShortcut);
|
||||||
|
|
||||||
|
// Link shortcuts to action
|
||||||
|
QObject::connect(mAcceptCallShortcut, &QShortcut::activated, this, &KeyboardShortcuts::onAcceptCallShortcut);
|
||||||
|
QObject::connect(mDeclineCallShortcut, &QShortcut::activated, this, &KeyboardShortcuts::onDeclineCallShortcut);
|
||||||
|
}
|
||||||
|
|
||||||
|
KeyboardShortcuts::~KeyboardShortcuts() {
|
||||||
|
}
|
||||||
|
|
||||||
|
std::shared_ptr<KeyboardShortcuts> KeyboardShortcuts::create(QQuickWindow *window) {
|
||||||
|
if (gKeyboardShortcuts) return gKeyboardShortcuts;
|
||||||
|
auto model = std::make_shared<KeyboardShortcuts>(window);
|
||||||
|
gKeyboardShortcuts = model;
|
||||||
|
return model;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::shared_ptr<KeyboardShortcuts> KeyboardShortcuts::getInstance() {
|
||||||
|
return gKeyboardShortcuts;
|
||||||
|
}
|
||||||
|
|
||||||
|
// -----------------------------------------------------------------------------
|
||||||
|
// Actions callable with the shortcuts
|
||||||
|
// -----------------------------------------------------------------------------
|
||||||
|
|
||||||
|
void KeyboardShortcuts::onAcceptCallShortcut() {
|
||||||
|
// Retrieve the first pending call of the call list
|
||||||
|
auto callList = App::getInstance()->getCallList();
|
||||||
|
auto currentPendingCall = callList->getFirstIncommingPendingCall();
|
||||||
|
if (!currentPendingCall.isNull()) {
|
||||||
|
lDebug() << "Accept call with shortcut :" << currentPendingCall;
|
||||||
|
auto gui = new CallGui(currentPendingCall);
|
||||||
|
Utils::openCallsWindow(gui);
|
||||||
|
currentPendingCall->lAccept(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void KeyboardShortcuts::onDeclineCallShortcut() {
|
||||||
|
// Retrieve the first pending call of the call list
|
||||||
|
auto callList = App::getInstance()->getCallList();
|
||||||
|
auto currentPendingCall = callList->getFirstIncommingPendingCall();
|
||||||
|
if (!currentPendingCall.isNull()) {
|
||||||
|
lDebug() << "Dcline call with shortcut :" << currentPendingCall;
|
||||||
|
currentPendingCall->lDecline();
|
||||||
|
}
|
||||||
|
}
|
||||||
57
Linphone/tool/accessibility/KeyboardShortcuts.hpp
Normal file
57
Linphone/tool/accessibility/KeyboardShortcuts.hpp
Normal file
|
|
@ -0,0 +1,57 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2010-2025 Belledonne Communications SARL.
|
||||||
|
*
|
||||||
|
* This file is part of linphone-desktop
|
||||||
|
* (see https://www.linphone.org).
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "tool/AbstractObject.hpp"
|
||||||
|
#include <QObject>
|
||||||
|
#include <QQuickWindow>
|
||||||
|
#include <QSharedPointer>
|
||||||
|
#include <QShortcut>
|
||||||
|
#include <linphone++/linphone.hh>
|
||||||
|
|
||||||
|
#ifndef KEYBOARD_SHORTCUTS_H_
|
||||||
|
#define KEYBOARD_SHORTCUTS_H_
|
||||||
|
|
||||||
|
class KeyboardShortcuts : public QObject, public AbstractObject {
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
KeyboardShortcuts(QQuickWindow *window);
|
||||||
|
~KeyboardShortcuts();
|
||||||
|
static std::shared_ptr<KeyboardShortcuts> create(QQuickWindow *window);
|
||||||
|
static std::shared_ptr<KeyboardShortcuts> getInstance();
|
||||||
|
|
||||||
|
private:
|
||||||
|
static std::shared_ptr<KeyboardShortcuts> gKeyboardShortcuts;
|
||||||
|
|
||||||
|
// Window where to put the shortcuts
|
||||||
|
QQuickWindow *mWindow = nullptr;
|
||||||
|
|
||||||
|
// The shortcuts
|
||||||
|
QShortcut *mAcceptCallShortcut;
|
||||||
|
QShortcut *mDeclineCallShortcut;
|
||||||
|
|
||||||
|
// Actions callable with the shortcuts
|
||||||
|
static void onAcceptCallShortcut();
|
||||||
|
static void onDeclineCallShortcut();
|
||||||
|
|
||||||
|
DECLARE_ABSTRACT_OBJECT
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // KEYBOARD_SHORTCUTS_H_
|
||||||
|
|
@ -143,11 +143,8 @@ function getTopParent (object, useFakeParent) {
|
||||||
|
|
||||||
// Check that an item is descendant of another one
|
// Check that an item is descendant of another one
|
||||||
function isDescendant(child, parent) {
|
function isDescendant(child, parent) {
|
||||||
console.debug("---")
|
|
||||||
console.debug(child)
|
|
||||||
var current = child.parent
|
var current = child.parent
|
||||||
while (current) {
|
while (current) {
|
||||||
console.debug(current)
|
|
||||||
if (current === parent)
|
if (current === parent)
|
||||||
return true
|
return true
|
||||||
current = current.parent
|
current = current.parent
|
||||||
|
|
@ -177,7 +174,6 @@ function getLastFocussableItemInItem(item) {
|
||||||
current = next;
|
current = next;
|
||||||
next = current.nextItemInFocusChain();
|
next = current.nextItemInFocusChain();
|
||||||
} while(isDescendant(next, item) && next.visible)
|
} while(isDescendant(next, item) && next.visible)
|
||||||
console.log("find last content", current)
|
|
||||||
return current;
|
return current;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue