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

Make shutdown work

Browse Source
This commit is contained in:
Florian Bruhin 2016-06-14 13:31:02 +02:00
parent 55753171f1
commit 6a42e0c96c
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qutebrowser/browser/tab.py
View File

@ -116,6 +116,7 @@ class AbstractTab(QWidget):
url_text_changed = pyqtSignal(str) url_text_changed = pyqtSignal(str)
title_changed = pyqtSignal(str) title_changed = pyqtSignal(str)
load_status_changed = pyqtSignal(str) load_status_changed = pyqtSignal(str)
shutting_down = pyqtSignal()
def __init__(self, parent=None): def __init__(self, parent=None):
self.tab_id = next(tab_id_gen) self.tab_id = next(tab_id_gen)
@ -158,6 +159,9 @@ class AbstractTab(QWidget):
""" """
raise NotImplementedError raise NotImplementedError
def shutdown(self):
raise NotImplementedError
def __repr__(self): def __repr__(self):
url = utils.elide(self.cur_url.toDisplayString(QUrl.EncodeUnicode), url = utils.elide(self.cur_url.toDisplayString(QUrl.EncodeUnicode),
100) 100)

4
qutebrowser/browser/webengine/webenginetab.py
View File

@ -89,6 +89,10 @@ class WebEngineViewTab(tab.AbstractTab):
else: else:
self._widget.page().toHtml(callback) self._widget.page().toHtml(callback)
def shutdown(self):
# TODO
pass
def _connect_signals(self): def _connect_signals(self):
view = self._widget view = self._widget
page = view.page() page = view.page()

4
qutebrowser/browser/webkit/webkittab.py
View File

@ -96,6 +96,9 @@ class WebViewTab(tab.AbstractTab):
else: else:
callback(frame.toHtml()) callback(frame.toHtml())
def shutdown(self):
self._widget.shutdown()
def _connect_signals(self): def _connect_signals(self):
view = self._widget view = self._widget
page = view.page() page = view.page()
@ -108,6 +111,7 @@ class WebViewTab(tab.AbstractTab):
view.titleChanged.connect(self.title_changed) view.titleChanged.connect(self.title_changed)
view.url_text_changed.connect(self.url_text_changed) view.url_text_changed.connect(self.url_text_changed)
view.load_status_changed.connect(self.load_status_changed) view.load_status_changed.connect(self.load_status_changed)
view.shutting_down.connect(self.shutting_down)
# Make sure we emit an appropriate status when loading finished. # Make sure we emit an appropriate status when loading finished.
# While Qt has a bool "ok" attribute for loadFinished, it always is True # While Qt has a bool "ok" attribute for loadFinished, it always is True