rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adjust default keybinding to clear-keychain on Esc.

Browse Source 
Fixes #917.
This commit is contained in:
Florian Bruhin 2015-09-03 11:14:05 +02:00
parent 3a5cd8f3ff
commit ab9c046d54
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qutebrowser/config/configdata.py
View File

@ -1219,11 +1219,11 @@ RETURN_KEYS = ['<Return>', '<Ctrl-M>', '<Ctrl-J>', '<Shift-Return>', '<Enter>',
KEY_DATA = collections.OrderedDict([ KEY_DATA = collections.OrderedDict([
('!normal', collections.OrderedDict([ ('!normal', collections.OrderedDict([
('leave-mode', ['<Escape>', '<Ctrl-[>']), ('clear-keychain ;; leave-mode', ['<Escape>', '<Ctrl-[>']),
])), ])),
('normal', collections.OrderedDict([ ('normal', collections.OrderedDict([
('search ;; clear-keychain', ['<Escape>']), ('clear-keychain ;; search', ['<Escape>']),
('set-cmd-text -s :open', ['o']), ('set-cmd-text -s :open', ['o']),
('set-cmd-text :open {url}', ['go']), ('set-cmd-text :open {url}', ['go']),
('set-cmd-text -s :open -t', ['O']), ('set-cmd-text -s :open -t', ['O']),
@ -1425,8 +1425,8 @@ CHANGED_KEY_COMMANDS = [
(re.compile(r'^download-page$'), r'download'), (re.compile(r'^download-page$'), r'download'),
(re.compile(r'^cancel-download$'), r'download-cancel'), (re.compile(r'^cancel-download$'), r'download-cancel'),
(re.compile(r"""^search (''|"")$"""), r'search ;; clear-keychain'), (re.compile(r"""^search (''|"")$"""), r'clear-keychain ;; search'),
(re.compile(r'^search$'), r'search ;; clear-keychain'), (re.compile(r'^search$'), r'clear-keychain ;; search'),
(re.compile(r"""^set-cmd-text ['"](.*) ['"]$"""), r'set-cmd-text -s \1'), (re.compile(r"""^set-cmd-text ['"](.*) ['"]$"""), r'set-cmd-text -s \1'),
(re.compile(r"""^set-cmd-text ['"](.*)['"]$"""), r'set-cmd-text \1'), (re.compile(r"""^set-cmd-text ['"](.*)['"]$"""), r'set-cmd-text \1'),
@ -1439,4 +1439,7 @@ CHANGED_KEY_COMMANDS = [
(re.compile(r'^scroll 0 -50$'), r'scroll up'), (re.compile(r'^scroll 0 -50$'), r'scroll up'),
(re.compile(r'^scroll 50 0$'), r'scroll right'), (re.compile(r'^scroll 50 0$'), r'scroll right'),
(re.compile(r'^scroll ([-\d]+ [-\d]+)$'), r'scroll-px \1'), (re.compile(r'^scroll ([-\d]+ [-\d]+)$'), r'scroll-px \1'),
(re.compile(r'^search *;; *clear-keychain$'), r'clear-keychain ;; search'),
(re.compile(r'^leave-mode$'), r'clear-keychain ;; leave-mode'),
] ]

12
tests/unit/config/test_config.py
View File

@ -195,9 +195,9 @@ class TestKeyConfigParser:
('download-page', 'download'), ('download-page', 'download'),
('cancel-download', 'download-cancel'), ('cancel-download', 'download-cancel'),
('search ""', 'search ;; clear-keychain'), ('search ""', 'clear-keychain ;; search'),
("search ''", 'search ;; clear-keychain'), ("search ''", 'clear-keychain ;; search'),
("search", 'search ;; clear-keychain'), ("search", 'clear-keychain ;; search'),
("search ;; foobar", None), ("search ;; foobar", None),
('search "foo"', None), ('search "foo"', None),
@ -218,6 +218,12 @@ class TestKeyConfigParser:
('scroll 50 50', 'scroll-px 50 50'), ('scroll 50 50', 'scroll-px 50 50'),
('scroll 0 0', 'scroll-px 0 0'), ('scroll 0 0', 'scroll-px 0 0'),
('scroll 23 42', 'scroll-px 23 42'), ('scroll 23 42', 'scroll-px 23 42'),
('search ;; clear-keychain', 'clear-keychain ;; search'),
('search;;clear-keychain', 'clear-keychain ;; search'),
('search;;foo', None),
('leave-mode', 'clear-keychain ;; leave-mode'),
('leave-mode ;; foo', None),
] ]
) )
def test_migrations(self, old, new_expected): def test_migrations(self, old, new_expected):