diff options
| author | Florian Bruhin <git@the-compiler.org> | 2015-04-21 21:28:39 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2015-04-21 21:29:00 +0200 |
| commit | 6c8e073dc80c3da16fd7735a8cd02dc8bf7d3685 (patch) | |
| tree | 4fb21b1d2ac43a2a3325258d5951b013be010ee8 /qutebrowser/keyinput/modeman.py | |
| parent | 3164ee06eb62a1af86cb565df5f14a1f91b34ac0 (diff) | |
| parent | e603d9a2d07b879ec221f515b14fbe84d1e1faab (diff) | |
| download | qutebrowser-6c8e073dc80c3da16fd7735a8cd02dc8bf7d3685.tar.gz qutebrowser-6c8e073dc80c3da16fd7735a8cd02dc8bf7d3685.zip | |
Merge branch 'caret_visual_mode' of https://github.com/artur-shaik/qutebrowser into visual
Conflicts:
qutebrowser/browser/commands.py
qutebrowser/browser/webview.py
qutebrowser/config/configdata.py
Diffstat (limited to 'qutebrowser/keyinput/modeman.py')
| -rw-r--r-- | qutebrowser/keyinput/modeman.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qutebrowser/keyinput/modeman.py b/qutebrowser/keyinput/modeman.py index 7d77f872c..44ac96817 100644 --- a/qutebrowser/keyinput/modeman.py +++ b/qutebrowser/keyinput/modeman.py @@ -24,6 +24,7 @@ import functools from PyQt5.QtCore import pyqtSignal, Qt, QObject, QEvent from PyQt5.QtWidgets import QApplication from PyQt5.QtWebKitWidgets import QWebView +from PyQt5.QtWebKit import QWebSettings from qutebrowser.keyinput import modeparsers, keyparser from qutebrowser.config import config @@ -78,6 +79,8 @@ def init(win_id, parent): KM.prompt: keyparser.PassthroughKeyParser(win_id, 'prompt', modeman, warn=False), KM.yesno: modeparsers.PromptKeyParser(win_id, modeman), + KM.caret: modeparsers.CaretKeyParser(win_id, modeman), + KM.visual: modeparsers.VisualKeyParser(win_id, modeman), } objreg.register('keyparsers', keyparsers, scope='window', window=win_id) modeman.destroyed.connect( @@ -92,6 +95,8 @@ def init(win_id, parent): passthrough=True) modeman.register(KM.prompt, keyparsers[KM.prompt].handle, passthrough=True) modeman.register(KM.yesno, keyparsers[KM.yesno].handle) + modeman.register(KM.caret, keyparsers[KM.caret].handle, passthrough=True) + modeman.register(KM.visual, keyparsers[KM.visual].handle, passthrough=True) return modeman |