aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/hotkey/hotkeydialog.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-03-27 13:33:25 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2010-03-27 13:33:25 +0000
commitde56068e9c16e9f09bed0ebe754e0b5949a0752a (patch)
treeb341ea26f554d49a7958e2113ab5fa1773dfd627 /src/plugins/General/hotkey/hotkeydialog.cpp
parent0fa5c6f14759412694759893c3c33d747f75ff0f (diff)
downloadqmmp-de56068e9c16e9f09bed0ebe754e0b5949a0752a.tar.gz
qmmp-de56068e9c16e9f09bed0ebe754e0b5949a0752a.tar.bz2
qmmp-de56068e9c16e9f09bed0ebe754e0b5949a0752a.zip
fixed bug in the global shortcut editor
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1652 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/hotkey/hotkeydialog.cpp')
-rw-r--r--src/plugins/General/hotkey/hotkeydialog.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/General/hotkey/hotkeydialog.cpp b/src/plugins/General/hotkey/hotkeydialog.cpp
index 75672347e..d32d5d2d8 100644
--- a/src/plugins/General/hotkey/hotkeydialog.cpp
+++ b/src/plugins/General/hotkey/hotkeydialog.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2009 by Ilya Kotov *
+ * Copyright (C) 2009-2010 by Ilya Kotov *
* forkotov02@hotmail.ru *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -29,10 +29,12 @@ HotkeyDialog::HotkeyDialog(quint32 key, quint32 mod, QWidget *parent)
m_key = key;
m_modifiers = mod;
ui.keyLineEdit->setText(HotkeyManager::getKeyString(m_key, m_modifiers));
+ grabKeyboard();
}
HotkeyDialog::~HotkeyDialog()
{
+ releaseKeyboard();
}
void HotkeyDialog::keyPressEvent (QKeyEvent *event)
@@ -40,7 +42,7 @@ void HotkeyDialog::keyPressEvent (QKeyEvent *event)
m_key = HotkeyManager::keycodeToKeysym(event->nativeScanCode ());
m_modifiers = event->nativeModifiers ();
foreach(long mask_mod, HotkeyManager::ignModifiersList())
- m_modifiers &= ~mask_mod; //remove ignoried modifiers (num lock, caps lock, etc)
+ m_modifiers &= ~mask_mod; //remove ignoried modifiers (num lock, caps lock, etc)
ui.keyLineEdit->setText(HotkeyManager::getKeyString(m_key, m_modifiers));
QWidget::keyPressEvent(event);