From 7b37d85150163cf6982a97ee5a5d417bf79e214a Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 5 Jul 2016 16:47:35 +0200 Subject: [PATCH] Pass modeman as argument to AbstractTab --- qutebrowser/browser/tab.py | 11 +++++------ qutebrowser/browser/webengine/webenginetab.py | 5 +++-- qutebrowser/browser/webkit/webkittab.py | 5 +++-- qutebrowser/mainwindow/tabbedbrowser.py | 8 ++++++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/qutebrowser/browser/tab.py b/qutebrowser/browser/tab.py index 158d8b221..32522a59e 100644 --- a/qutebrowser/browser/tab.py +++ b/qutebrowser/browser/tab.py @@ -228,16 +228,14 @@ class AbstractCaret(QObject): """Attribute of AbstractTab for caret browsing.""" - def __init__(self, win_id, tab, parent=None): + def __init__(self, win_id, tab, modeman, parent=None): super().__init__(parent) self._tab = tab self._win_id = win_id self._widget = None self.selection_enabled = False - mode_manager = objreg.get('mode-manager', scope='window', - window=win_id) - mode_manager.entered.connect(self.on_mode_entered) - mode_manager.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): raise NotImplementedError @@ -444,7 +442,8 @@ class AbstractTab(QWidget): super().__init__(parent) # self.history = AbstractHistory(self) # self.scroll = AbstractScroller(parent=self) - # self.caret = AbstractCaret(win_id=win_id, tab=self, parent=self) + # self.caret = AbstractCaret(win_id=win_id, tab=self, modeman=..., + # parent=self) # self.zoom = AbstractZoom(win_id=win_id) # self.search = AbstractSearch(parent=self) self.data = TabData() diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 4340dcf80..b97d4e6ba 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -157,12 +157,13 @@ class WebEngineZoom(tab.AbstractZoom): class WebEngineViewTab(tab.AbstractTab): - def __init__(self, win_id, parent=None): + def __init__(self, win_id, modeman, parent=None): super().__init__(win_id) widget = webview.WebEngineView() self.history = WebEngineHistory(self) self.scroll = WebEngineScroller() - self.caret = WebEngineCaret(win_id=win_id, tab=self, parent=self) + self.caret = WebEngineCaret(win_id=win_id, modeman=modeman, tab=self, + parent=self) self.zoom = WebEngineZoom(win_id=win_id, parent=self) self.search = WebEngineSearch(parent=self) self._set_widget(widget) diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py index 6575e4c08..3e80bef8a 100644 --- a/qutebrowser/browser/webkit/webkittab.py +++ b/qutebrowser/browser/webkit/webkittab.py @@ -436,12 +436,13 @@ class WebViewHistory(tab.AbstractHistory): class WebViewTab(tab.AbstractTab): - def __init__(self, win_id, parent=None): + def __init__(self, win_id, modeman, parent=None): super().__init__(win_id) widget = webview.WebView(win_id, self.tab_id, tab=self) self.history = WebViewHistory(self) self.scroll = WebViewScroller(parent=self) - self.caret = WebViewCaret(win_id=win_id, tab=self, parent=self) + self.caret = WebViewCaret(win_id=win_id, modeman=modeman, tab=self, + parent=self) self.zoom = WebViewZoom(win_id=win_id, parent=self) self.search = WebViewSearch(parent=self) self._set_widget(widget) diff --git a/qutebrowser/mainwindow/tabbedbrowser.py b/qutebrowser/mainwindow/tabbedbrowser.py index 1ff3656a4..d13e1ff0b 100644 --- a/qutebrowser/mainwindow/tabbedbrowser.py +++ b/qutebrowser/mainwindow/tabbedbrowser.py @@ -381,10 +381,14 @@ class TabbedBrowser(tabwidget.TabWidget): window=window.win_id) return tabbed_browser.tabopen(url, background, explicit) + if objreg.get('args').backend == 'webengine': - tab = webenginetab.WebEngineViewTab(self._win_id, self) + tab_class = webenginetab.WebEngineViewTab else: - tab = webkittab.WebViewTab(self._win_id, self) + tab_class = webkittab.WebViewTab + + tab = tab_class(self._win_id, modeman.instance(self._win_id), + parent=self) self._connect_tab_signals(tab) idx = self._get_new_tab_idx(explicit)