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

Patch out setting completion

Browse Source 
Let's bring it back with the completion refactoring
This commit is contained in:
Florian Bruhin 2017-06-15 14:18:53 +02:00
parent 6733e92b50
commit a1ed81f790
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
qutebrowser/completion/models/instances.py
View File

@ -27,9 +27,8 @@ Module attributes:
import functools import functools
from qutebrowser.completion.models import miscmodels, urlmodel, configmodel from qutebrowser.completion.models import miscmodels, urlmodel
from qutebrowser.utils import objreg, usertypes, log, debug from qutebrowser.utils import objreg, usertypes, log, debug
from qutebrowser.config import configdata, config
_instances = {} _instances = {}
@ -65,22 +64,6 @@ def _init_tab_completion():
_instances[usertypes.Completion.tab] = model _instances[usertypes.Completion.tab] = model
def _init_setting_completions():
"""Initialize setting completion models."""
log.completion.debug("Initializing setting completion.")
_instances[usertypes.Completion.section] = (
configmodel.SettingSectionCompletionModel())
_instances[usertypes.Completion.option] = {}
_instances[usertypes.Completion.value] = {}
for sectname in configdata.DATA:
opt_model = configmodel.SettingOptionCompletionModel(sectname)
_instances[usertypes.Completion.option][sectname] = opt_model
_instances[usertypes.Completion.value][sectname] = {}
for opt in configdata.DATA[sectname]:
val_model = configmodel.SettingValueCompletionModel(sectname, opt)
_instances[usertypes.Completion.value][sectname][opt] = val_model
def init_quickmark_completions(): def init_quickmark_completions():
"""Initialize quickmark completion models.""" """Initialize quickmark completion models."""
log.completion.debug("Initializing quickmark completion.") log.completion.debug("Initializing quickmark completion.")
@ -126,9 +109,6 @@ INITIALIZERS = {
usertypes.Completion.helptopic: _init_helptopic_completion, usertypes.Completion.helptopic: _init_helptopic_completion,
usertypes.Completion.url: _init_url_completion, usertypes.Completion.url: _init_url_completion,
usertypes.Completion.tab: _init_tab_completion, usertypes.Completion.tab: _init_tab_completion,
usertypes.Completion.section: _init_setting_completions,
usertypes.Completion.option: _init_setting_completions,
usertypes.Completion.value: _init_setting_completions,
usertypes.Completion.quickmark_by_name: init_quickmark_completions, usertypes.Completion.quickmark_by_name: init_quickmark_completions,
usertypes.Completion.bookmark_by_url: init_bookmark_completions, usertypes.Completion.bookmark_by_url: init_bookmark_completions,
usertypes.Completion.sessions: init_session_completion, usertypes.Completion.sessions: init_session_completion,
@ -163,12 +143,6 @@ def update(completions):
did_run.append(func) did_run.append(func)
@config.change_filter('aliases', function=True)
def _update_aliases():
"""Update completions that include command aliases."""
update([usertypes.Completion.command])
def init(): def init():
"""Initialize completions. Note this only connects signals.""" """Initialize completions. Note this only connects signals."""
quickmark_manager = objreg.get('quickmark-manager') quickmark_manager = objreg.get('quickmark-manager')
@ -192,5 +166,3 @@ def init():
functools.partial(update, [usertypes.Completion.command])) functools.partial(update, [usertypes.Completion.command]))
keyconf.changed.connect( keyconf.changed.connect(
functools.partial(update, [usertypes.Completion.bind])) functools.partial(update, [usertypes.Completion.bind]))
config.instance.changed.connect(_update_aliases)

3
qutebrowser/config/config.py
View File

@ -722,9 +722,6 @@ class ConfigManager(QObject):
e.__class__.__name__, e)) e.__class__.__name__, e))
@cmdutils.register(name='set', instance='config', star_args_optional=True) @cmdutils.register(name='set', instance='config', star_args_optional=True)
@cmdutils.argument('section_', completion=Completion.section)
@cmdutils.argument('option', completion=Completion.option)
@cmdutils.argument('values', completion=Completion.value)
@cmdutils.argument('win_id', win_id=True) @cmdutils.argument('win_id', win_id=True)
def set_command(self, win_id, section_=None, option=None, *values, def set_command(self, win_id, section_=None, option=None, *values,
temp=False, print_=False): temp=False, print_=False):