diff options
| -rw-r--r-- | src/plugins/Ui/skinned/forms/shortcutdialog.ui | 11 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/shortcutdialog.cpp | 16 | ||||
| -rw-r--r-- | src/plugins/Ui/skinned/shortcutdialog.h | 4 |
3 files changed, 22 insertions, 9 deletions
diff --git a/src/plugins/Ui/skinned/forms/shortcutdialog.ui b/src/plugins/Ui/skinned/forms/shortcutdialog.ui index 3c5ed2cb4..77ffded82 100644 --- a/src/plugins/Ui/skinned/forms/shortcutdialog.ui +++ b/src/plugins/Ui/skinned/forms/shortcutdialog.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>310</width> - <height>89</height> + <height>99</height> </rect> </property> <property name="windowTitle"> @@ -42,6 +42,12 @@ </item> <item row="2" column="0"> <widget class="QPushButton" name="clearButton"> + <property name="focusPolicy"> + <enum>Qt::NoFocus</enum> + </property> + <property name="contextMenuPolicy"> + <enum>Qt::NoContextMenu</enum> + </property> <property name="text"> <string>Clear</string> </property> @@ -62,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> diff --git a/src/plugins/Ui/skinned/shortcutdialog.cpp b/src/plugins/Ui/skinned/shortcutdialog.cpp index 4323030d7..e3df5d8ac 100644 --- a/src/plugins/Ui/skinned/shortcutdialog.cpp +++ b/src/plugins/Ui/skinned/shortcutdialog.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * + * Copyright (C) 2010-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -24,8 +24,12 @@ ShortcutDialog::ShortcutDialog(const QString &key, QWidget *parent) : QDialog(parent) { - ui.setupUi(this); - ui.keyLineEdit->setText(key); + m_ui.setupUi(this); + m_ui.keyLineEdit->setText(key); + + //buttons should not catch keys + foreach(QAbstractButton *button, m_ui.buttonBox->buttons()) + button->setFocusPolicy(Qt::NoFocus); } ShortcutDialog::~ShortcutDialog() @@ -48,16 +52,16 @@ void ShortcutDialog::keyPressEvent (QKeyEvent *event) case 0: case Qt::Key_unknown: key = 0; - ui.keyLineEdit->clear(); + m_ui.keyLineEdit->clear(); QWidget::keyPressEvent(event); return; } QKeySequence seq(event->modifiers() + event->key()); - ui.keyLineEdit->setText(seq.toString()); + m_ui.keyLineEdit->setText(seq.toString()); QWidget::keyPressEvent(event); } const QString ShortcutDialog::key() { - return ui.keyLineEdit->text(); + return m_ui.keyLineEdit->text(); } diff --git a/src/plugins/Ui/skinned/shortcutdialog.h b/src/plugins/Ui/skinned/shortcutdialog.h index f80ef9cb9..e581f9c8a 100644 --- a/src/plugins/Ui/skinned/shortcutdialog.h +++ b/src/plugins/Ui/skinned/shortcutdialog.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * + * Copyright (C) 2010-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -42,7 +42,7 @@ protected: virtual void keyPressEvent (QKeyEvent *event); private: - Ui::ShortcutDialog ui; + Ui::ShortcutDialog m_ui; }; |