From ced7d7b9e1a0cd771be36651558332e0010028bb Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 21 Jun 2021 14:52:28 +0200 Subject: PySide6: Re-add QtWebEngine, initial step Remove module QtWebEngine. Move most API from QtWebEngineWidgets to QtWebEngineCore. Adapt imports in tests and examples. The new module QtWebEngineQuick will be added in a follow-up step. This is not functional yet as examples crash in the underlying 6.2 Alpha. Task-number: PYSIDE-1570 Change-Id: I00907e5542404560967e6ae07d102193f1f1e154 Reviewed-by: Cristian Maureira-Fredes --- .../tabbedbrowser/downloadwidget.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'examples/webenginewidgets/tabbedbrowser/downloadwidget.py') diff --git a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py index 17ebd583d..aa1479eba 100644 --- a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py @@ -43,12 +43,12 @@ from PySide6 import QtCore from PySide6.QtCore import QDir, QFileInfo, QStandardPaths, Qt, QUrl from PySide6.QtGui import QDesktopServices from PySide6.QtWidgets import QMenu, QProgressBar, QStyleFactory -from PySide6.QtWebEngineWidgets import QWebEngineDownloadItem +from PySide6.QtWebEngineCore import QWebEngineDownloadRequest # A QProgressBar with context menu for displaying downloads in a QStatusBar. class DownloadWidget(QProgressBar): - """Lets you track progress of a QWebEngineDownloadItem.""" + """Lets you track progress of a QWebEngineDownloadRequest.""" finished = QtCore.Signal() remove_requested = QtCore.Signal() @@ -98,13 +98,13 @@ class DownloadWidget(QProgressBar): if total_bytes > 0: tool_tip += f"\n{total_bytes / 1024}K" state = self.state() - if state == QWebEngineDownloadItem.DownloadRequested: + if state == QWebEngineDownloadRequest.DownloadRequested: tool_tip += "\n(requested)" - elif state == QWebEngineDownloadItem.DownloadInProgress: + elif state == QWebEngineDownloadRequest.DownloadInProgress: tool_tip += "\n(downloading)" - elif state == QWebEngineDownloadItem.DownloadCompleted: + elif state == QWebEngineDownloadRequest.DownloadCompleted: tool_tip += "\n(completed)" - elif state == QWebEngineDownloadItem.DownloadCancelled: + elif state == QWebEngineDownloadRequest.DownloadCancelled: tool_tip += "\n(cancelled)" else: tool_tip += "\n(interrupted)" @@ -121,20 +121,20 @@ class DownloadWidget(QProgressBar): DownloadWidget.open_file(self._download_item.path()) def mouseDoubleClickEvent(self, event): - if self.state() == QWebEngineDownloadItem.DownloadCompleted: + if self.state() == QWebEngineDownloadRequest.DownloadCompleted: self._launch() def contextMenuEvent(self, event): state = self.state() context_menu = QMenu() launch_action = context_menu.addAction("Launch") - launch_action.setEnabled(state == QWebEngineDownloadItem.DownloadCompleted) + launch_action.setEnabled(state == QWebEngineDownloadRequest.DownloadCompleted) show_in_folder_action = context_menu.addAction("Show in Folder") - show_in_folder_action.setEnabled(state == QWebEngineDownloadItem.DownloadCompleted) + show_in_folder_action.setEnabled(state == QWebEngineDownloadRequest.DownloadCompleted) cancel_action = context_menu.addAction("Cancel") - cancel_action.setEnabled(state == QWebEngineDownloadItem.DownloadInProgress) + cancel_action.setEnabled(state == QWebEngineDownloadRequest.DownloadInProgress) remove_action = context_menu.addAction("Remove") - remove_action.setEnabled(state != QWebEngineDownloadItem.DownloadInProgress) + remove_action.setEnabled(state != QWebEngineDownloadRequest.DownloadInProgress) chosen_action = context_menu.exec(event.globalPos()) if chosen_action == launch_action: -- cgit v1.2.3