Make on_* methods in tab private

This commit is contained in:
Florian Bruhin 2016-07-07 16:10:35 +02:00
parent 868f781f4d
commit 3c99436950
3 changed files with 13 additions and 12 deletions

View File

@ -152,7 +152,7 @@ class AbstractZoom(QObject):
self._win_id = win_id self._win_id = win_id
self._default_zoom_changed = False self._default_zoom_changed = False
self._init_neighborlist() self._init_neighborlist()
objreg.get('config').changed.connect(self.on_config_changed) objreg.get('config').changed.connect(self._on_config_changed)
# # FIXME:refactor is this needed? # # FIXME:refactor is this needed?
# # For some reason, this signal doesn't get disconnected automatically # # For some reason, this signal doesn't get disconnected automatically
@ -162,7 +162,7 @@ class AbstractZoom(QObject):
# cfg.changed.disconnect, self.init_neighborlist)) # cfg.changed.disconnect, self.init_neighborlist))
@pyqtSlot(str, str) @pyqtSlot(str, str)
def on_config_changed(self, section, option): def _on_config_changed(self, section, option):
if section == 'ui' and option in ('zoom-levels', 'default-zoom'): if section == 'ui' and option in ('zoom-levels', 'default-zoom'):
if not self._default_zoom_changed: if not self._default_zoom_changed:
factor = float(config.get('ui', 'default-zoom')) / 100 factor = float(config.get('ui', 'default-zoom')) / 100
@ -212,7 +212,7 @@ class AbstractZoom(QObject):
self._set_factor_internal(float(default_zoom) / 100) self._set_factor_internal(float(default_zoom) / 100)
@pyqtSlot(QPoint) @pyqtSlot(QPoint)
def on_mouse_wheel_zoom(self, delta): def _on_mouse_wheel_zoom(self, delta):
"""Handle zooming via mousewheel requested by the web view.""" """Handle zooming via mousewheel requested by the web view."""
divider = config.get('input', 'mouse-zoom-divider') divider = config.get('input', 'mouse-zoom-divider')
factor = self.factor() + delta.y() / divider factor = self.factor() + delta.y() / divider
@ -235,13 +235,14 @@ class AbstractCaret(QObject):
self._win_id = win_id self._win_id = win_id
self._widget = None self._widget = None
self.selection_enabled = False self.selection_enabled = False
modeman.entered.connect(self.on_mode_entered) # pylint: disable=protected-access
modeman.left.connect(self.on_mode_left) modeman.entered.connect(self._on_mode_entered)
modeman.left.connect(self._on_mode_left)
def on_mode_entered(self, mode): def _on_mode_entered(self, mode):
raise NotImplementedError raise NotImplementedError
def on_mode_left(self): def _on_mode_left(self):
raise NotImplementedError raise NotImplementedError
def move_to_next_line(self, count=1): def move_to_next_line(self, count=1):
@ -461,7 +462,7 @@ class AbstractTab(QWidget):
self.caret._widget = widget self.caret._widget = widget
self.zoom._widget = widget self.zoom._widget = widget
self.search._widget = widget self.search._widget = widget
widget.mouse_wheel_zoom.connect(self.zoom.on_mouse_wheel_zoom) widget.mouse_wheel_zoom.connect(self.zoom._on_mouse_wheel_zoom)
widget.setParent(self) widget.setParent(self)
self.setFocusProxy(widget) self.setFocusProxy(widget)

View File

@ -51,12 +51,12 @@ class WebEngineCaret(tab.AbstractCaret):
## TODO ## TODO
@pyqtSlot(usertypes.KeyMode) @pyqtSlot(usertypes.KeyMode)
def on_mode_entered(self, mode): def _on_mode_entered(self, mode):
## TODO ## TODO
pass pass
@pyqtSlot(usertypes.KeyMode) @pyqtSlot(usertypes.KeyMode)
def on_mode_left(self): def _on_mode_left(self):
## TODO ## TODO
pass pass

View File

@ -80,7 +80,7 @@ class WebViewCaret(tabmod.AbstractCaret):
"""QtWebKit implementations related to moving the cursor/selection.""" """QtWebKit implementations related to moving the cursor/selection."""
@pyqtSlot(usertypes.KeyMode) @pyqtSlot(usertypes.KeyMode)
def on_mode_entered(self, mode): def _on_mode_entered(self, mode):
if mode != usertypes.KeyMode.caret: if mode != usertypes.KeyMode.caret:
return return
@ -104,7 +104,7 @@ class WebViewCaret(tabmod.AbstractCaret):
utils.read_file('javascript/position_caret.js')) utils.read_file('javascript/position_caret.js'))
@pyqtSlot() @pyqtSlot()
def on_mode_left(self): def _on_mode_left(self):
settings = self._widget.settings() settings = self._widget.settings()
if settings.testAttribute(QWebSettings.CaretBrowsingEnabled): if settings.testAttribute(QWebSettings.CaretBrowsingEnabled):
if self.selection_enabled and self._widget.hasSelection(): if self.selection_enabled and self._widget.hasSelection():