diff options
| -rw-r--r-- | src/plugins/General/hotkey/hotkeydialog.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/General/hotkey/hotkeydialog.ui | 12 |
2 files changed, 16 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); diff --git a/src/plugins/General/hotkey/hotkeydialog.ui b/src/plugins/General/hotkey/hotkeydialog.ui index fff3429bd..9789be32e 100644 --- a/src/plugins/General/hotkey/hotkeydialog.ui +++ b/src/plugins/General/hotkey/hotkeydialog.ui @@ -25,6 +25,9 @@ </property> <item row="0" column="0" colspan="3"> <widget class="QLabel" name="label"> + <property name="contextMenuPolicy"> + <enum>Qt::NoContextMenu</enum> + </property> <property name="text"> <string>Press the key combination you want to assign</string> </property> @@ -32,6 +35,9 @@ </item> <item row="1" column="0" colspan="3"> <widget class="QLineEdit" name="keyLineEdit"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> <property name="readOnly"> <bool>true</bool> </property> @@ -39,6 +45,9 @@ </item> <item row="2" column="0"> <widget class="QPushButton" name="clearButton"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> <property name="text"> <string>Clear</string> </property> @@ -59,6 +68,9 @@ </item> <item row="2" column="2"> <widget class="QDialogButtonBox" name="buttonBox"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> <property name="standardButtons"> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> </property> |