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

Get rid of quickmark_by_name completion.

Browse Source
This commit is contained in:
Florian Bruhin 2015-07-29 12:35:43 +02:00
parent c016e8a4cf
commit 69ade32cb9
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -97,13 +97,10 @@ def init_quickmark_completions():
"""Initialize quickmark completion models.""" """Initialize quickmark completion models."""
log.completion.debug("Initializing quickmark completion.") log.completion.debug("Initializing quickmark completion.")
try: try:
_instances[usertypes.Completion.quickmark_by_url].deleteLater()
_instances[usertypes.Completion.quickmark_by_name].deleteLater() _instances[usertypes.Completion.quickmark_by_name].deleteLater()
except KeyError: except KeyError:
pass pass
model = _init_model(miscmodels.QuickmarkCompletionModel, 'url') model = _init_model(miscmodels.QuickmarkCompletionModel)
_instances[usertypes.Completion.quickmark_by_url] = model
model = _init_model(miscmodels.QuickmarkCompletionModel, 'name')
_instances[usertypes.Completion.quickmark_by_name] = model _instances[usertypes.Completion.quickmark_by_name] = model
@ -138,7 +135,6 @@ INITIALIZERS = {
usertypes.Completion.section: _init_setting_completions, usertypes.Completion.section: _init_setting_completions,
usertypes.Completion.option: _init_setting_completions, usertypes.Completion.option: _init_setting_completions,
usertypes.Completion.value: _init_setting_completions, usertypes.Completion.value: _init_setting_completions,
usertypes.Completion.quickmark_by_url: init_quickmark_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,
@ -176,8 +172,7 @@ 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')
quickmark_manager.changed.connect( quickmark_manager.changed.connect(
functools.partial(update, [usertypes.Completion.quickmark_by_url, functools.partial(update, [usertypes.Completion.quickmark_by_name]))
usertypes.Completion.quickmark_by_name]))
bookmark_manager = objreg.get('bookmark-manager') bookmark_manager = objreg.get('bookmark-manager')
bookmark_manager.changed.connect( bookmark_manager.changed.connect(

9
qutebrowser/completion/models/miscmodels.py
View File

@ -96,19 +96,12 @@ class QuickmarkCompletionModel(base.BaseCompletionModel):
# pylint: disable=abstract-method # pylint: disable=abstract-method
def __init__(self, match_field='url', parent=None): def __init__(self, parent=None):
super().__init__(parent) super().__init__(parent)
cat = self.new_category("Quickmarks") cat = self.new_category("Quickmarks")
quickmarks = objreg.get('quickmark-manager').marks.items() quickmarks = objreg.get('quickmark-manager').marks.items()
if match_field == 'url':
for qm_name, qm_url in quickmarks:
self.new_item(cat, qm_url, qm_name)
elif match_field == 'name':
for qm_name, qm_url in quickmarks: for qm_name, qm_url in quickmarks:
self.new_item(cat, qm_name, qm_url) self.new_item(cat, qm_name, qm_url)
else:
raise ValueError("Invalid value '{}' for match_field!".format(
match_field))
class BookmarkCompletionModel(base.BaseCompletionModel): class BookmarkCompletionModel(base.BaseCompletionModel):

5
qutebrowser/utils/usertypes.py
View File

@ -236,9 +236,8 @@ KeyMode = enum('KeyMode', ['normal', 'hint', 'command', 'yesno', 'prompt',
# Available command completions # Available command completions
Completion = enum('Completion', ['command', 'section', 'option', 'value', Completion = enum('Completion', ['command', 'section', 'option', 'value',
'helptopic', 'quickmark_by_url', 'helptopic', 'quickmark_by_name',
'quickmark_by_name', 'bookmark_by_url', 'bookmark_by_url', 'url', 'sessions'])
'url', 'sessions'])
# Exit statuses for errors. Needs to be an int for sys.exit. # Exit statuses for errors. Needs to be an int for sys.exit.