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

new method

Browse Source
This commit is contained in:
Argn0 2018-01-11 14:03:43 +01:00
parent 4932323d3b
commit 66d0591684
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,3 @@
{
"python.pythonPath": "${workspaceFolder}/.venv/bin/python3.5"
}

23
qutebrowser/mainwindow/statusbar/command.py
View File

@ -68,7 +68,6 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
self.textChanged.connect(self.update_completion) self.textChanged.connect(self.update_completion)
self.textChanged.connect(self.updateGeometry) self.textChanged.connect(self.updateGeometry)
self.textChanged.connect(self._incremental_search) self.textChanged.connect(self._incremental_search)
self.textChanged.connect(self._exit_prefix)
def prefix(self): def prefix(self):
"""Get the currently entered command prefix.""" """Get the currently entered command prefix."""
@ -222,6 +221,17 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
"'{}'!".format(text)) "'{}'!".format(text))
super().setText(text) super().setText(text)
def setText(self, text):
"""Extend setText to set prefix and make sure the prompt is ok."""
if not text:
pass
elif text[0] in modeparsers.STARTCHARS:
super().set_prompt(text[0])
else:
raise utils.Unreachable("setText got called with invalid text "
"'{}'!".format(text))
super().setText(text)
def keyPressEvent(self, e): def keyPressEvent(self, e):
"""Override keyPressEvent to ignore Return key presses. """Override keyPressEvent to ignore Return key presses.
@ -229,6 +239,11 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
Enter/Shift+Enter/etc. will cause QLineEdit to think it's finished Enter/Shift+Enter/etc. will cause QLineEdit to think it's finished
without command_accept to be called. without command_accept to be called.
""" """
text = self.text()
if text in modeparsers.STARTCHARS and e.key() == Qt.Key_Backspace:
modeman.leave(self._win_id, usertypes.KeyMode.command,
'prefix deleted')
if e.key() == Qt.Key_Return: if e.key() == Qt.Key_Return:
e.ignore() e.ignore()
return return
@ -256,9 +271,3 @@ class Command(misc.MinimalLineEditMixin, misc.CommandLineEdit):
if self.prefix() in ['/', '?']: if self.prefix() in ['/', '?']:
self.got_cmd[str].emit(search_prefixes[text[0]] + text[1:]) self.got_cmd[str].emit(search_prefixes[text[0]] + text[1:])
@pyqtSlot(str)
def _exit_prefix(self, text):
if not text or text[0] not in modeparsers.STARTCHARS:
modeman.leave(self._win_id, usertypes.KeyMode.command,
'prefix deleted', maybe=True)