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

hints: move _filterstr into _context

Browse Source
This commit is contained in:
Jakub Klinkovský 2016-08-10 18:48:10 +02:00
parent efb680dfb1
commit 58ded41e5d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qutebrowser/browser/hints.py
View File

@ -79,6 +79,7 @@ class HintContext:
to_follow: The link to follow when enter is pressed. to_follow: The link to follow when enter is pressed.
args: Custom arguments for userscript/spawn args: Custom arguments for userscript/spawn
rapid: Whether to do rapid hinting. rapid: Whether to do rapid hinting.
filterstr: Used to save the filter string for restoring in rapid mode.
tab: The WebTab object we started hinting in. tab: The WebTab object we started hinting in.
group: The group of web elements to hint. group: The group of web elements to hint.
""" """
@ -90,6 +91,7 @@ class HintContext:
self.baseurl = None self.baseurl = None
self.to_follow = None self.to_follow = None
self.rapid = False self.rapid = False
self.filterstr = None
self.frames = [] self.frames = []
self.args = [] self.args = []
self.tab = None self.tab = None
@ -309,7 +311,6 @@ class HintManager(QObject):
_context: The HintContext for the current invocation. _context: The HintContext for the current invocation.
_win_id: The window ID this HintManager is associated with. _win_id: The window ID this HintManager is associated with.
_tab_id: The tab ID this HintManager is associated with. _tab_id: The tab ID this HintManager is associated with.
_filterstr: Used to save the filter string for restoring in rapid mode.
Signals: Signals:
See HintActions See HintActions
@ -342,7 +343,6 @@ class HintManager(QObject):
self._win_id = win_id self._win_id = win_id
self._tab_id = tab_id self._tab_id = tab_id
self._context = None self._context = None
self._filterstr = None
self._word_hinter = WordHinter() self._word_hinter = WordHinter()
self._actions = HintActions(win_id) self._actions = HintActions(win_id)
@ -381,7 +381,6 @@ class HintManager(QObject):
window=self._win_id) window=self._win_id)
message_bridge.maybe_reset_text(text) message_bridge.maybe_reset_text(text)
self._context = None self._context = None
self._filterstr = None
def _hint_strings(self, elems): def _hint_strings(self, elems):
"""Calculate the hint strings for elems. """Calculate the hint strings for elems.
@ -861,9 +860,9 @@ class HintManager(QObject):
and `self._filterstr` are None, all hints are shown. and `self._filterstr` are None, all hints are shown.
""" """
if filterstr is None: if filterstr is None:
filterstr = self._filterstr filterstr = self._context.filterstr
else: else:
self._filterstr = filterstr self._context.filterstr = filterstr
visible = [] visible = []
for elem in self._context.all_elems: for elem in self._context.all_elems: