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

Use signals instead of making scripts public

Browse Source
This commit is contained in:
Florian Bruhin 2018-09-28 19:27:03 +02:00
parent 6d0d408785
commit 54c39484d3
3 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qutebrowser/browser/browsertab.py
View File

@ -248,8 +248,16 @@ class AbstractSearch(QObject):
this view. this view.
_flags: The flags of the last search (needs to be set by subclasses). _flags: The flags of the last search (needs to be set by subclasses).
_widget: The underlying WebView widget. _widget: The underlying WebView widget.
Signals:
finished: Emitted when a search was finished.
arg: True if the text was found, False otherwise.
cleared: Emitted when an existing search was cleared.
""" """
finished = pyqtSignal(bool)
cleared = pyqtSignal()
def __init__(self, parent=None): def __init__(self, parent=None):
super().__init__(parent) super().__init__(parent)
self._widget = None self._widget = None

24
qutebrowser/browser/webengine/webenginetab.py
View File

@ -192,9 +192,11 @@ class WebEngineSearch(browsertab.AbstractSearch):
flag_text = '' flag_text = ''
log.webview.debug(' '.join([caller, found_text, text, flag_text]) log.webview.debug(' '.join([caller, found_text, text, flag_text])
.strip()) .strip())
if callback is not None: if callback is not None:
callback(found) callback(found)
self._tab.scripts.update_stylesheet(searching=found) self.finished.emit(found)
self._widget.findText(text, flags, wrapped_callback) self._widget.findText(text, flags, wrapped_callback)
def search(self, text, *, ignore_case='never', reverse=False, def search(self, text, *, ignore_case='never', reverse=False,
@ -216,7 +218,7 @@ class WebEngineSearch(browsertab.AbstractSearch):
def clear(self): def clear(self):
if self.search_displayed: if self.search_displayed:
self._tab.scripts.update_stylesheet(searching=False) self.cleared.emit()
self.search_displayed = False self.search_displayed = False
self._widget.findText('') self._widget.findText('')
@ -839,15 +841,21 @@ class _WebEngineScripts(QObject):
self._greasemonkey = objreg.get('greasemonkey') self._greasemonkey = objreg.get('greasemonkey')
def connect_signals(self): def connect_signals(self):
"""Connect signals to our private slots."""
config.instance.changed.connect(self._on_config_changed) config.instance.changed.connect(self._on_config_changed)
self._tab.search.cleared.connect(functools.partial(
self._update_stylesheet, searching=False))
self._tab.search.finished.connect(self._update_stylesheet)
@pyqtSlot(str) @pyqtSlot(str)
def _on_config_changed(self, option): def _on_config_changed(self, option):
if option in ['scrolling.bar', 'content.user_stylesheets']: if option in ['scrolling.bar', 'content.user_stylesheets']:
self._init_stylesheet() self._init_stylesheet()
self.update_stylesheet() self._update_stylesheet()
def update_stylesheet(self, searching=False): @pyqtSlot(bool)
def _update_stylesheet(self, searching=False):
"""Update the custom stylesheet in existing tabs.""" """Update the custom stylesheet in existing tabs."""
css = shared.get_user_stylesheet(searching=searching) css = shared.get_user_stylesheet(searching=searching)
code = javascript.assemble('stylesheet', 'set_css', css) code = javascript.assemble('stylesheet', 'set_css', css)
@ -1029,7 +1037,7 @@ class WebEngineTab(browsertab.AbstractTab):
self.action = WebEngineAction(tab=self) self.action = WebEngineAction(tab=self)
self.audio = WebEngineAudio(tab=self, parent=self) self.audio = WebEngineAudio(tab=self, parent=self)
self._permissions = _WebEnginePermissions(tab=self, parent=self) self._permissions = _WebEnginePermissions(tab=self, parent=self)
self.scripts = _WebEngineScripts(tab=self, parent=self) self._scripts = _WebEngineScripts(tab=self, parent=self)
# We're assigning settings in _set_widget # We're assigning settings in _set_widget
self.settings = webenginesettings.WebEngineSettings(settings=None) self.settings = webenginesettings.WebEngineSettings(settings=None)
self._set_widget(widget) self._set_widget(widget)
@ -1038,13 +1046,13 @@ class WebEngineTab(browsertab.AbstractTab):
self._child_event_filter = None self._child_event_filter = None
self._saved_zoom = None self._saved_zoom = None
self._reload_url = None self._reload_url = None
self.scripts.init() self._scripts.init()
def _set_widget(self, widget): def _set_widget(self, widget):
# pylint: disable=protected-access # pylint: disable=protected-access
super()._set_widget(widget) super()._set_widget(widget)
self._permissions._widget = widget self._permissions._widget = widget
self.scripts._widget = widget self._scripts._widget = widget
def _install_event_filter(self): def _install_event_filter(self):
fp = self._widget.focusProxy() fp = self._widget.focusProxy()
@ -1437,7 +1445,7 @@ class WebEngineTab(browsertab.AbstractTab):
# pylint: disable=protected-access # pylint: disable=protected-access
self.audio._connect_signals() self.audio._connect_signals()
self._permissions.connect_signals() self._permissions.connect_signals()
self.scripts.connect_signals() self._scripts.connect_signals()
def event_target(self): def event_target(self):
return self._widget.render_widget() return self._widget.render_widget()

4
qutebrowser/browser/webkit/webkittab.py
View File

@ -115,7 +115,11 @@ class WebKitSearch(browsertab.AbstractSearch):
if callback is not None: if callback is not None:
QTimer.singleShot(0, functools.partial(callback, found)) QTimer.singleShot(0, functools.partial(callback, found))
self.finished.emit(found)
def clear(self): def clear(self):
if self.search_displayed:
self.cleared.emit()
self.search_displayed = False self.search_displayed = False
# We first clear the marked text, then the highlights # We first clear the marked text, then the highlights
self._widget.findText('') self._widget.findText('')