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

Always set model when needed.

Browse Source
This commit is contained in:
Florian Bruhin 2014-03-26 20:19:46 +01:00
parent 638fdca573
commit 3635a40c56
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qutebrowser/widgets/completion.py
View File

@ -51,6 +51,7 @@ class CompletionView(QTreeView):
Attributes: Attributes:
_model: The currently active filter model. _model: The currently active filter model.
_lastmodel: The model set in the last iteration.
_STYLESHEET: The stylesheet template for the CompletionView. _STYLESHEET: The stylesheet template for the CompletionView.
_completion_models: dict of available completion models. _completion_models: dict of available completion models.
_ignore_next: Whether to ignore the next cmd_text_changed signal. _ignore_next: Whether to ignore the next cmd_text_changed signal.
@ -102,6 +103,7 @@ class CompletionView(QTreeView):
super().__init__(parent) super().__init__(parent)
self._enabled = config.config.get('general', 'show_completion') self._enabled = config.config.get('general', 'show_completion')
self._model = None self._model = None
self._lastmodel = None
self._completion_models = { self._completion_models = {
'command': CompletionFilterModel(CommandCompletionModel(self)), 'command': CompletionFilterModel(CommandCompletionModel(self)),
'setting': CompletionFilterModel(SettingCompletionModel(self)), 'setting': CompletionFilterModel(SettingCompletionModel(self)),
@ -182,7 +184,9 @@ class CompletionView(QTreeView):
model: An index into self._completion_models. model: An index into self._completion_models.
""" """
self._lastmidel = self._model
m = self._completion_models[model] m = self._completion_models[model]
logging.debug("Setting model to {}".format(m))
self.setModel(m) self.setModel(m)
self._model = m self._model = m
self.expandAll() self.expandAll()
@ -216,11 +220,8 @@ class CompletionView(QTreeView):
text = text.lstrip(':') text = text.lstrip(':')
parts = text.split(' ') # FIXME what about commands which use shutil? parts = text.split(' ') # FIXME what about commands which use shutil?
if not text or text.endswith(' '): model = self._get_new_completion(parts)
# The completion only needs to be changed if: if model != self._lastmodel:
# - Only ":" is entered, OR
# - The text ends with a space, so we're starting a new part.
model = self._get_new_completion(parts)
if model is None: if model is None:
self.hide() self.hide()
self._completing = False self._completing = False