Move progress handling to TabbedBrowser
This commit is contained in:
parent
c0320a911b
commit
688b22eaac
@ -17,6 +17,7 @@ class TabbedBrowser(TabWidget):
|
|||||||
self.tabs.append(tab)
|
self.tabs.append(tab)
|
||||||
self.addTab(tab, url)
|
self.addTab(tab, url)
|
||||||
self.setCurrentWidget(tab)
|
self.setCurrentWidget(tab)
|
||||||
|
tab.loadProgress.connect(self.progress_changed)
|
||||||
|
|
||||||
@pyqtSlot(str)
|
@pyqtSlot(str)
|
||||||
def openurl(self, url):
|
def openurl(self, url):
|
||||||
@ -51,21 +52,19 @@ class TabbedBrowser(TabWidget):
|
|||||||
# FIXME
|
# FIXME
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@pyqtSlot(int)
|
||||||
|
def progress_changed(self, prog):
|
||||||
|
if self.currentWidget() == self.sender():
|
||||||
|
self.cur_progress.emit(prog)
|
||||||
|
|
||||||
class BrowserTab(QWebView):
|
class BrowserTab(QWebView):
|
||||||
parent = None
|
parent = None
|
||||||
|
|
||||||
def __init__(self, parent):
|
def __init__(self, parent):
|
||||||
super().__init__(parent)
|
super().__init__(parent)
|
||||||
self.parent = parent
|
|
||||||
self.loadProgress.connect(self.progress_changed)
|
|
||||||
self.show()
|
self.show()
|
||||||
|
|
||||||
def openurl(self, url):
|
def openurl(self, url):
|
||||||
if not url.startswith('http://'):
|
if not url.startswith('http://'):
|
||||||
url = 'http://' + url
|
url = 'http://' + url
|
||||||
super().load(QUrl(url))
|
super().load(QUrl(url))
|
||||||
|
|
||||||
def progress_changed(self, prog):
|
|
||||||
if self.parent.currentWidget() == self:
|
|
||||||
self.parent.cur_progress.emit(prog)
|
|
||||||
|
Loading…
Reference in New Issue
Block a user