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

Simplify HintManager.start

Browse Source
This commit is contained in:
Florian Bruhin 2018-10-11 14:01:47 +02:00
parent b57db67670
commit 3e39fc0e69
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qutebrowser/browser/hints.py
View File

@ -730,21 +730,12 @@ class HintManager(QObject):
raise cmdexc.CommandError("Rapid hinting makes no sense with " raise cmdexc.CommandError("Rapid hinting makes no sense with "
"target {}!".format(name)) "target {}!".format(name))
if mode is None:
mode = config.val.hints.mode
else:
opt = config.instance.get_opt('hints.mode')
try:
opt.typ.to_py(mode)
except configexc.ValidationError as e:
raise cmdexc.CommandError("Invalid mode: {}".format(e))
self._check_args(target, *args) self._check_args(target, *args)
self._context = HintContext() self._context = HintContext()
self._context.tab = tab self._context.tab = tab
self._context.target = target self._context.target = target
self._context.rapid = rapid self._context.rapid = rapid
self._context.hint_mode = mode self._context.hint_mode = self._get_hint_mode(mode)
self._context.add_history = add_history self._context.add_history = add_history
self._context.first = first self._context.first = first
try: try:
@ -763,6 +754,19 @@ class HintManager(QObject):
self._context.tab.elements.find_css(selector, self._start_cb, self._context.tab.elements.find_css(selector, self._start_cb,
only_visible=True) only_visible=True)
def _get_hint_mode(self, mode):
"""Get the hinting mode to use based on a mode argument."""
if mode is None:
return config.val.hints.mode
opt = config.instance.get_opt('hints.mode')
try:
opt.typ.to_py(mode)
except configexc.ValidationError as e:
raise cmdexc.CommandError("Invalid mode: {}".format(e))
return mode
def current_mode(self): def current_mode(self):
"""Return the currently active hinting mode (or None otherwise).""" """Return the currently active hinting mode (or None otherwise)."""
if self._context is None: if self._context is None: