Skip to content

GitLab

Commit 63d4a2a0 authored by David Redondo's avatar David Redondo 🏎
Browse files
Options

Rewrite KeySequenceItem (and helper) to use KeySequenceRecorder 

Use the new KeySequenceRecorder which was created for this purpose. We can
remove almost all logic from the helper aside from the conflict checking.
BUG:407395
BUG:427730
parent 21e40850
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 501 deletions
src/qmlcontrols/kquickcontrols/KeySequenceItem.qml
View file @ 63d4a2a0
import QtQuick 2.0
import QtQuick.Controls 2.12
import QtQuick.Layouts 1.1
import QtQuick.Window 2.15
import org.kde.private.kquickcontrols 2.0 as KQuickControlsPrivate
RowLayout {
id: root
property alias showClearButton: clearButton.visible
property alias modifierlessAllowed: _helper.modifierlessAllowed
property alias multiKeyShortcutsAllowed: _helper.multiKeyShortcutsAllowed
property alias keySequence: _helper.keySequence
property var keySequence
/**
* This property controls which types of shortcuts are checked for conflicts when the keySequence
* is set. If a conflict is detected, a messagebox will be shown asking the user to confirm their
......@@ -39,10 +42,13 @@ RowLayout {
KQuickControlsPrivate.KeySequenceHelper {
id: _helper
onCaptureFinished: {
window: renderWindow(parent.Window.window)
onGotKeySequence: {
if (isKeySequenceAvailable(keySequence)) {
root.keySequence = keySequence
}
mainButton.checked = false;
parent.captureFinished();
root.captureFinished();
}
}
......@@ -57,13 +63,25 @@ RowLayout {
icon.name: "configure"
property string shortcut
checkable: true
focus: checked
hoverEnabled: true
text: _helper.shortcutDisplay
text: {
const keys = _helper.isRecording ? _helper.currentKeySequence : parent.keySequence
let text = " " // This space is intentional
if (keys == undefined || _helper.keySequenceIsEmpty(keys)) {
if (_helper.isRecording) {
text += _tr.i18nc("What the user inputs now will be taken as the new shortcut", "Input")
} else {
text += _tr.i18nc("No shortcut defined", "None");
}
} else {
text += _helper.keySequenceNativeText(keys)
}
return _helper.isRecording ? text.concat(" ... ") : text.concat(" ")
}
ToolTip.visible: hovered
ToolTip.delay: 1000
......@@ -73,7 +91,7 @@ RowLayout {
onCheckedChanged: {
if (checked) {
mainButton.forceActiveFocus()
_helper.captureKeySequence()
_helper.startRecording()
}
}
......@@ -82,29 +100,13 @@ RowLayout {
mainButton.checked = false
}
}
Keys.onShortcutOverride: {
if (_helper.isRecording) {
_helper.keyPressed(event.key, event.modifiers);
event.accepted = true;
}
}
Keys.onPressed: {
_helper.keyPressed(event.key, event.modifiers);
event.accepted = true;
}
Keys.onReleased: {
_helper.keyReleased(event.key, event.modifiers);
event.accepted = true;
}
}
Button {
id: clearButton
Layout.fillHeight: true
Layout.preferredWidth: height
onClicked: _helper.clearKeySequence();
onClicked: root.keySequence = undefined
//icon name determines the direction of the arrow, NOT the direction of the app layout
icon.name: Qt.application.layoutDirection == Qt.LeftToRight ? "edit-clear-locationbar-rtl" : "edit-clear-locationbar-ltr"
......
src/qmlcontrols/kquickcontrols/private/CMakeLists.txt
View file @ 63d4a2a0
......@@ -14,6 +14,7 @@ target_link_libraries(kquickcontrolsprivateplugin
Qt5::Qml
KF5::I18n
KF5::ConfigGui
KF5::GuiAddons
KF5::WidgetsAddons
KF5::WindowSystem
KF5::GlobalAccel
......
src/qmlcontrols/kquickcontrols/private/keysequencehelper.cpp
View file @ 63d4a2a0
/*
SPDX-FileCopyrightText: 2020 David Redondo <davidedmundson@kde.org>
SPDX-FileCopyrightText: 2014 David Edmundson <davidedmundson@kde.org>
SPDX-FileCopyrightText: 1998 Mark Donohoe <donohoe@kde.org>
SPDX-FileCopyrightText: 2001 Ellis Whitehead <ellis@kde.org>
......@@ -9,41 +10,24 @@
#include "keysequencehelper.h"
#include <QAction>
#include <QQuickWindow>
#include <QTimer>
#include <QHash>
#include <QToolButton>
#include <QDebug>
#include <QQuickRenderControl>
#include <QHash>
#include <QPointer>
#include <QQuickRenderControl>
#include <QQmlEngine>
#include <QQuickWindow>
#include <KStandardShortcut>
#include <KLocalizedString>
#include <KMessageBox>
#include <KGlobalAccel/KGlobalShortcutInfo>
#include <KGlobalAccel/KGlobalAccel>
#include <kkeyserver.h>
uint qHash(const QKeySequence &seq)
{
return qHash(seq.toString());
}
#include <KGlobalAccel>
#include <KGlobalShortcutInfo>
#include <KStandardShortcut>
class KeySequenceHelperPrivate
{
public:
KeySequenceHelperPrivate(KeySequenceHelper *q);
void init();
static QKeySequence appendToSequence(const QKeySequence &seq, int keyQt);
static bool isOkWhenModifierless(int keyQt);
void updateShortcutDisplay();
void startRecording();
/**
* Conflicts the key sequence @a seq with a current standard
* shortcut?
......@@ -71,116 +55,32 @@ public:
return checkAgainstShortcutTypes & KeySequenceHelper::GlobalShortcuts;
}
void controlModifierlessTimout()
{
if (nKey != 0 && !modifierKeys) {
// No modifier key pressed currently. Start the timout
modifierlessTimeout.start(600);
} else {
// A modifier is pressed. Stop the timeout
modifierlessTimeout.stop();
}
}
void cancelRecording()
{
keySequence = oldKeySequence;
q->doneRecording();
}
//members
KeySequenceHelper *const q;
QToolButton *clearButton;
QPointer<QWindow> grabbedWindow;
QKeySequence keySequence;
QKeySequence oldKeySequence;
QTimer modifierlessTimeout;
bool allowModifierless;
uint nKey;
uint modifierKeys;
bool isRecording;
bool multiKeyShortcutsAllowed;
QString componentName;
QString shortcutDisplay;
//! Check the key sequence against KStandardShortcut::find()
KeySequenceHelper::ShortcutTypes checkAgainstShortcutTypes;
/**
* The list of action to check against for conflict shortcut
*/
QList<QAction *> checkList; // deprecated
/**
* The list of action collections to check against for conflict shortcut
*/
// QList<KActionCollection *> checkActionCollections;
/**
* The action to steal the shortcut from.
*/
QList<QAction *> stealActions;
bool stealShortcuts(const QList<QAction *> &actions, const QKeySequence &seq);
void wontStealShortcut(QAction *item, const QKeySequence &seq);
};
KeySequenceHelperPrivate::KeySequenceHelperPrivate(KeySequenceHelper *q)
: q(q)
, allowModifierless(false)
, nKey(0)
, modifierKeys(0)
, isRecording(false)
, multiKeyShortcutsAllowed(true)
, componentName()
, checkAgainstShortcutTypes(KeySequenceHelper::StandardShortcuts | KeySequenceHelper::GlobalShortcuts)
, stealActions()
: q(q)
, checkAgainstShortcutTypes(KeySequenceHelper::StandardShortcuts | KeySequenceHelper::GlobalShortcuts)
{
}
KeySequenceHelper::KeySequenceHelper(QQuickItem* parent):
QQuickItem(parent),
d(new KeySequenceHelperPrivate(this))
KeySequenceHelper::KeySequenceHelper(QObject *parent)
: KeySequenceRecorder(nullptr, parent)
, d(new KeySequenceHelperPrivate(this))
{
Q_UNUSED(parent);
connect(&d->modifierlessTimeout, SIGNAL(timeout()), this, SLOT(doneRecording()));
d->updateShortcutDisplay();
}
KeySequenceHelper::~KeySequenceHelper()
{
if (d->grabbedWindow) {
d->grabbedWindow->setKeyboardGrabEnabled(false);
}
delete d;
}
bool KeySequenceHelper::multiKeyShortcutsAllowed() const
{
return d->multiKeyShortcutsAllowed;
}
void KeySequenceHelper::setMultiKeyShortcutsAllowed(bool allowed)
{
d->multiKeyShortcutsAllowed = allowed;
}
void KeySequenceHelper::setModifierlessAllowed(bool allow)
{
d->allowModifierless = allow;
}
bool KeySequenceHelper::isModifierlessAllowed()
{
return d->allowModifierless;
}
bool KeySequenceHelper::isKeySequenceAvailable(const QKeySequence& keySequence) const
{
if (keySequence.isEmpty()) {
......@@ -196,33 +96,6 @@ bool KeySequenceHelper::isKeySequenceAvailable(const QKeySequence& keySequence)
return !conflict;
}
//
// void KeySequenceHelper::setCheckActionCollections(const QList<KActionCollection *> &actionCollections)
// {
// d->checkActionCollections = actionCollections;
// }
//
//slot
void KeySequenceHelper::captureKeySequence()
{
d->startRecording();
}
QKeySequence KeySequenceHelper::keySequence() const
{
return d->keySequence;
}
void KeySequenceHelper::setKeySequence(const QKeySequence& sequence)
{
if (!d->isRecording) {
d->oldKeySequence = d->keySequence;
}
d->keySequence = sequence;
d->updateShortcutDisplay();
emit keySequenceChanged(d->keySequence);
}
KeySequenceHelper::ShortcutTypes KeySequenceHelper::checkAgainstShortcutTypes()
{
......@@ -237,63 +110,6 @@ void KeySequenceHelper::setCheckAgainstShortcutTypes(KeySequenceHelper::Shortcut
Q_EMIT checkAgainstShortcutTypesChanged();
}
bool KeySequenceHelper::isRecording() const
{
return d->isRecording;
}
void KeySequenceHelper::clearKeySequence()
{
setKeySequence(QKeySequence());
}
void KeySequenceHelperPrivate::startRecording()
{
nKey = 0;
modifierKeys = 0;
oldKeySequence = keySequence;
keySequence = QKeySequence();
isRecording = true;
emit q->isRecordingChanged();
grabbedWindow = QQuickRenderControl::renderWindowFor(q->window());
if (!grabbedWindow) {
grabbedWindow = q->window();
}
if (grabbedWindow) {
grabbedWindow->setKeyboardGrabEnabled(true);
}
updateShortcutDisplay();
}
//
void KeySequenceHelper::doneRecording()
{
d->modifierlessTimeout.stop();
d->isRecording = false;
emit isRecordingChanged();
d->stealActions.clear();
if (d->grabbedWindow) {
d->grabbedWindow->setKeyboardGrabEnabled(false);
}
if (d->keySequence == d->oldKeySequence) {
// The sequence hasn't changed
d->updateShortcutDisplay();
return;
}
if (! isKeySequenceAvailable(d->keySequence)) {
// The sequence had conflicts and the user said no to stealing it
d->keySequence = d->oldKeySequence;
} else {
emit keySequenceChanged(d->keySequence);
}
Q_EMIT captureFinished();
d->updateShortcutDisplay();
}
bool KeySequenceHelperPrivate::conflictWithGlobalShortcuts(const QKeySequence &keySequence)
{
#ifdef Q_OS_WIN
......@@ -318,7 +134,7 @@ bool KeySequenceHelperPrivate::conflictWithGlobalShortcuts(const QKeySequence &k
for (int i = 0; i < keySequence.count(); ++i) {
QKeySequence tmp(keySequence[i]);
if (!KGlobalAccel::isGlobalShortcutAvailable(tmp, componentName)) {
if (!KGlobalAccel::isGlobalShortcutAvailable(tmp, QString())) {
others << KGlobalAccel::getGlobalShortcutsByKey(tmp);
}
}
......@@ -348,7 +164,6 @@ bool KeySequenceHelperPrivate::conflictWithStandardShortcuts(const QKeySequence
KStandardShortcut::StandardShortcut ssc = KStandardShortcut::find(keySequence);
if (ssc != KStandardShortcut::AccelNone && !stealStandardShortcut(ssc, keySequence)) {
qDebug() << "!!!!!!!!!!!!!!";
return true;
}
return false;
......@@ -368,202 +183,25 @@ bool KeySequenceHelperPrivate::stealStandardShortcut(KStandardShortcut::Standard
return true;
}
void KeySequenceHelperPrivate::updateShortcutDisplay()
{
//empty string if no non-modifier was pressed
QString s = keySequence.toString(QKeySequence::NativeText);
s.replace(QLatin1Char('&'), QStringLiteral("&&"));
if (isRecording) {
if (modifierKeys) {
if (!s.isEmpty()) {
s.append(QLatin1Char(','));
}
if (modifierKeys & Qt::MetaModifier) {
s += QKeySequence(Qt::MetaModifier).toString(QKeySequence::NativeText);
}
#if defined(Q_OS_MAC)
if (modifierKeys & Qt::AltModifier) {
s += QKeySequence(Qt::AltModifier).toString(QKeySequence::NativeText);
}
if (modifierKeys & Qt::ControlModifier) {
s += QKeySequence(Qt::ControlModifier).toString(QKeySequence::NativeText);
}
#else
if (modifierKeys & Qt::ControlModifier) {
s += QKeySequence(Qt::ControlModifier).toString(QKeySequence::NativeText);
}
if (modifierKeys & Qt::AltModifier) {
s += QKeySequence(Qt::AltModifier).toString(QKeySequence::NativeText);
}
#endif
if (modifierKeys & Qt::ShiftModifier) {
s += QKeySequence(Qt::ShiftModifier).toString(QKeySequence::NativeText);
}
if (modifierKeys & Qt::KeypadModifier) {
s += QKeySequence(Qt::KeypadModifier).toString(QKeySequence::NativeText);
}
} else if (nKey == 0) {
s = i18nc("What the user inputs now will be taken as the new shortcut", "Input");
}
//make it clear that input is still going on
s.append(QStringLiteral(" ..."));
}
if (s.isEmpty()) {
s = i18nc("No shortcut defined", "None");
}
s.prepend(QLatin1Char(' '));
s.append(QLatin1Char(' '));
shortcutDisplay = s;
q->shortcutDisplayChanged(s);
}
QString KeySequenceHelper::shortcutDisplay() const
bool KeySequenceHelper::keySequenceIsEmpty(const QKeySequence &keySequence)
{
return d->shortcutDisplay;
return keySequence.isEmpty();
}
void KeySequenceHelper::keyPressed(int key, int modifiers)
{
if (key == -1) {
// Qt sometimes returns garbage keycodes, I observed -1, if it doesn't know a key.
// We cannot do anything useful with those (several keys have -1, indistinguishable)
// and QKeySequence.toString() will also yield a garbage string.
KMessageBox::sorry(nullptr,
i18n("The key you just pressed is not supported by Qt."),
i18n("Unsupported Key"));
return d->cancelRecording();
}
// Qt doesn't properly recognize Super_L/Super_R as MetaModifier
if (key == Qt::Key_Super_L || key == Qt::Key_Super_R) {
modifiers |= Qt::MetaModifier;
}
//don't have the return or space key appear as first key of the sequence when they
//were pressed to start editing - catch and them and imitate their effect
if (!d->isRecording && ((key == Qt::Key_Return || key == Qt::Key_Space))) {
d->startRecording();
d->modifierKeys = modifiers;
d->updateShortcutDisplay();
return;
}
d->modifierKeys = modifiers;
switch (key) {
case Qt::Key_AltGr: //or else we get unicode salad
return;
case Qt::Key_Shift:
case Qt::Key_Control:
case Qt::Key_Alt:
case Qt::Key_Meta:
case Qt::Key_Super_L:
case Qt::Key_Super_R:
case Qt::Key_Menu: //unused (yes, but why?)
d->controlModifierlessTimout();
d->updateShortcutDisplay();
break;
default:
if (d->nKey == 0 && !(d->modifierKeys & ~Qt::SHIFT)) {
// It's the first key and no modifier pressed. Check if this is
// allowed
if (!(KeySequenceHelperPrivate::isOkWhenModifierless(key)
|| d->allowModifierless)) {
// No it's not
return;
}
}
// We now have a valid key press.
if (key) {
if ((key == Qt::Key_Backtab) && (d->modifierKeys & Qt::SHIFT)) {
key = Qt::Key_Tab | d->modifierKeys;
} else if (KKeyServer::isShiftAsModifierAllowed(key)) {
key |= d->modifierKeys;
} else {
key |= (d->modifierKeys & ~Qt::SHIFT);
}
if (d->nKey == 0) {
d->keySequence = QKeySequence(key);
} else {
d->keySequence =
KeySequenceHelperPrivate::appendToSequence(d->keySequence, key);
}
d->nKey++;
if ((!d->multiKeyShortcutsAllowed) || (d->nKey >= 4)) {
doneRecording();
return;
}
d->controlModifierlessTimout();
d->updateShortcutDisplay();
}
}
}
//
void KeySequenceHelper::keyReleased(int key, int modifiers)
QString KeySequenceHelper::keySequenceNativeText(const QKeySequence &keySequence)
{
if (key == -1) {
// ignore garbage, see keyPressEvent()
return;
}
// Qt doesn't properly recognize Super_L/Super_R as MetaModifier
if (key == Qt::Key_Super_L || key == Qt::Key_Super_R) {
modifiers &= ~Qt::MetaModifier;
}
//if a modifier that belongs to the shortcut was released...
if ((modifiers & d->modifierKeys) < d->modifierKeys) {
d->modifierKeys = modifiers;
d->controlModifierlessTimout();
d->updateShortcutDisplay();
}
return keySequence.toString(QKeySequence::NativeText);
}
//
//static
QKeySequence KeySequenceHelperPrivate::appendToSequence(const QKeySequence &seq, int keyQt)
{
if (seq.matches(keyQt) != QKeySequence::NoMatch) {
return seq;
}
switch (seq.count()) {
case 0:
return QKeySequence(keyQt);
case 1:
return QKeySequence(seq[0], keyQt);
case 2:
return QKeySequence(seq[0], seq[1], keyQt);
case 3:
return QKeySequence(seq[0], seq[1], seq[2], keyQt);
default:
return seq;
}
}
//
//static
bool KeySequenceHelperPrivate::isOkWhenModifierless(int keyQt)
QWindow* KeySequenceHelper::renderWindow(QQuickWindow *quickWindow)
{
//this whole function is a hack, but especially the first line of code
if (QKeySequence(keyQt).toString().length() == 1) {
return false;
}
switch (keyQt) {
case Qt::Key_Return:
case Qt::Key_Space:
case Qt::Key_Tab:
case Qt::