From 4fea2857408245f8ec4a597a881bb88b155fc7b1 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 14 Jun 2016 15:20:40 +0200 Subject: [PATCH] Add win_id attribute --- qutebrowser/browser/tab.py | 3 ++- qutebrowser/browser/webengine/webenginetab.py | 2 +- qutebrowser/browser/webkit/webkittab.py | 2 +- tests/unit/browser/test_tab.py | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/qutebrowser/browser/tab.py b/qutebrowser/browser/tab.py index 08fa0d340..dcb9b7363 100644 --- a/qutebrowser/browser/tab.py +++ b/qutebrowser/browser/tab.py @@ -124,7 +124,8 @@ class AbstractTab(QWidget): load_status_changed = pyqtSignal(str) shutting_down = pyqtSignal() - def __init__(self, parent=None): + def __init__(self, win_id, parent=None): + self.win_id = win_id self.tab_id = next(tab_id_gen) super().__init__(parent) self.history = AbstractHistory(self) diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py index 2750b1aea..227dc36a0 100644 --- a/qutebrowser/browser/webengine/webenginetab.py +++ b/qutebrowser/browser/webengine/webenginetab.py @@ -65,7 +65,7 @@ class WebEngineHistory(tab.AbstractHistory): class WebEngineViewTab(tab.AbstractTab): def __init__(self, win_id, parent=None): - super().__init__() + super().__init__(win_id) widget = QWebEngineView() self.history = WebEngineHistory(self) self._set_widget(widget) diff --git a/qutebrowser/browser/webkit/webkittab.py b/qutebrowser/browser/webkit/webkittab.py index 9c82f0ae8..39188a249 100644 --- a/qutebrowser/browser/webkit/webkittab.py +++ b/qutebrowser/browser/webkit/webkittab.py @@ -71,7 +71,7 @@ class WebViewHistory(tab.AbstractHistory): class WebViewTab(tab.AbstractTab): def __init__(self, win_id, parent=None): - super().__init__() + super().__init__(win_id) widget = webview.WebView(win_id, self.tab_id) self.history = WebViewHistory(self) self._set_widget(widget) diff --git a/tests/unit/browser/test_tab.py b/tests/unit/browser/test_tab.py index 7bd478af1..2ac749df3 100644 --- a/tests/unit/browser/test_tab.py +++ b/tests/unit/browser/test_tab.py @@ -38,8 +38,9 @@ def test_tab(qtbot, view): pytest.skip("View not available") w = view() qtbot.add_widget(w) - tab_w = tab.AbstractTab() + tab_w = tab.AbstractTab(win_id=0) tab_w.show() + assert tab_w.win_id == 0 assert tab_w._widget is None tab_w._set_widget(w) assert tab_w._widget is w