From b750d93891c9f697d5d4db9cdb7713fa7e0ab975 Mon Sep 17 00:00:00 2001 From: addictedtoflames Date: Mon, 8 Aug 2016 17:32:41 +0100 Subject: [PATCH 1/3] add time units to timeout descriptions Changed the description for the 'hints/auto-follow-timeout', 'input/timeout' and 'input/partial-timeout' settings to specify that the time should be given in milliseconds --- qutebrowser/config/configdata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index df673a50b..dd3ef7269 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -488,13 +488,13 @@ def data(readonly=False): ('input', sect.KeyValue( ('timeout', SettingValue(typ.Int(minval=0, maxval=MAXVALS['int']), '500'), - "Timeout for ambiguous key bindings.\n\n" + "Timeout (in milliseconds) for ambiguous key bindings.\n\n" "If the current input forms both a complete match and a partial " "match, the complete match will be executed after this time."), ('partial-timeout', SettingValue(typ.Int(minval=0, maxval=MAXVALS['int']), '5000'), - "Timeout for partially typed key bindings.\n\n" + "Timeout (in milliseconds) for partially typed key bindings.\n\n" "If the current input forms only partial matches, the keystring " "will be cleared after this time."), @@ -933,7 +933,7 @@ def data(readonly=False): ('auto-follow-timeout', SettingValue(typ.Int(), '0'), - "A timeout to inhibit normal-mode key bindings after a successful" + "A timeout (in milliseconds) to inhibit normal-mode key bindings after a successful" "auto-follow."), ('next-regexes', From 9fc44e54a442e7a321ef7b61d79afef0b972702b Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 8 Aug 2016 19:56:11 +0200 Subject: [PATCH 2/3] Fix long line --- qutebrowser/config/configdata.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py index dd3ef7269..fd0d5925a 100644 --- a/qutebrowser/config/configdata.py +++ b/qutebrowser/config/configdata.py @@ -933,8 +933,8 @@ def data(readonly=False): ('auto-follow-timeout', SettingValue(typ.Int(), '0'), - "A timeout (in milliseconds) to inhibit normal-mode key bindings after a successful" - "auto-follow."), + "A timeout (in milliseconds) to inhibit normal-mode key bindings " + "after a successful auto-follow."), ('next-regexes', SettingValue(typ.List(typ.Regex(flags=re.IGNORECASE)), From e97765c1c593414b9b4e748486d95be1fd3abb55 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 8 Aug 2016 19:56:24 +0200 Subject: [PATCH 3/3] Regenerate docs --- README.asciidoc | 1 + doc/help/settings.asciidoc | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index f0899b6c1..1012eeed2 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -225,6 +225,7 @@ Contributors, sorted by the number of commits in descending order: * haxwithaxe * evan * dylan araps +* addictedtoflames * Xitian9 * Tomas Orsava * Tom Janson diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc index c0b4ad878..628a029e1 100644 --- a/doc/help/settings.asciidoc +++ b/doc/help/settings.asciidoc @@ -87,8 +87,8 @@ [options="header",width="75%",cols="25%,75%"] |============== |Setting|Description -|<>|Timeout for ambiguous key bindings. -|<>|Timeout for partially typed key bindings. +|<>|Timeout (in milliseconds) for ambiguous key bindings. +|<>|Timeout (in milliseconds) for partially typed key bindings. |<>|Whether to switch to insert mode when clicking flash and other plugins. |<>|Whether to leave insert mode if a non-editable element is clicked. |<>|Whether to automatically enter insert mode if an editable element is focused after page load. @@ -182,7 +182,7 @@ |<>|Make chars in hint strings uppercase. |<>|The dictionary file to be used by the word hints. |<>|Follow a hint immediately when the hint text is completely matched. -|<>|A timeout to inhibit normal-mode key bindings after a successfulauto-follow. +|<>|A timeout (in milliseconds) to inhibit normal-mode key bindings after a successful auto-follow. |<>|A comma-separated list of regexes to use for 'next' links. |<>|A comma-separated list of regexes to use for 'prev' links. |<>|Which implementation to use to find elements to hint. @@ -900,7 +900,7 @@ Options related to input modes. [[input-timeout]] === timeout -Timeout for ambiguous key bindings. +Timeout (in milliseconds) for ambiguous key bindings. If the current input forms both a complete match and a partial match, the complete match will be executed after this time. @@ -908,7 +908,7 @@ Default: +pass:[500]+ [[input-partial-timeout]] === partial-timeout -Timeout for partially typed key bindings. +Timeout (in milliseconds) for partially typed key bindings. If the current input forms only partial matches, the keystring will be cleared after this time. @@ -1667,7 +1667,7 @@ Default: +pass:[true]+ [[hints-auto-follow-timeout]] === auto-follow-timeout -A timeout to inhibit normal-mode key bindings after a successfulauto-follow. +A timeout (in milliseconds) to inhibit normal-mode key bindings after a successful auto-follow. Default: +pass:[0]+