Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-09-24 06:45:00 -04:00
Code Issues Projects Releases Packages Wiki Activity

Reset and unregister global shortcut when it's not locked anymore.

Browse source
This commit is contained in:
Felix Geyer 2012-07-14 19:07:13 +02:00
parent fa51f7e10e
commit d3af39a7ae
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/autotype/ShortcutWidget.cpp
View file

@ -56,6 +56,14 @@ void ShortcutWidget::setShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers)
} }
} }
void ShortcutWidget::resetShortcut()
{
m_key = static_cast<Qt::Key>(0);
m_modifiers = 0;
m_locked = false;
autoType()->unregisterGlobalShortcut();
}
void ShortcutWidget::keyPressEvent(QKeyEvent* event) void ShortcutWidget::keyPressEvent(QKeyEvent* event)
{ {
keyEvent(event); keyEvent(event);
@ -106,15 +114,14 @@ void ShortcutWidget::keyEvent(QKeyEvent* event)
setShortcut(key, modifiers); setShortcut(key, modifiers);
} }
else { else {
m_locked = false; resetShortcut();
setStyleSheet(""); setStyleSheet("");
displayShortcut(key, modifiers); displayShortcut(key, modifiers);
} }
} }
else { else {
if (m_locked) { if (m_locked) {
m_locked = false; resetShortcut();
m_key = static_cast<Qt::Key>(0);
setStyleSheet(""); setStyleSheet("");
} }

1
src/autotype/ShortcutWidget.h
View file

@ -39,6 +39,7 @@ protected:
private: private:
void keyEvent(QKeyEvent* event); void keyEvent(QKeyEvent* event);
void displayShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers); void displayShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers);
void resetShortcut();
Qt::Key m_key; Qt::Key m_key;
Qt::KeyboardModifiers m_modifiers; Qt::KeyboardModifiers m_modifiers;