aboutsummaryrefslogtreecommitdiffstats
path: root/examples/webenginewidgets/tabbedbrowser
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2022-08-18 15:44:52 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2022-08-24 12:58:38 +0200
commitebfaceedf7413ce70e6ae411c821e6c3e68aa37f (patch)
tree823dfbe6faa238345f18f1af2ab92e4d620dcd84 /examples/webenginewidgets/tabbedbrowser
parent5c37a8c9ffea848f4115e3b89f50bddc4ea4a6de (diff)
Examples: Add some missing slot decorators
As unearthed by the warnings added by the logging category. As a drive-by, fix some imports. Pick-to: 6.3 6.2 Task-number: PYSIDE-2033 Change-Id: I3812c705b60eb7be744c3532fcfb0e4024763885 Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'examples/webenginewidgets/tabbedbrowser')
-rw-r--r--examples/webenginewidgets/tabbedbrowser/browsertabwidget.py15
-rw-r--r--examples/webenginewidgets/tabbedbrowser/webengineview.py5
2 files changed, 13 insertions, 7 deletions
diff --git a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py
index bd96dd89c..79dc0c78b 100644
--- a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py
+++ b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py
@@ -6,8 +6,8 @@ from functools import partial
from bookmarkwidget import BookmarkWidget
from webengineview import WebEngineView
from historywindow import HistoryWindow
-from PySide6 import QtCore
-from PySide6.QtCore import Qt, QUrl
+from PySide6.QtCore import Qt, QUrl, Signal, Slot
+from PySide6.QtGui import QIcon
from PySide6.QtWidgets import QMenu, QTabBar, QTabWidget
from PySide6.QtWebEngineCore import QWebEngineDownloadRequest, QWebEnginePage
@@ -15,9 +15,9 @@ from PySide6.QtWebEngineCore import QWebEngineDownloadRequest, QWebEnginePage
class BrowserTabWidget(QTabWidget):
"""Enables having several tabs with QWebEngineView."""
- url_changed = QtCore.Signal(QUrl)
- enabled_changed = QtCore.Signal(QWebEnginePage.WebAction, bool)
- download_requested = QtCore.Signal(QWebEngineDownloadRequest)
+ url_changed = Signal(QUrl)
+ enabled_changed = Signal(QWebEnginePage.WebAction, bool)
+ download_requested = Signal(QWebEngineDownloadRequest)
def __init__(self, window_factory_function):
super().__init__()
@@ -67,21 +67,25 @@ class BrowserTabWidget(QTabWidget):
index = self.currentIndex()
return self._webengineviews[index].url() if index >= 0 else QUrl()
+ @Slot(QUrl)
def _url_changed(self, url):
index = self.currentIndex()
if index >= 0 and self._webengineviews[index] == self.sender():
self.url_changed.emit(url)
+ @Slot(str)
def _title_changed(self, title):
index = self._index_of_page(self.sender())
if (index >= 0):
self.setTabText(index, BookmarkWidget.short_title(title))
+ @Slot(QIcon)
def _icon_changed(self, icon):
index = self._index_of_page(self.sender())
if (index >= 0):
self.setTabIcon(index, icon)
+ @Slot(object,bool)
def _enabled_changed(self, web_action, enabled):
index = self.currentIndex()
if index >= 0 and self._webengineviews[index] == self.sender():
@@ -203,5 +207,6 @@ class BrowserTabWidget(QTabWidget):
return p
return -1
+ @Slot(QWebEngineDownloadRequest)
def _download_requested(self, item):
self.download_requested.emit(item)
diff --git a/examples/webenginewidgets/tabbedbrowser/webengineview.py b/examples/webenginewidgets/tabbedbrowser/webengineview.py
index 354cc50bc..95eb01f14 100644
--- a/examples/webenginewidgets/tabbedbrowser/webengineview.py
+++ b/examples/webenginewidgets/tabbedbrowser/webengineview.py
@@ -4,7 +4,7 @@
from PySide6.QtWebEngineCore import QWebEnginePage
from PySide6.QtWebEngineWidgets import QWebEngineView
-from PySide6 import QtCore
+from PySide6.QtCore import Signal, Slot
_web_actions = [QWebEnginePage.Back, QWebEnginePage.Forward,
QWebEnginePage.Reload,
@@ -15,7 +15,7 @@ _web_actions = [QWebEnginePage.Back, QWebEnginePage.Forward,
class WebEngineView(QWebEngineView):
- enabled_changed = QtCore.Signal(QWebEnginePage.WebAction, bool)
+ enabled_changed = Signal(QWebEnginePage.WebAction, bool)
@staticmethod
def web_actions():
@@ -49,6 +49,7 @@ class WebEngineView(QWebEngineView):
return self._tab_factory_func()
return self._window_factory_func()
+ @Slot()
def _enabled_changed(self):
action = self.sender()
web_action = self._actions[action]