summaryrefslogtreecommitdiff
path: root/qutebrowser/browser/signalfilter.py
diff options
context:
space:
mode:
authorFlorian Bruhin <git@the-compiler.org>2014-09-24 20:53:21 +0200
committerFlorian Bruhin <git@the-compiler.org>2014-09-24 22:25:10 +0200
commit8cb6ba01e3b180a0cbe029956578e0d3bbd33798 (patch)
tree37b3b8de9f3c3eefabd259666dd3d7b4f52efb90 /qutebrowser/browser/signalfilter.py
parent59058361b84de91bef1c6401fa070219e98b8242 (diff)
downloadqutebrowser-8cb6ba01e3b180a0cbe029956578e0d3bbd33798.tar.gz
qutebrowser-8cb6ba01e3b180a0cbe029956578e0d3bbd33798.zip
Use object registry for TabbedBrowser in SignalFilter.
Diffstat (limited to 'qutebrowser/browser/signalfilter.py')
-rw-r--r--qutebrowser/browser/signalfilter.py14
1 files changed, 4 insertions, 10 deletions
diff --git a/qutebrowser/browser/signalfilter.py b/qutebrowser/browser/signalfilter.py
index 100f1716b..320f3f58f 100644
--- a/qutebrowser/browser/signalfilter.py
+++ b/qutebrowser/browser/signalfilter.py
@@ -23,7 +23,7 @@ import functools
from PyQt5.QtCore import QObject
-from qutebrowser.utils import debug, log
+from qutebrowser.utils import debug, log, objreg
from qutebrowser.widgets import webview
@@ -34,19 +34,12 @@ class SignalFilter(QObject):
Signals are only passed to the parent TabbedBrowser if they originated in
the currently shown widget.
- Attributes:
- _tabs: The QTabWidget associated with this SignalFilter.
-
Class attributes:
BLACKLIST: List of signal names which should not be logged.
"""
BLACKLIST = ['cur_scroll_perc_changed', 'cur_progress']
- def __init__(self, tabs):
- super().__init__(tabs)
- self._tabs = tabs
-
def create(self, signal, tab):
"""Factory for partial _filter_signals functions.
@@ -80,12 +73,13 @@ class SignalFilter(QObject):
The target signal if the sender was the current widget.
"""
log_signal = debug.signal_name(signal) not in self.BLACKLIST
+ tabbed_browser = objreg.get('tabbed-browser')
try:
- tabidx = self._tabs.indexOf(tab)
+ tabidx = tabbed_browser.indexOf(tab)
except RuntimeError:
# The tab has been deleted already
return
- if tabidx == self._tabs.currentIndex():
+ if tabidx == tabbed_browser.currentIndex():
if log_signal:
log.signals.debug("emitting: {} (tab {})".format(
debug.dbg_signal(signal, args), tabidx))