Quit autotype dialog with esc key #1412
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
phoerious
requested changes
Jan 22, 2018
src/autotype/AutoTypeSelectView.cpp
Outdated
| qDebug() << e->key(); | ||
|
|
||
| if (!e->modifiers() || (e->modifiers() & Qt::KeypadModifier && e->key() == Qt::Key_Enter)) { | ||
| if (e->key() == Qt::Key_Escape) { |
There was a problem hiding this comment.
This if structure makes no sense to me. This should be
if (!e->modifiers() && e->key() == Qt::Key_Escape) {
emit rejected();
} else {
e->ignore();
}
or
if (!e->modifiers() && e->key() == Qt::Key_Escape) {
emit rejected();
return;
}
e->ignore();
which are both logically equivalent to your complicated-looking construct if I didn't miss anything. Also, you should remove the qDebug() call.
There was a problem hiding this comment.
BTW another thing you might add to this branch, while you're at it: enable cyclic arrow key navigation. So if you use arrow up on the top entry, you come out at the bottom and vice versa. A friend of mine suggested this to me earlier today.
There was a problem hiding this comment.
I copied this code from the PasswordGeneratorWidget but actually the first if seems useful in both cases.
I will fix them
There was a problem hiding this comment.
What seems useful? The check for KeyadModifier and Enter? It does absolutely nothing.
There was a problem hiding this comment.
lol, I was meaning useless 🤦♂️
TheZ3ro
force-pushed
the
feature/exit-autotype-dialog
branch
from
5614583 to
74fc601
Compare
phoerious
reviewed
Jan 22, 2018
src/gui/entry/EntryView.cpp
Outdated
| @@ -121,6 +121,20 @@ void EntryView::keyPressEvent(QKeyEvent* event) | |||
| #endif | |||
| } | |||
|
|
|||
| int last = m_model->rowCount()-1; | |||
There was a problem hiding this comment.
Spaces please. ;-)
Same for if below.
There was a problem hiding this comment.
Fixed with a rebase
TheZ3ro
force-pushed
the
feature/exit-autotype-dialog
branch
from
74fc601 to
ae0a06b
Compare
TheZ3ro
force-pushed
the
feature/exit-autotype-dialog
branch
from
ae0a06b to
745d255
Compare
phoerious
approved these changes
Jan 22, 2018
phoerious
added a commit
that referenced
this pull request
Feb 27, 2018
- Add support for KDBX 4.0, Argon2 and ChaCha20 [#148, #1179, #1230, #1494] - Add SSH Agent feature [#1098, #1450, #1463] - Add preview panel with details of the selected entry [#879, #1338] - Add more and configurable columns to entry table and allow copying of values by double click [#1305] - Add KeePassXC-Browser API as a replacement for KeePassHTTP [#608] - Deprecate KeePassHTTP [#1392] - Add support for Steam one-time passwords [#1206] - Add support for multiple Auto-Type sequences for a single entry [#1390] - Adjust YubiKey HMAC-SHA1 challenge-response key generation for KDBX 4.0 [#1060] - Replace qHttp with cURL for website icon downloads [#1460] - Remove lock file [#1231] - Add option to create backup file before saving [#1385] - Ask to save a generated password before closing the entry password generator [#1499] - Resolve placeholders recursively [#1078] - Add Auto-Type button to the toolbar [#1056] - Improve window focus handling for Auto-Type dialogs [#1204, #1490] - Auto-Type dialog and password generator can now be exited with ESC [#1252, #1412] - Add optional dark tray icon [#1154] - Add new "Unsafe saving" option to work around saving problems with file sync services [#1385] - Add IBus support to AppImage and additional image formats to Windows builds [#1534, #1537] - Add diceware password generator to CLI [#1406] - Add --key-file option to CLI [#816, #824] - Add DBus interface for opening and closing KeePassXC databases [#283] - Add KDBX compression options to database settings [#1419] - Discourage use of old fixed-length key files in favor of arbitrary files [#1326, #1327] - Correct reference resolution in entry fields [#1486] - Fix window state and recent databases not being remembered on exit [#1453] - Correct history item generation when configuring TOTP for an entry [#1446] - Correct multiple TOTP bugs [#1414] - Automatic saving after every change is now a default [#279] - Allow creation of new entries during search [#1398] - Correct menu issues on macOS [#1335] - Allow compilation on OpenBSD [#1328] - Improve entry attachments view [#1139, #1298] - Fix auto lock for Gnome and Xfce [#910, #1249] - Don't remember key files in file dialogs when the setting is disabled [#1188] - Improve database merging and conflict resolution [#807, #1165] - Fix macOS pasteboard issues [#1202] - Improve startup times on some platforms [#1205] - Hide the notes field by default [#1124] - Toggle main window by clicking tray icon with the middle mouse button [#992] - Fix custom icons not copied over when databases are merged [#1008] - Allow use of DEL key to delete entries [#914] - Correct intermittent crash due to stale history items [#1527] - Sanitize newline characters in title, username and URL fields [#1502] - Reopen previously opened databases in correct order [#774] - Use system's zxcvbn library if available [#701] - Implement various i18n improvements [#690, #875, #1436]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Quit autotype dialog with esc key
Motivation and context
Fixes #907
Types of changes
Checklist:
-DWITH_ASAN=ON. [REQUIRED]