summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2020-06-22 19:14:13 +0200
committerFlorian Bruhin <me@the-compiler.org>2020-06-22 20:08:56 +0200
commit5ba6b9ea9c5ce96039cba3594bef168a5d53eed1 (patch)
treec49ceac052c7c239dae1306898297a2708e7b969
parent06ae02511e3ff4b7151a884a01ca9d3373fabf54 (diff)
downloadqutebrowser-5ba6b9ea9c5ce96039cba3594bef168a5d53eed1.tar.gz
qutebrowser-5ba6b9ea9c5ce96039cba3594bef168a5d53eed1.zip
Remove inspector detaching again
It doesn't work properly: If we detach, we'd also need to re-attach when reopening the inspector! Let's just not do it for now and see what people think. That also has some benefits like the inspector remembering what tab the user was on when closing it.
-rw-r--r--qutebrowser/browser/inspector.py8
-rw-r--r--qutebrowser/browser/webengine/webengineinspector.py6
-rw-r--r--qutebrowser/browser/webkit/webkitinspector.py3
3 files changed, 1 insertions, 16 deletions
diff --git a/qutebrowser/browser/inspector.py b/qutebrowser/browser/inspector.py
index 0cea8b5ac..9b573c3f1 100644
--- a/qutebrowser/browser/inspector.py
+++ b/qutebrowser/browser/inspector.py
@@ -188,7 +188,6 @@ class AbstractWebInspector(QWidget):
"""Toggle visibility of the inspector."""
target = self._widget if self._position == Position.window else self
if target.isVisible():
- self.detach()
target.hide()
else:
target.show()
@@ -210,20 +209,15 @@ class AbstractWebInspector(QWidget):
log.init.warning("Error while loading geometry.")
def closeEvent(self, _e: QCloseEvent) -> None:
- """Save the geometry and detach the inspector when closed."""
+ """Save the geometry when closed."""
data = self._widget.saveGeometry().data()
geom = base64.b64encode(data).decode('ASCII')
configfiles.state['inspector']['window'] = geom
- self.detach()
def inspect(self, page: QWidget) -> None:
"""Inspect the given QWeb(Engine)Page."""
raise NotImplementedError
- def detach(self) -> None:
- """Detach the inspector from the currently attached page."""
- raise NotImplementedError
-
@pyqtSlot()
def shutdown(self) -> None:
self.close()
diff --git a/qutebrowser/browser/webengine/webengineinspector.py b/qutebrowser/browser/webengine/webengineinspector.py
index e956ea5a5..df038abea 100644
--- a/qutebrowser/browser/webengine/webengineinspector.py
+++ b/qutebrowser/browser/webengine/webengineinspector.py
@@ -87,9 +87,6 @@ class LegacyWebEngineInspector(inspector.AbstractWebInspector):
port = int(os.environ['QTWEBENGINE_REMOTE_DEBUGGING'])
self._widget.load(QUrl('http://localhost:{}/'.format(port)))
- def detach(self) -> None:
- self._widget.load(QUrl('about:blank'))
-
class WebEngineInspector(inspector.AbstractWebInspector):
@@ -128,6 +125,3 @@ class WebEngineInspector(inspector.AbstractWebInspector):
inspector_page = self._widget.page()
inspector_page.setInspectedPage(page)
self._settings.update_for_url(inspector_page.requestedUrl())
-
- def detach(self) -> None:
- self._widget.page().setInspectedPage(None)
diff --git a/qutebrowser/browser/webkit/webkitinspector.py b/qutebrowser/browser/webkit/webkitinspector.py
index d7b89376d..603a0a2bb 100644
--- a/qutebrowser/browser/webkit/webkitinspector.py
+++ b/qutebrowser/browser/webkit/webkitinspector.py
@@ -42,6 +42,3 @@ class WebKitInspector(inspector.AbstractWebInspector):
settings = QWebSettings.globalSettings()
settings.setAttribute(QWebSettings.DeveloperExtrasEnabled, True)
self._widget.setPage(page)
-
- def detach(self) -> None:
- self._widget.setPage(None)