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 --- .../simplebrowser/simplebrowser.py | 3 ++- .../tabbedbrowser/browsertabwidget.py | 4 ++-- .../tabbedbrowser/downloadwidget.py | 22 +++++++++++----------- .../webenginewidgets/tabbedbrowser/findtoolbar.py | 2 +- examples/webenginewidgets/tabbedbrowser/main.py | 4 ++-- .../tabbedbrowser/webengineview.py | 3 ++- 6 files changed, 20 insertions(+), 18 deletions(-) (limited to 'examples') diff --git a/examples/webenginewidgets/simplebrowser/simplebrowser.py b/examples/webenginewidgets/simplebrowser/simplebrowser.py index 6bf487ebd..021d5311e 100644 --- a/examples/webenginewidgets/simplebrowser/simplebrowser.py +++ b/examples/webenginewidgets/simplebrowser/simplebrowser.py @@ -46,7 +46,8 @@ from PySide6.QtCore import QUrl from PySide6.QtGui import QIcon from PySide6.QtWidgets import (QApplication, QLineEdit, QMainWindow, QPushButton, QToolBar) -from PySide6.QtWebEngineWidgets import QWebEnginePage, QWebEngineView +from PySide6.QtWebEngineCore import QWebEnginePage +from PySide6.QtWebEngineWidgets import QWebEngineView class MainWindow(QMainWindow): diff --git a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py index 397302ac1..5e87da074 100644 --- a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py @@ -46,7 +46,7 @@ from historywindow import HistoryWindow from PySide6 import QtCore from PySide6.QtCore import Qt, QUrl from PySide6.QtWidgets import QMenu, QTabBar, QTabWidget -from PySide6.QtWebEngineWidgets import QWebEngineDownloadItem, QWebEnginePage +from PySide6.QtWebEngineCore import QWebEngineDownloadRequest, QWebEnginePage class BrowserTabWidget(QTabWidget): @@ -54,7 +54,7 @@ class BrowserTabWidget(QTabWidget): url_changed = QtCore.Signal(QUrl) enabled_changed = QtCore.Signal(QWebEnginePage.WebAction, bool) - download_requested = QtCore.Signal(QWebEngineDownloadItem) + download_requested = QtCore.Signal(QWebEngineDownloadRequest) def __init__(self, window_factory_function): super().__init__() 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: diff --git a/examples/webenginewidgets/tabbedbrowser/findtoolbar.py b/examples/webenginewidgets/tabbedbrowser/findtoolbar.py index c6668babc..c38f01afa 100644 --- a/examples/webenginewidgets/tabbedbrowser/findtoolbar.py +++ b/examples/webenginewidgets/tabbedbrowser/findtoolbar.py @@ -42,7 +42,7 @@ from PySide6 import QtCore from PySide6.QtCore import Qt from PySide6.QtGui import QIcon, QKeySequence from PySide6.QtWidgets import QCheckBox, QLineEdit, QToolBar, QToolButton -from PySide6.QtWebEngineWidgets import QWebEnginePage +from PySide6.QtWebEngineCore import QWebEnginePage # A Find tool bar (bottom area) diff --git a/examples/webenginewidgets/tabbedbrowser/main.py b/examples/webenginewidgets/tabbedbrowser/main.py index f2280c273..400a87540 100644 --- a/examples/webenginewidgets/tabbedbrowser/main.py +++ b/examples/webenginewidgets/tabbedbrowser/main.py @@ -52,7 +52,7 @@ from PySide6.QtCore import Qt, QUrl from PySide6.QtGui import QAction, QKeySequence, QIcon from PySide6.QtWidgets import (QApplication, QDockWidget, QLabel, QLineEdit, QMainWindow, QToolBar) -from PySide6.QtWebEngineWidgets import QWebEngineDownloadItem, QWebEnginePage +from PySide6.QtWebEngineCore import QWebEngineDownloadRequest, QWebEnginePage main_windows = [] @@ -61,7 +61,7 @@ def create_main_window(): """Creates a MainWindow using 75% of the available screen resolution.""" main_win = MainWindow() main_windows.append(main_win) - available_geometry = app.desktop().availableGeometry(main_win) + available_geometry = main_win.screen().availableGeometry() main_win.resize(available_geometry.width() * 2 / 3, available_geometry.height() * 2 / 3) main_win.show() diff --git a/examples/webenginewidgets/tabbedbrowser/webengineview.py b/examples/webenginewidgets/tabbedbrowser/webengineview.py index e12567df3..19a16e8d3 100644 --- a/examples/webenginewidgets/tabbedbrowser/webengineview.py +++ b/examples/webenginewidgets/tabbedbrowser/webengineview.py @@ -38,7 +38,8 @@ ## ############################################################################# -from PySide6.QtWebEngineWidgets import QWebEnginePage, QWebEngineView +from PySide6.QtWebEngineCore import QWebEnginePage +from PySide6.QtWebEngineWidgets import QWebEngineView from PySide6 import QtCore -- cgit v1.2.3