mirror of
https://github.com/Skycoder42/QHotkey.git
synced 2026-11-19 12:49:58 +03:00
added addGlobalMapping method
Enables overrides for specific key sequences, fixes #11
This commit is contained in:
@@ -1,6 +1,8 @@
|
|||||||
#include "hottestwidget.h"
|
#include "hottestwidget.h"
|
||||||
#include "ui_hottestwidget.h"
|
#include "ui_hottestwidget.h"
|
||||||
|
|
||||||
|
//#define TEST_MAPPING
|
||||||
|
|
||||||
HotTestWidget::HotTestWidget(QWidget *parent) :
|
HotTestWidget::HotTestWidget(QWidget *parent) :
|
||||||
QWidget(parent),
|
QWidget(parent),
|
||||||
ui(new Ui::HotTestWidget),
|
ui(new Ui::HotTestWidget),
|
||||||
@@ -18,6 +20,11 @@ HotTestWidget::HotTestWidget(QWidget *parent) :
|
|||||||
this->thread4->start();
|
this->thread4->start();
|
||||||
this->thread5->start();
|
this->thread5->start();
|
||||||
|
|
||||||
|
#ifdef TEST_MAPPING
|
||||||
|
//shortcut mapping override
|
||||||
|
QHotkey::addGlobalMapping(QKeySequence("X"), QHotkey::NativeShortcut());// add invalid mapping to test if the overwrite works for all platforms
|
||||||
|
#endif
|
||||||
|
|
||||||
//1
|
//1
|
||||||
connect(this->ui->hotkeyCheckbox_1, &QCheckBox::toggled,
|
connect(this->ui->hotkeyCheckbox_1, &QCheckBox::toggled,
|
||||||
this->hotkey_1, &QHotkey::setRegistered);
|
this->hotkey_1, &QHotkey::setRegistered);
|
||||||
|
|||||||
@@ -8,6 +8,14 @@
|
|||||||
|
|
||||||
Q_LOGGING_CATEGORY(logQHotkey, "QHotkey")
|
Q_LOGGING_CATEGORY(logQHotkey, "QHotkey")
|
||||||
|
|
||||||
|
void QHotkey::addGlobalMapping(const QKeySequence &shortcut, const QHotkey::NativeShortcut &nativeShortcut)
|
||||||
|
{
|
||||||
|
QMetaObject::invokeMethod(QHotkeyPrivate::instance(), "addMappingInvoked", Qt::QueuedConnection,
|
||||||
|
Q_ARG(Qt::Key, Qt::Key(shortcut[0] & ~Qt::KeyboardModifierMask)),
|
||||||
|
Q_ARG(Qt::KeyboardModifiers, Qt::KeyboardModifiers(shortcut[0] & Qt::KeyboardModifierMask)),
|
||||||
|
Q_ARG(QHotkey::NativeShortcut, nativeShortcut));
|
||||||
|
}
|
||||||
|
|
||||||
QHotkey::QHotkey(QObject *parent) :
|
QHotkey::QHotkey(QObject *parent) :
|
||||||
QObject(parent),
|
QObject(parent),
|
||||||
_keyCode(Qt::Key_unknown),
|
_keyCode(Qt::Key_unknown),
|
||||||
@@ -249,6 +257,11 @@ void QHotkeyPrivate::activateShortcut(QHotkey::NativeShortcut shortcut)
|
|||||||
signal.invoke(hkey, Qt::QueuedConnection);
|
signal.invoke(hkey, Qt::QueuedConnection);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void QHotkeyPrivate::addMappingInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers, const QHotkey::NativeShortcut &nativeShortcut)
|
||||||
|
{
|
||||||
|
mapping.insert({keycode, modifiers}, nativeShortcut);
|
||||||
|
}
|
||||||
|
|
||||||
bool QHotkeyPrivate::addShortcutInvoked(QHotkey *hotkey)
|
bool QHotkeyPrivate::addShortcutInvoked(QHotkey *hotkey)
|
||||||
{
|
{
|
||||||
QHotkey::NativeShortcut shortcut = hotkey->_nativeShortcut;
|
QHotkey::NativeShortcut shortcut = hotkey->_nativeShortcut;
|
||||||
@@ -279,6 +292,9 @@ bool QHotkeyPrivate::removeShortcutInvoked(QHotkey *hotkey)
|
|||||||
|
|
||||||
QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers)
|
QHotkey::NativeShortcut QHotkeyPrivate::nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers)
|
||||||
{
|
{
|
||||||
|
if(mapping.contains({keycode, modifiers}))
|
||||||
|
return mapping.value({keycode, modifiers});
|
||||||
|
|
||||||
bool ok1, ok2 = false;
|
bool ok1, ok2 = false;
|
||||||
auto k = nativeKeycode(keycode, ok1);
|
auto k = nativeKeycode(keycode, ok1);
|
||||||
auto m = nativeModifiers(modifiers, ok2);
|
auto m = nativeModifiers(modifiers, ok2);
|
||||||
|
|||||||
@@ -53,6 +53,8 @@ public:
|
|||||||
bool valid;
|
bool valid;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static void addGlobalMapping(const QKeySequence &shortcut, const NativeShortcut &nativeShortcut);
|
||||||
|
|
||||||
//! Constructor
|
//! Constructor
|
||||||
explicit QHotkey(QObject *parent = Q_NULLPTR);
|
explicit QHotkey(QObject *parent = Q_NULLPTR);
|
||||||
//! Constructs a hotkey with a shortcut and optionally registers it
|
//! Constructs a hotkey with a shortcut and optionally registers it
|
||||||
@@ -110,4 +112,6 @@ uint QHOTKEY_SHARED_EXPORT qHash(const QHotkey::NativeShortcut &key, uint seed);
|
|||||||
|
|
||||||
QHOTKEY_SHARED_EXPORT Q_DECLARE_LOGGING_CATEGORY(logQHotkey)
|
QHOTKEY_SHARED_EXPORT Q_DECLARE_LOGGING_CATEGORY(logQHotkey)
|
||||||
|
|
||||||
|
Q_DECLARE_METATYPE(QHotkey::NativeShortcut)
|
||||||
|
|
||||||
#endif // QHOTKEY_H
|
#endif // QHOTKEY_H
|
||||||
|
|||||||
@@ -32,8 +32,10 @@ protected:
|
|||||||
virtual bool unregisterShortcut(QHotkey::NativeShortcut shortcut) = 0;//platform implement
|
virtual bool unregisterShortcut(QHotkey::NativeShortcut shortcut) = 0;//platform implement
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
QHash<QPair<Qt::Key, Qt::KeyboardModifiers>, QHotkey::NativeShortcut> mapping;
|
||||||
QMultiHash<QHotkey::NativeShortcut, QHotkey*> shortcuts;
|
QMultiHash<QHotkey::NativeShortcut, QHotkey*> shortcuts;
|
||||||
|
|
||||||
|
Q_INVOKABLE void addMappingInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers, const QHotkey::NativeShortcut &nativeShortcut);
|
||||||
Q_INVOKABLE bool addShortcutInvoked(QHotkey *hotkey);
|
Q_INVOKABLE bool addShortcutInvoked(QHotkey *hotkey);
|
||||||
Q_INVOKABLE bool removeShortcutInvoked(QHotkey *hotkey);
|
Q_INVOKABLE bool removeShortcutInvoked(QHotkey *hotkey);
|
||||||
Q_INVOKABLE QHotkey::NativeShortcut nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers);
|
Q_INVOKABLE QHotkey::NativeShortcut nativeShortcutInvoked(Qt::Key keycode, Qt::KeyboardModifiers modifiers);
|
||||||
@@ -47,4 +49,7 @@ private:
|
|||||||
return hotkeyPrivate;\
|
return hotkeyPrivate;\
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Q_DECLARE_METATYPE(Qt::Key)
|
||||||
|
Q_DECLARE_METATYPE(Qt::KeyboardModifiers)
|
||||||
|
|
||||||
#endif // QHOTKEY_P_H
|
#endif // QHOTKEY_P_H
|
||||||
|
|||||||
Reference in New Issue
Block a user