From 0937a64f1cc1ebc5f02f4d4f9ff6c19b9ceac260 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Mon, 4 Jul 2016 17:49:25 +0200 Subject: [PATCH] Fix :inspect --- qutebrowser/browser/commands.py | 16 ++++++++-------- qutebrowser/browser/tab.py | 2 ++ qutebrowser/browser/webkit/webview.py | 2 -- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py index bab76668a..001da7f4c 100644 --- a/qutebrowser/browser/commands.py +++ b/qutebrowser/browser/commands.py @@ -1124,24 +1124,24 @@ class CommandDispatcher: Note: Due a bug in Qt, the inspector will show incorrect request headers in the network tab. """ - cur = self._current_widget() - if cur.inspector is None: + tab = self._current_widget() + if tab.data.inspector is None: if not config.get('general', 'developer-extras'): raise cmdexc.CommandError( "Please enable developer-extras before using the " "webinspector!") - cur.inspector = inspector.WebInspector() - cur.inspector.setPage(cur.page()) - cur.inspector.show() - elif cur.inspector.isVisible(): - cur.inspector.hide() + tab.data.inspector = inspector.WebInspector() + tab.data.inspector.setPage(tab._widget.page()) + tab.data.inspector.show() + elif tab.data.inspector.isVisible(): + tab.data.inspector.hide() else: if not config.get('general', 'developer-extras'): raise cmdexc.CommandError( "Please enable developer-extras before using the " "webinspector!") else: - cur.inspector.show() + tab.data.inspector.show() @cmdutils.register(instance='command-dispatcher', scope='window') @cmdutils.argument('dest_old', hide=True) diff --git a/qutebrowser/browser/tab.py b/qutebrowser/browser/tab.py index ce06cd7b9..158d8b221 100644 --- a/qutebrowser/browser/tab.py +++ b/qutebrowser/browser/tab.py @@ -70,12 +70,14 @@ class TabData(QObject): Attributes: keep_icon: Whether the (e.g. cloned) icon should not be cleared on page load. + inspector: The QWebInspector used for this webview. """ def __init__(self): self._data = { 'keep_icon': False, 'viewing_source': False, + 'inspector': None, } def __getattr__(self, attr): diff --git a/qutebrowser/browser/webkit/webview.py b/qutebrowser/browser/webkit/webview.py index 90b544053..3084ceddc 100644 --- a/qutebrowser/browser/webkit/webview.py +++ b/qutebrowser/browser/webkit/webview.py @@ -48,7 +48,6 @@ class WebView(QWebView): progress: loading progress of this page. scroll_pos: The current scroll position as (x%, y%) tuple. statusbar_message: The current javascript statusbar message. - inspector: The QWebInspector used for this webview. load_status: loading status of this page (index into LoadStatus) registry: The ObjectRegistry associated with this tab. win_id: The window ID of the view. @@ -90,7 +89,6 @@ class WebView(QWebView): self.win_id = win_id self.load_status = usertypes.LoadStatus.none self._check_insertmode = False - self.inspector = None self.scroll_pos = (-1, -1) self.statusbar_message = '' self._old_scroll_pos = (-1, -1)