Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make the global shortcut grabber grab keys that don't have any "text" associated with them, like Home or the F-keys. Fixes issue #412

Browse Source
This commit is contained in:
David Sansome 2010-06-17 13:59:32 +00:00
parent fa8ce4b0b3
commit e376b64dee
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ui/globalshortcutgrabber.cpp
View File

@ -25,6 +25,9 @@ GlobalShortcutGrabber::GlobalShortcutGrabber(QWidget *parent)
ui_(new Ui::GlobalShortcutGrabber) ui_(new Ui::GlobalShortcutGrabber)
{ {
ui_->setupUi(this); ui_->setupUi(this);
modifier_keys_ << Qt::Key_Shift << Qt::Key_Control << Qt::Key_Meta
<< Qt::Key_Alt << Qt::Key_AltGr;
} }
GlobalShortcutGrabber::~GlobalShortcutGrabber() { GlobalShortcutGrabber::~GlobalShortcutGrabber() {
@ -56,15 +59,14 @@ bool GlobalShortcutGrabber::event(QEvent* e) {
if (e->type() == QEvent::ShortcutOverride) { if (e->type() == QEvent::ShortcutOverride) {
QKeyEvent* ke = static_cast<QKeyEvent*>(e); QKeyEvent* ke = static_cast<QKeyEvent*>(e);
if (ke->text().isEmpty()) if (modifier_keys_.contains(ke->key()))
ret_ = QKeySequence(ke->modifiers()); ret_ = QKeySequence(ke->modifiers());
else else
ret_ = QKeySequence(ke->modifiers() | ke->key()); ret_ = QKeySequence(ke->modifiers() | ke->key());
ui_->combo->setText("<b>" + ret_.toString(QKeySequence::NativeText) + "</b>"); ui_->combo->setText("<b>" + ret_.toString(QKeySequence::NativeText) + "</b>");
if (!ke->text().isEmpty()) if (!modifier_keys_.contains(ke->key()))
accept(); accept();
return true; return true;
} }

2
src/ui/globalshortcutgrabber.h
View File

@ -38,6 +38,8 @@ class GlobalShortcutGrabber : public QDialog {
private: private:
Ui_GlobalShortcutGrabber* ui_; Ui_GlobalShortcutGrabber* ui_;
QKeySequence ret_; QKeySequence ret_;
QList<int> modifier_keys_;
}; };
#endif // GLOBALSHORTCUTGRABBER_H #endif // GLOBALSHORTCUTGRABBER_H