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

Fix lint.

Browse Source
This commit is contained in:
Florian Bruhin 2015-04-28 16:50:42 +02:00
parent 9e8c781871
commit 32562c6878
7 changed files with 83 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
qutebrowser/browser/commands.py
View File

@ -40,6 +40,7 @@ from qutebrowser.config import config, configexc
from qutebrowser.browser import webelem, inspector from qutebrowser.browser import webelem, inspector
from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils, from qutebrowser.utils import (message, usertypes, log, qtutils, urlutils,
objreg, utils) objreg, utils)
from qutebrowser.utils.usertypes import KeyMode
from qutebrowser.misc import editor from qutebrowser.misc import editor
from qutebrowser.keyinput import modeman from qutebrowser.keyinput import modeman
@ -1031,8 +1032,7 @@ class CommandDispatcher:
self._open(url, tab, bg, window) self._open(url, tab, bg, window)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher',
modes=[usertypes.KeyMode.insert], modes=[KeyMode.insert], hide=True, scope='window')
hide=True, scope='window')
def open_editor(self): def open_editor(self):
"""Open an external editor with the currently selected form field. """Open an external editor with the currently selected form field.
@ -1152,166 +1152,153 @@ class CommandDispatcher:
for _ in range(count): for _ in range(count):
view.search(view.search_text, flags) view.search(view.search_text, flags)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.caret, usertypes.KeyMode.visual], modes=[KeyMode.caret, KeyMode.visual], scope='window')
hide=True, scope='window')
def move_to_next_line(self): def move_to_next_line(self):
"""Move the cursor or select to the next line.""" """Move the cursor or select to the next line."""
modemanager = modeman._get_modeman(self._win_id) modemanager = modeman.get_modeman(self._win_id)
if modemanager.mode == usertypes.KeyMode.caret: if modemanager.mode == KeyMode.caret:
act = QWebPage.MoveToNextLine act = QWebPage.MoveToNextLine
else: else:
act = QWebPage.SelectNextLine act = QWebPage.SelectNextLine
self._current_widget().triggerPageAction(act) self._current_widget().triggerPageAction(act)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.caret, usertypes.KeyMode.visual], modes=[KeyMode.caret, KeyMode.visual], scope='window')
hide=True, scope='window')
def move_to_prev_line(self): def move_to_prev_line(self):
"""Move the cursor or select to the prev line.""" """Move the cursor or select to the prev line."""
modemanager = modeman._get_modeman(self._win_id) modemanager = modeman.get_modeman(self._win_id)
if modemanager.mode == usertypes.KeyMode.caret: if modemanager.mode == KeyMode.caret:
act = QWebPage.MoveToPreviousLine act = QWebPage.MoveToPreviousLine
else: else:
act = QWebPage.SelectPreviousLine act = QWebPage.SelectPreviousLine
self._current_widget().triggerPageAction(act) self._current_widget().triggerPageAction(act)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.caret, usertypes.KeyMode.visual], modes=[KeyMode.caret, KeyMode.visual], scope='window')
hide=True, scope='window')
def move_to_next_char(self): def move_to_next_char(self):
"""Move the cursor or select to the next char.""" """Move the cursor or select to the next char."""
modemanager = modeman._get_modeman(self._win_id) modemanager = modeman.get_modeman(self._win_id)
if modemanager.mode == usertypes.KeyMode.caret: if modemanager.mode == KeyMode.caret:
act = QWebPage.MoveToNextChar act = QWebPage.MoveToNextChar
else: else:
act = QWebPage.SelectNextChar act = QWebPage.SelectNextChar
self._current_widget().triggerPageAction(act) self._current_widget().triggerPageAction(act)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.caret, usertypes.KeyMode.visual], modes=[KeyMode.caret, KeyMode.visual], scope='window')
hide=True, scope='window')
def move_to_prev_char(self): def move_to_prev_char(self):
"""Move the cursor or select to the prev char.""" """Move the cursor or select to the prev char."""
modemanager = modeman._get_modeman(self._win_id) modemanager = modeman.get_modeman(self._win_id)
if modemanager.mode == usertypes.KeyMode.caret: if modemanager.mode == KeyMode.caret:
act = QWebPage.MoveToPreviousChar act = QWebPage.MoveToPreviousChar
else: else:
act = QWebPage.SelectPreviousChar act = QWebPage.SelectPreviousChar
self._current_widget().triggerPageAction(act) self._current_widget().triggerPageAction(act)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.caret, usertypes.KeyMode.visual], modes=[KeyMode.caret, KeyMode.visual], scope='window')
hide=True, scope='window')
def move_to_end_of_word(self): def move_to_end_of_word(self):
"""Move the cursor or select to the next word.""" """Move the cursor or select to the next word."""
modemanager = modeman._get_modeman(self._win_id) modemanager = modeman.get_modeman(self._win_id)
if modemanager.mode == usertypes.KeyMode.caret: if modemanager.mode == KeyMode.caret:
act = QWebPage.MoveToNextWord act = QWebPage.MoveToNextWord
else: else:
act = QWebPage.SelectNextWord act = QWebPage.SelectNextWord
self._current_widget().triggerPageAction(act) self._current_widget().triggerPageAction(act)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.caret, usertypes.KeyMode.visual], modes=[KeyMode.caret, KeyMode.visual],
hide=True, scope='window') scope='window')
def move_to_next_word(self): def move_to_next_word(self):
"""Move the cursor or select to the next word.""" """Move the cursor or select to the next word."""
modemanager = modeman._get_modeman(self._win_id) modemanager = modeman.get_modeman(self._win_id)
if modemanager.mode == usertypes.KeyMode.caret: if modemanager.mode == KeyMode.caret:
act = [QWebPage.MoveToNextWord, QWebPage.MoveToNextChar] act = [QWebPage.MoveToNextWord, QWebPage.MoveToNextChar]
else: else:
act = [QWebPage.SelectNextWord, QWebPage.SelectNextChar] act = [QWebPage.SelectNextWord, QWebPage.SelectNextChar]
for a in act: for a in act:
self._current_widget().triggerPageAction(a) self._current_widget().triggerPageAction(a)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.caret, usertypes.KeyMode.visual], modes=[KeyMode.caret, KeyMode.visual], scope='window')
hide=True, scope='window')
def move_to_prev_word(self): def move_to_prev_word(self):
"""Move the cursor or select to the prev word.""" """Move the cursor or select to the prev word."""
modemanager = modeman._get_modeman(self._win_id) modemanager = modeman.get_modeman(self._win_id)
if modemanager.mode == usertypes.KeyMode.caret: if modemanager.mode == KeyMode.caret:
act = QWebPage.MoveToPreviousWord act = QWebPage.MoveToPreviousWord
else: else:
act = QWebPage.SelectPreviousWord act = QWebPage.SelectPreviousWord
self._current_widget().triggerPageAction(act) self._current_widget().triggerPageAction(act)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.caret, usertypes.KeyMode.visual], modes=[KeyMode.caret, KeyMode.visual], scope='window')
hide=True, scope='window')
def move_to_start_of_line(self): def move_to_start_of_line(self):
"""Move the cursor or select to the start of line.""" """Move the cursor or select to the start of line."""
modemanager = modeman._get_modeman(self._win_id) modemanager = modeman.get_modeman(self._win_id)
if modemanager.mode == usertypes.KeyMode.caret: if modemanager.mode == KeyMode.caret:
act = QWebPage.MoveToStartOfLine act = QWebPage.MoveToStartOfLine
else: else:
act = QWebPage.SelectStartOfLine act = QWebPage.SelectStartOfLine
self._current_widget().triggerPageAction(act) self._current_widget().triggerPageAction(act)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.caret, usertypes.KeyMode.visual], modes=[KeyMode.caret, KeyMode.visual], scope='window')
hide=True, scope='window')
def move_to_end_of_line(self): def move_to_end_of_line(self):
"""Move the cursor or select to the end of line.""" """Move the cursor or select to the end of line."""
modemanager = modeman._get_modeman(self._win_id) modemanager = modeman.get_modeman(self._win_id)
if modemanager.mode == usertypes.KeyMode.caret: if modemanager.mode == KeyMode.caret:
act = QWebPage.MoveToEndOfLine act = QWebPage.MoveToEndOfLine
else: else:
act = QWebPage.SelectEndOfLine act = QWebPage.SelectEndOfLine
self._current_widget().triggerPageAction(act) self._current_widget().triggerPageAction(act)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.caret, usertypes.KeyMode.visual], modes=[KeyMode.caret, KeyMode.visual], scope='window')
hide=True, scope='window')
def move_to_start_of_block(self): def move_to_start_of_block(self):
"""Move the cursor or select to the start of block.""" """Move the cursor or select to the start of block."""
modemanager = modeman._get_modeman(self._win_id) modemanager = modeman.get_modeman(self._win_id)
if modemanager.mode == usertypes.KeyMode.caret: if modemanager.mode == KeyMode.caret:
act = QWebPage.MoveToStartOfBlock act = QWebPage.MoveToStartOfBlock
else: else:
act = QWebPage.SelectStartOfBlock act = QWebPage.SelectStartOfBlock
self._current_widget().triggerPageAction(act) self._current_widget().triggerPageAction(act)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.caret, usertypes.KeyMode.visual], modes=[KeyMode.caret, KeyMode.visual], scope='window')
hide=True, scope='window')
def move_to_end_of_block(self): def move_to_end_of_block(self):
"""Move the cursor or select to the end of block.""" """Move the cursor or select to the end of block."""
modemanager = modeman._get_modeman(self._win_id) modemanager = modeman.get_modeman(self._win_id)
if modemanager.mode == usertypes.KeyMode.caret: if modemanager.mode == KeyMode.caret:
act = QWebPage.MoveToEndOfBlock act = QWebPage.MoveToEndOfBlock
else: else:
act = QWebPage.SelectEndOfBlock act = QWebPage.SelectEndOfBlock
self._current_widget().triggerPageAction(act) self._current_widget().triggerPageAction(act)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.caret, usertypes.KeyMode.visual], modes=[KeyMode.caret, KeyMode.visual], scope='window')
hide=True, scope='window')
def move_to_start_of_document(self): def move_to_start_of_document(self):
"""Move the cursor or select to the start of document.""" """Move the cursor or select to the start of document."""
modemanager = modeman._get_modeman(self._win_id) modemanager = modeman.get_modeman(self._win_id)
if modemanager.mode == usertypes.KeyMode.caret: if modemanager.mode == KeyMode.caret:
act = QWebPage.MoveToStartOfDocument act = QWebPage.MoveToStartOfDocument
else: else:
act = QWebPage.SelectStartOfDocument act = QWebPage.SelectStartOfDocument
self._current_widget().triggerPageAction(act) self._current_widget().triggerPageAction(act)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.caret, usertypes.KeyMode.visual], modes=[KeyMode.caret, KeyMode.visual], scope='window')
hide=True, scope='window')
def move_to_end_of_document(self): def move_to_end_of_document(self):
"""Move the cursor or select to the end of document.""" """Move the cursor or select to the end of document."""
modemanager = modeman._get_modeman(self._win_id) modemanager = modeman.get_modeman(self._win_id)
if modemanager.mode == usertypes.KeyMode.caret: if modemanager.mode == KeyMode.caret:
act = QWebPage.MoveToEndOfDocument act = QWebPage.MoveToEndOfDocument
else: else:
act = QWebPage.SelectEndOfDocument act = QWebPage.SelectEndOfDocument
self._current_widget().triggerPageAction(act) self._current_widget().triggerPageAction(act)
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.visual], modes=[KeyMode.visual], scope='window')
hide=True, scope='window')
def yank_selected(self, sel=False): def yank_selected(self, sel=False):
"""Yank selected text to the clipboard or primary selection. """Yank selected text to the clipboard or primary selection.
@ -1332,12 +1319,11 @@ class CommandDispatcher:
target = "clipboard" target = "clipboard"
log.misc.debug("Yanking to {}: '{}'".format(target, s)) log.misc.debug("Yanking to {}: '{}'".format(target, s))
clipboard.setText(s, mode) clipboard.setText(s, mode)
message.info(self._win_id, "{} {} yanked to {}" message.info(self._win_id, "{} {} yanked to {}".format(
.format(len(s), "char" if len(s) == 1 else "chars", target)) len(s), "char" if len(s) == 1 else "chars", target))
@cmdutils.register(instance='command-dispatcher', @cmdutils.register(instance='command-dispatcher', hide=True,
modes=[usertypes.KeyMode.visual], modes=[KeyMode.visual], scope='window')
hide=True, scope='window')
def drop_selection(self): def drop_selection(self):
"""Drop selection and stay in visual mode.""" """Drop selection and stay in visual mode."""
self._current_widget().triggerPageAction(QWebPage.MoveToNextChar) self._current_widget().triggerPageAction(QWebPage.MoveToNextChar)

11
qutebrowser/browser/webview.py
View File

@ -23,11 +23,10 @@ import sys
import itertools import itertools
import functools import functools
from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QTimer, QUrl, QPoint from PyQt5.QtCore import pyqtSignal, pyqtSlot, Qt, QTimer, QUrl
from PyQt5.QtWidgets import QApplication, QStyleFactory from PyQt5.QtWidgets import QApplication, QStyleFactory
from PyQt5.QtWebKit import QWebSettings from PyQt5.QtWebKit import QWebSettings
from PyQt5.QtWebKitWidgets import QWebView, QWebPage from PyQt5.QtWebKitWidgets import QWebView, QWebPage
from PyQt5.QtGui import QMouseEvent
from qutebrowser.config import config from qutebrowser.config import config
from qutebrowser.keyinput import modeman from qutebrowser.keyinput import modeman
@ -437,7 +436,8 @@ class WebView(QWebView):
"entered.".format(mode)) "entered.".format(mode))
self.setFocusPolicy(Qt.NoFocus) self.setFocusPolicy(Qt.NoFocus)
elif mode in (usertypes.KeyMode.caret, usertypes.KeyMode.visual): elif mode in (usertypes.KeyMode.caret, usertypes.KeyMode.visual):
self.settings().setAttribute(QWebSettings.CaretBrowsingEnabled, True) settings = self.settings()
settings.setAttribute(QWebSettings.CaretBrowsingEnabled, True)
self.clearFocus() self.clearFocus()
self.setFocus(Qt.OtherFocusReason) self.setFocus(Qt.OtherFocusReason)
@ -449,11 +449,12 @@ class WebView(QWebView):
log.webview.debug("Restoring focus policy because mode {} was " log.webview.debug("Restoring focus policy because mode {} was "
"left.".format(mode)) "left.".format(mode))
elif mode in (usertypes.KeyMode.caret, usertypes.KeyMode.visual): elif mode in (usertypes.KeyMode.caret, usertypes.KeyMode.visual):
if self.settings().testAttribute(QWebSettings.CaretBrowsingEnabled): settings = self.settings()
if settings.testAttribute(QWebSettings.CaretBrowsingEnabled):
if mode == usertypes.KeyMode.visual and self.hasSelection(): if mode == usertypes.KeyMode.visual and self.hasSelection():
# Remove selection if exist # Remove selection if exist
self.triggerPageAction(QWebPage.MoveToNextChar) self.triggerPageAction(QWebPage.MoveToNextChar)
self.settings().setAttribute(QWebSettings.CaretBrowsingEnabled, False) settings.setAttribute(QWebSettings.CaretBrowsingEnabled, False)
self.setFocusPolicy(Qt.WheelFocus) self.setFocusPolicy(Qt.WheelFocus)

9
qutebrowser/keyinput/modeman.py
View File

@ -24,7 +24,6 @@ import functools
from PyQt5.QtCore import pyqtSignal, Qt, QObject, QEvent from PyQt5.QtCore import pyqtSignal, Qt, QObject, QEvent
from PyQt5.QtWidgets import QApplication from PyQt5.QtWidgets import QApplication
from PyQt5.QtWebKitWidgets import QWebView from PyQt5.QtWebKitWidgets import QWebView
from PyQt5.QtWebKit import QWebSettings
from qutebrowser.keyinput import modeparsers, keyparser from qutebrowser.keyinput import modeparsers, keyparser
from qutebrowser.config import config from qutebrowser.config import config
@ -100,25 +99,25 @@ def init(win_id, parent):
return modeman return modeman
def _get_modeman(win_id): def get_modeman(win_id):
"""Get a modemanager object.""" """Get a modemanager object."""
return objreg.get('mode-manager', scope='window', window=win_id) return objreg.get('mode-manager', scope='window', window=win_id)
def enter(win_id, mode, reason=None, only_if_normal=False): def enter(win_id, mode, reason=None, only_if_normal=False):
"""Enter the mode 'mode'.""" """Enter the mode 'mode'."""
_get_modeman(win_id).enter(mode, reason, only_if_normal) get_modeman(win_id).enter(mode, reason, only_if_normal)
def leave(win_id, mode, reason=None): def leave(win_id, mode, reason=None):
"""Leave the mode 'mode'.""" """Leave the mode 'mode'."""
_get_modeman(win_id).leave(mode, reason) get_modeman(win_id).leave(mode, reason)
def maybe_leave(win_id, mode, reason=None): def maybe_leave(win_id, mode, reason=None):
"""Convenience method to leave 'mode' without exceptions.""" """Convenience method to leave 'mode' without exceptions."""
try: try:
_get_modeman(win_id).leave(mode, reason) get_modeman(win_id).leave(mode, reason)
except NotInModeError as e: except NotInModeError as e:
# This is rather likely to happen, so we only log to debug log. # This is rather likely to happen, so we only log to debug log.
log.modes.debug("{} (leave reason: {})".format(e, reason)) log.modes.debug("{} (leave reason: {})".format(e, reason))

2
qutebrowser/keyinput/modeparsers.py
View File

@ -219,6 +219,7 @@ class HintKeyParser(keyparser.CommandKeyParser):
window=self._win_id, tab='current') window=self._win_id, tab='current')
hintmanager.handle_partial_key(keystr) hintmanager.handle_partial_key(keystr)
class CaretKeyParser(keyparser.CommandKeyParser): class CaretKeyParser(keyparser.CommandKeyParser):
"""KeyParser for Caret mode.""" """KeyParser for Caret mode."""
@ -231,6 +232,7 @@ class CaretKeyParser(keyparser.CommandKeyParser):
def __repr__(self): def __repr__(self):
return utils.get_repr(self) return utils.get_repr(self)
class VisualKeyParser(keyparser.CommandKeyParser): class VisualKeyParser(keyparser.CommandKeyParser):
"""KeyParser for Visual mode.""" """KeyParser for Visual mode."""

2
qutebrowser/mainwindow/statusbar/bar.py
View File

@ -274,7 +274,7 @@ class StatusBar(QWidget):
return self._visual_active return self._visual_active
def _set_mode_active(self, mode, val): def _set_mode_active(self, mode, val):
"""Setter for self.insert_active, self.caret_active or self.visual_active. """Setter for self.{insert,caret,visual}_active.
Re-set the stylesheet after setting the value, so everything gets Re-set the stylesheet after setting the value, so everything gets
updated by Qt properly. updated by Qt properly.