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

Use object registry for TabbedBrowser in SignalFilter.

Browse Source
This commit is contained in:
Florian Bruhin 2014-09-24 20:53:21 +02:00
parent 59058361b8
commit 8cb6ba01e3
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qutebrowser/browser/signalfilter.py
View File

@ -23,7 +23,7 @@ import functools
from PyQt5.QtCore import QObject from PyQt5.QtCore import QObject
from qutebrowser.utils import debug, log from qutebrowser.utils import debug, log, objreg
from qutebrowser.widgets import webview from qutebrowser.widgets import webview
@ -34,19 +34,12 @@ class SignalFilter(QObject):
Signals are only passed to the parent TabbedBrowser if they originated in Signals are only passed to the parent TabbedBrowser if they originated in
the currently shown widget. the currently shown widget.
Attributes:
_tabs: The QTabWidget associated with this SignalFilter.
Class attributes: Class attributes:
BLACKLIST: List of signal names which should not be logged. BLACKLIST: List of signal names which should not be logged.
""" """
BLACKLIST = ['cur_scroll_perc_changed', 'cur_progress'] BLACKLIST = ['cur_scroll_perc_changed', 'cur_progress']
def __init__(self, tabs):
super().__init__(tabs)
self._tabs = tabs
def create(self, signal, tab): def create(self, signal, tab):
"""Factory for partial _filter_signals functions. """Factory for partial _filter_signals functions.
@ -80,12 +73,13 @@ class SignalFilter(QObject):
The target signal if the sender was the current widget. The target signal if the sender was the current widget.
""" """
log_signal = debug.signal_name(signal) not in self.BLACKLIST log_signal = debug.signal_name(signal) not in self.BLACKLIST
tabbed_browser = objreg.get('tabbed-browser')
try: try:
tabidx = self._tabs.indexOf(tab) tabidx = tabbed_browser.indexOf(tab)
except RuntimeError: except RuntimeError:
# The tab has been deleted already # The tab has been deleted already
return return
if tabidx == self._tabs.currentIndex(): if tabidx == tabbed_browser.currentIndex():
if log_signal: if log_signal:
log.signals.debug("emitting: {} (tab {})".format( log.signals.debug("emitting: {} (tab {})".format(
debug.dbg_signal(signal, args), tabidx)) debug.dbg_signal(signal, args), tabidx))