Commit b7685338 authored by Nate Graham's avatar Nate Graham
Browse files

Change global Klipper shortcuts to use the Meta key by default

The current shortcuts could conceivably override app shortcuts, since
they don't use the Meta key. The following changes are made:

Automatic Action Popup Menu:                 Ctrl+Alt+X -> Meta+Ctrl+X
Manually Invoke Action on Current Clipboard: Ctrl+Alt+R -> Meta+Ctrl+R

These are safe to change in the code rather than adding a new one and
keeping the old ones around for compatibility's sake because
KGlobalAccel::setGlobalShortcut by default preserves old shortcuts
when they are changed, and we aren't overriding that behavior here. So
only new installs will get the new shortcuts and existing user installs
will be untouched.
parent d835d70e
Pipeline #184758 passed with stage
in 8 minutes and 59 seconds
......@@ -154,7 +154,7 @@ Klipper::Klipper(QObject *parent, const KSharedConfigPtr &config, KlipperMode mo
m_toggleURLGrabAction = new KToggleAction(this);
m_collection->addAction(QStringLiteral("clipboard_action"), m_toggleURLGrabAction);
m_toggleURLGrabAction->setText(i18nc("@action:inmenu Toggle automatic action", "Automatic Action Popup Menu"));
KGlobalAccel::setGlobalShortcut(m_toggleURLGrabAction, QKeySequence(Qt::ALT | Qt::CTRL | Qt::Key_X));
KGlobalAccel::setGlobalShortcut(m_toggleURLGrabAction, QKeySequence(Qt::META | Qt::CTRL | Qt::Key_X));
connect(m_toggleURLGrabAction, &QAction::toggled, this, &Klipper::setURLGrabberEnabled);
......@@ -195,7 +195,8 @@ Klipper::Klipper(QObject *parent, const KSharedConfigPtr &config, KlipperMode mo
m_repeatAction = m_collection->addAction(QStringLiteral("repeat_action"));
m_repeatAction->setText(i18nc("@action:inmenu", "Manually Invoke Action on Current Clipboard"));
KGlobalAccel::setGlobalShortcut(m_repeatAction, QKeySequence(Qt::ALT | Qt::CTRL | Qt::Key_R));
KGlobalAccel::setGlobalShortcut(m_repeatAction, QKeySequence(Qt::META | Qt::CTRL | Qt::Key_R));
connect(m_repeatAction, &QAction::triggered, this, &Klipper::slotRepeatAction);
// add an edit-possibility
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment