diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-04 14:49:02 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-06-04 14:49:02 +0200 |
commit | 2107ed4f77eeb49cba3ba46603832e53e5417645 (patch) | |
tree | 4b6bcb506b218ac1f74d184e762825acb7dbc496 /examples | |
parent | ed1a6d48c61b33c94c51fb92619ae173fa5c22c5 (diff) | |
parent | c43ca25defb7ace120c9439336e4be9c7e3f8530 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Idcc60eae05f86165d4ed8829c9bb745b5dc068bd
Diffstat (limited to 'examples')
-rw-r--r-- | examples/webenginewidgets/tabbedbrowser/browsertabwidget.py | 2 | ||||
-rw-r--r-- | examples/webenginewidgets/tabbedbrowser/downloadwidget.py | 6 | ||||
-rw-r--r-- | examples/webenginewidgets/tabbedbrowser/main.py | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py index 8b96b3ddd..093eed6bb 100644 --- a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py @@ -241,4 +241,4 @@ class BrowserTabWidget(QTabWidget): return -1 def _download_requested(self, item): - self.downloadRequested.emit(item) + self.download_requested.emit(item) diff --git a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py index a118f6eec..73b8d116b 100644 --- a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py @@ -92,7 +92,7 @@ class DownloadWidget(QProgressBar): path = self._download_item.path() tool_tip = "{}\n{}".format(self._download_item.url().toString(), QDir.toNativeSeparators(path)) - total_bytes = self._download_item.total_bytes() + total_bytes = self._download_item.totalBytes() if total_bytes > 0: tool_tip += "\n{}K".format(total_bytes / 1024) state = self.state() @@ -118,11 +118,11 @@ class DownloadWidget(QProgressBar): def _launch(self): DownloadWidget.open_file(self._download_item.path()) - def mouse_double_click_event(self, event): + def mouseDoubleClickEvent(self, event): if self.state() == QWebEngineDownloadItem.DownloadCompleted: self._launch() - def context_menu_event(self, event): + def contextMenuEvent(self, event): state = self.state() context_menu = QMenu() launch_action = context_menu.addAction("Launch") diff --git a/examples/webenginewidgets/tabbedbrowser/main.py b/examples/webenginewidgets/tabbedbrowser/main.py index 8a75cd5e0..438dd5c9d 100644 --- a/examples/webenginewidgets/tabbedbrowser/main.py +++ b/examples/webenginewidgets/tabbedbrowser/main.py @@ -353,15 +353,15 @@ class MainWindow(QMainWindow): def _download_requested(self, item): # Remove old downloads before opening a new one for old_download in self.statusBar().children(): - if (type(old_download).__name__ == 'download_widget' and + if (type(old_download).__name__ == 'DownloadWidget' and old_download.state() != QWebEngineDownloadItem.DownloadInProgress): self.statusBar().removeWidget(old_download) del old_download item.accept() - download_widget = download_widget(item) - download_widget.removeRequested.connect(self._remove_download_requested, - Qt.QueuedConnection) + download_widget = DownloadWidget(item) + download_widget.remove_requested.connect(self._remove_download_requested, + Qt.QueuedConnection) self.statusBar().addWidget(download_widget) def _remove_download_requested(self): |