diff -r 27f636beebad -r 2c730d5fd177 eric6/WebBrowser/WebBrowserWindow.py
--- a/eric6/WebBrowser/WebBrowserWindow.py Mon Mar 01 17:48:43 2021 +0100
+++ b/eric6/WebBrowser/WebBrowserWindow.py Tue Mar 02 17:17:09 2021 +0100
@@ -157,8 +157,8 @@
self.__shortcutsDialog = None
- self.__eventMouseButtons = Qt.NoButton
- self.__eventKeyboardModifiers = Qt.NoModifier
+ self.__eventMouseButtons = Qt.MouseButton.NoButton
+ self.__eventKeyboardModifiers = Qt.KeyboardModifier.NoModifier
WebBrowserWindow.setUseQtHelp(qthelp or bool(searchWord))
@@ -166,7 +166,7 @@
self.networkManager()
self.__htmlFullScreen = False
- self.__windowStates = Qt.WindowNoState
+ self.__windowStates = Qt.WindowState.WindowNoState
self.__isClosing = False
from .SearchWidget import SearchWidget
@@ -244,7 +244,7 @@
layout.addWidget(self.__tabWidget)
layout.addWidget(self.__searchWidget)
self.__tabWidget.setSizePolicy(
- QSizePolicy.Preferred, QSizePolicy.Expanding)
+ QSizePolicy.Policy.Preferred, QSizePolicy.Policy.Expanding)
centralWidget.setLayout(layout)
self.setCentralWidget(centralWidget)
self.__searchWidget.hide()
@@ -255,14 +255,16 @@
self.__tocDock = QDockWidget(self.tr("Contents"), self)
self.__tocDock.setObjectName("TocWindow")
self.__tocDock.setWidget(self.__tocWindow)
- self.addDockWidget(Qt.LeftDockWidgetArea, self.__tocDock)
+ self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea,
+ self.__tocDock)
# setup the index widget
self.__indexWindow = HelpIndexWidget(self.__helpEngine)
self.__indexDock = QDockWidget(self.tr("Index"), self)
self.__indexDock.setObjectName("IndexWindow")
self.__indexDock.setWidget(self.__indexWindow)
- self.addDockWidget(Qt.LeftDockWidgetArea, self.__indexDock)
+ self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea,
+ self.__indexDock)
# setup the search widget
self.__searchWord = searchWord
@@ -277,7 +279,8 @@
self.__searchDock = QDockWidget(self.tr("Search"), self)
self.__searchDock.setObjectName("SearchWindow")
self.__searchDock.setWidget(self.__searchWindow)
- self.addDockWidget(Qt.LeftDockWidgetArea, self.__searchDock)
+ self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea,
+ self.__searchDock)
# JavaScript Console window
from .WebBrowserJavaScriptConsole import WebBrowserJavaScriptConsole
@@ -286,9 +289,10 @@
self.tr("JavaScript Console"))
self.__javascriptConsoleDock.setObjectName("JavascriptConsole")
self.__javascriptConsoleDock.setAllowedAreas(
- Qt.BottomDockWidgetArea | Qt.TopDockWidgetArea)
+ Qt.DockWidgetArea.BottomDockWidgetArea |
+ Qt.DockWidgetArea.TopDockWidgetArea)
self.__javascriptConsoleDock.setWidget(self.__javascriptConsole)
- self.addDockWidget(Qt.BottomDockWidgetArea,
+ self.addDockWidget(Qt.DockWidgetArea.BottomDockWidgetArea,
self.__javascriptConsoleDock)
if Preferences.getWebBrowser("SaveGeometry"):
@@ -514,137 +518,138 @@
settings = self.webSettings()
settings.setFontFamily(
- QWebEngineSettings.StandardFont,
+ QWebEngineSettings.FontFamily.StandardFont,
Preferences.getWebBrowser("StandardFontFamily"))
settings.setFontFamily(
- QWebEngineSettings.FixedFont,
+ QWebEngineSettings.FontFamily.FixedFont,
Preferences.getWebBrowser("FixedFontFamily"))
settings.setFontFamily(
- QWebEngineSettings.SerifFont,
+ QWebEngineSettings.FontFamily.SerifFont,
Preferences.getWebBrowser("SerifFontFamily"))
settings.setFontFamily(
- QWebEngineSettings.SansSerifFont,
+ QWebEngineSettings.FontFamily.SansSerifFont,
Preferences.getWebBrowser("SansSerifFontFamily"))
settings.setFontFamily(
- QWebEngineSettings.CursiveFont,
+ QWebEngineSettings.FontFamily.CursiveFont,
Preferences.getWebBrowser("CursiveFontFamily"))
settings.setFontFamily(
- QWebEngineSettings.FantasyFont,
+ QWebEngineSettings.FontFamily.FantasyFont,
Preferences.getWebBrowser("FantasyFontFamily"))
settings.setFontSize(
- QWebEngineSettings.DefaultFontSize,
+ QWebEngineSettings.FontSize.DefaultFontSize,
Preferences.getWebBrowser("DefaultFontSize"))
settings.setFontSize(
- QWebEngineSettings.DefaultFixedFontSize,
+ QWebEngineSettings.FontSize.DefaultFixedFontSize,
Preferences.getWebBrowser("DefaultFixedFontSize"))
settings.setFontSize(
- QWebEngineSettings.MinimumFontSize,
+ QWebEngineSettings.FontSize.MinimumFontSize,
Preferences.getWebBrowser("MinimumFontSize"))
settings.setFontSize(
- QWebEngineSettings.MinimumLogicalFontSize,
+ QWebEngineSettings.FontSize.MinimumLogicalFontSize,
Preferences.getWebBrowser("MinimumLogicalFontSize"))
styleSheet = Preferences.getWebBrowser("UserStyleSheet")
self.__setUserStyleSheet(styleSheet)
settings.setAttribute(
- QWebEngineSettings.AutoLoadImages,
+ QWebEngineSettings.WebAttribute.AutoLoadImages,
Preferences.getWebBrowser("AutoLoadImages"))
settings.setAttribute(
- QWebEngineSettings.JavascriptEnabled,
+ QWebEngineSettings.WebAttribute.JavascriptEnabled,
Preferences.getWebBrowser("JavaScriptEnabled"))
# JavaScript is needed for the web browser functionality
settings.setAttribute(
- QWebEngineSettings.JavascriptCanOpenWindows,
+ QWebEngineSettings.WebAttribute.JavascriptCanOpenWindows,
Preferences.getWebBrowser("JavaScriptCanOpenWindows"))
settings.setAttribute(
- QWebEngineSettings.JavascriptCanAccessClipboard,
+ QWebEngineSettings.WebAttribute.JavascriptCanAccessClipboard,
Preferences.getWebBrowser("JavaScriptCanAccessClipboard"))
settings.setAttribute(
- QWebEngineSettings.PluginsEnabled,
+ QWebEngineSettings.WebAttribute.PluginsEnabled,
Preferences.getWebBrowser("PluginsEnabled"))
if self.isPrivate():
settings.setAttribute(
- QWebEngineSettings.LocalStorageEnabled, False)
+ QWebEngineSettings.WebAttribute.LocalStorageEnabled, False)
else:
settings.setAttribute(
- QWebEngineSettings.LocalStorageEnabled,
+ QWebEngineSettings.WebAttribute.LocalStorageEnabled,
Preferences.getWebBrowser("LocalStorageEnabled"))
settings.setDefaultTextEncoding(
Preferences.getWebBrowser("DefaultTextEncoding"))
settings.setAttribute(
- QWebEngineSettings.SpatialNavigationEnabled,
+ QWebEngineSettings.WebAttribute.SpatialNavigationEnabled,
Preferences.getWebBrowser("SpatialNavigationEnabled"))
settings.setAttribute(
- QWebEngineSettings.LinksIncludedInFocusChain,
+ QWebEngineSettings.WebAttribute.LinksIncludedInFocusChain,
Preferences.getWebBrowser("LinksIncludedInFocusChain"))
settings.setAttribute(
- QWebEngineSettings.LocalContentCanAccessRemoteUrls,
+ QWebEngineSettings.WebAttribute.LocalContentCanAccessRemoteUrls,
Preferences.getWebBrowser("LocalContentCanAccessRemoteUrls"))
settings.setAttribute(
- QWebEngineSettings.LocalContentCanAccessFileUrls,
+ QWebEngineSettings.WebAttribute.LocalContentCanAccessFileUrls,
Preferences.getWebBrowser("LocalContentCanAccessFileUrls"))
settings.setAttribute(
- QWebEngineSettings.XSSAuditingEnabled,
+ QWebEngineSettings.WebAttribute.XSSAuditingEnabled,
Preferences.getWebBrowser("XSSAuditingEnabled"))
settings.setAttribute(
- QWebEngineSettings.ScrollAnimatorEnabled,
+ QWebEngineSettings.WebAttribute.ScrollAnimatorEnabled,
Preferences.getWebBrowser("ScrollAnimatorEnabled"))
settings.setAttribute(
- QWebEngineSettings.ErrorPageEnabled,
+ QWebEngineSettings.WebAttribute.ErrorPageEnabled,
Preferences.getWebBrowser("ErrorPageEnabled"))
settings.setAttribute(
- QWebEngineSettings.FullScreenSupportEnabled,
+ QWebEngineSettings.WebAttribute.FullScreenSupportEnabled,
Preferences.getWebBrowser("FullScreenSupportEnabled"))
settings.setAttribute(
- QWebEngineSettings.ScreenCaptureEnabled,
+ QWebEngineSettings.WebAttribute.ScreenCaptureEnabled,
Preferences.getWebBrowser("ScreenCaptureEnabled"))
settings.setAttribute(
- QWebEngineSettings.WebGLEnabled,
+ QWebEngineSettings.WebAttribute.WebGLEnabled,
Preferences.getWebBrowser("WebGLEnabled"))
settings.setAttribute(
- QWebEngineSettings.FocusOnNavigationEnabled,
+ QWebEngineSettings.WebAttribute.FocusOnNavigationEnabled,
Preferences.getWebBrowser("FocusOnNavigationEnabled"))
settings.setAttribute(
- QWebEngineSettings.PrintElementBackgrounds,
+ QWebEngineSettings.WebAttribute.PrintElementBackgrounds,
Preferences.getWebBrowser("PrintElementBackgrounds"))
settings.setAttribute(
- QWebEngineSettings.AllowRunningInsecureContent,
+ QWebEngineSettings.WebAttribute.AllowRunningInsecureContent,
Preferences.getWebBrowser("AllowRunningInsecureContent"))
settings.setAttribute(
- QWebEngineSettings.AllowGeolocationOnInsecureOrigins,
+ QWebEngineSettings.WebAttribute.AllowGeolocationOnInsecureOrigins,
Preferences.getWebBrowser("AllowGeolocationOnInsecureOrigins"))
settings.setAttribute(
- QWebEngineSettings.AllowWindowActivationFromJavaScript,
+ QWebEngineSettings.WebAttribute
+ .AllowWindowActivationFromJavaScript,
Preferences.getWebBrowser(
"AllowWindowActivationFromJavaScript"))
settings.setAttribute(
- QWebEngineSettings.ShowScrollBars,
+ QWebEngineSettings.WebAttribute.ShowScrollBars,
Preferences.getWebBrowser("ShowScrollBars"))
settings.setAttribute(
- QWebEngineSettings.PlaybackRequiresUserGesture,
+ QWebEngineSettings.WebAttribute.PlaybackRequiresUserGesture,
Preferences.getWebBrowser(
"PlaybackRequiresUserGesture"))
settings.setAttribute(
- QWebEngineSettings.JavascriptCanPaste,
+ QWebEngineSettings.WebAttribute.JavascriptCanPaste,
Preferences.getWebBrowser(
"JavaScriptCanPaste"))
settings.setAttribute(
- QWebEngineSettings.WebRTCPublicInterfacesOnly,
+ QWebEngineSettings.WebAttribute.WebRTCPublicInterfacesOnly,
Preferences.getWebBrowser(
"WebRTCPublicInterfacesOnly"))
settings.setAttribute(
- QWebEngineSettings.DnsPrefetchEnabled,
+ QWebEngineSettings.WebAttribute.DnsPrefetchEnabled,
Preferences.getWebBrowser(
"DnsPrefetchEnabled"))
try:
# Qt 5.13
settings.setAttribute(
- QWebEngineSettings.PdfViewerEnabled,
+ QWebEngineSettings.WebAttribute.PdfViewerEnabled,
Preferences.getWebBrowser(
"PdfViewerEnabled"))
except (AttributeError, KeyError):
@@ -2339,7 +2344,7 @@
vttb = self.addToolBar(self.tr("VirusTotal"))
vttb.setObjectName("VirusTotalToolBar")
vttb.setIconSize(UI.Config.ToolBarIconSize)
- vttb.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
+ vttb.setToolButtonStyle(Qt.ToolButtonStyle.ToolButtonTextBesideIcon)
vttb.addAction(self.virustotalScanCurrentAct)
vttb.addAction(self.virustotalIpReportAct)
vttb.addAction(self.virustotalDomainReportAct)
@@ -2984,7 +2989,7 @@
"""
if self.__htmlFullScreen:
self.currentBrowser().triggerPageAction(
- QWebEnginePage.ExitFullScreen)
+ QWebEnginePage.WebAction.ExitFullScreen)
return
if self.isFullScreen():
@@ -3170,7 +3175,7 @@
dlg.showConfigurationPageByName("empty")
dlg.exec()
QApplication.processEvents()
- if dlg.result() == QDialog.Accepted:
+ if dlg.result() == QDialog.DialogCode.Accepted:
dlg.setPreferences()
Preferences.syncPreferences()
self.preferencesChanged()
@@ -3198,11 +3203,13 @@
profile = self.webProfile()
if not self.isPrivate():
if Preferences.getWebBrowser("DiskCacheEnabled"):
- profile.setHttpCacheType(QWebEngineProfile.DiskHttpCache)
+ profile.setHttpCacheType(
+ QWebEngineProfile.HttpCacheType.DiskHttpCache)
profile.setHttpCacheMaximumSize(
Preferences.getWebBrowser("DiskCacheSize") * 1024 * 1024)
else:
- profile.setHttpCacheType(QWebEngineProfile.MemoryHttpCache)
+ profile.setHttpCacheType(
+ QWebEngineProfile.HttpCacheType.MemoryHttpCache)
profile.setHttpCacheMaximumSize(0)
try:
@@ -3480,8 +3487,8 @@
self.__indexingProgress = QWidget()
layout = QHBoxLayout(self.__indexingProgress)
layout.setContentsMargins(0, 0, 0, 0)
- sizePolicy = QSizePolicy(QSizePolicy.Preferred,
- QSizePolicy.Maximum)
+ sizePolicy = QSizePolicy(QSizePolicy.Policy.Preferred,
+ QSizePolicy.Policy.Maximum)
label = QLabel(self.tr("Updating search index"))
label.setSizePolicy(sizePolicy)
@@ -3519,7 +3526,7 @@
):
self.__searchDock.show()
self.__searchDock.raise_()
- query = QHelpSearchQuery(QHelpSearchQuery.DEFAULT,
+ query = QHelpSearchQuery(QHelpSearchQuery.FieldName.DEFAULT,
[self.__searchWord])
self.__searchEngine.search([query])
self.__searchWord = None
@@ -3623,7 +3630,7 @@
WebBrowserClearPrivateDataDialog
)
dlg = WebBrowserClearPrivateDataDialog(self)
- if dlg.exec() == QDialog.Accepted:
+ if dlg.exec() == QDialog.DialogCode.Accepted:
# browsing history, search history, favicons, disk cache, cookies,
# passwords, web databases, downloads, zoom values, SSL error
# exceptions, history period
@@ -4342,10 +4349,12 @@
@param evt reference to the mouse event (QMouseEvent)
"""
- if evt.button() == Qt.XButton1:
- self.currentBrowser().triggerPageAction(QWebEnginePage.Back)
- elif evt.button() == Qt.XButton2:
- self.currentBrowser().triggerPageAction(QWebEnginePage.Forward)
+ if evt.button() == Qt.MouseButton.XButton1:
+ self.currentBrowser().triggerPageAction(
+ QWebEnginePage.WebAction.Back)
+ elif evt.button() == Qt.MouseButton.XButton2:
+ self.currentBrowser().triggerPageAction(
+ QWebEnginePage.WebAction.Forward)
else:
super(WebBrowserWindow, self).mousePressEvent(evt)
@@ -4461,35 +4470,39 @@
number = -1
key = evt.key()
- if key == Qt.Key_1:
+ if key == Qt.Key.Key_1:
number = 1
- elif key == Qt.Key_2:
+ elif key == Qt.Key.Key_2:
number = 2
- elif key == Qt.Key_3:
+ elif key == Qt.Key.Key_3:
number = 3
- elif key == Qt.Key_4:
+ elif key == Qt.Key.Key_4:
number = 4
- elif key == Qt.Key_5:
+ elif key == Qt.Key.Key_5:
number = 5
- elif key == Qt.Key_6:
+ elif key == Qt.Key.Key_6:
number = 6
- elif key == Qt.Key_7:
+ elif key == Qt.Key.Key_7:
number = 7
- elif key == Qt.Key_8:
+ elif key == Qt.Key.Key_8:
number = 8
- elif key == Qt.Key_9:
+ elif key == Qt.Key.Key_9:
number = 9
- elif key == Qt.Key_0:
+ elif key == Qt.Key.Key_0:
number = 10
if number != -1:
- if evt.modifiers() == Qt.KeyboardModifiers(Qt.AltModifier):
+ if evt.modifiers() == Qt.KeyboardModifiers(
+ Qt.KeyboardModifier.AltModifier
+ ):
if number == 10:
number = self.__tabWidget.count()
self.__tabWidget.setCurrentIndex(number - 1)
return
- if evt.modifiers() == Qt.KeyboardModifiers(Qt.MetaModifier):
+ if evt.modifiers() == Qt.KeyboardModifiers(
+ Qt.KeyboardModifier.MetaModifier
+ ):
url = self.speedDial().urlForShortcut(number - 1)
if url.isValid():
self.__linkActivated(url)
@@ -4506,10 +4519,10 @@
@return flag indicating a handled event
@rtype bool
"""
- if evt.type() == QEvent.WindowStateChange:
+ if evt.type() == QEvent.Type.WindowStateChange:
if (
- not bool(evt.oldState() & Qt.WindowFullScreen) and
- bool(self.windowState() & Qt.WindowFullScreen)
+ not bool(evt.oldState() & Qt.WindowState.WindowFullScreen) and
+ bool(self.windowState() & Qt.WindowState.WindowFullScreen)
):
# enter full screen mode
self.__windowStates = evt.oldState()
@@ -4526,8 +4539,8 @@
self.__navigationContainer.hide()
elif (
- bool(evt.oldState() & Qt.WindowFullScreen) and
- not bool(self.windowState() & Qt.WindowFullScreen)
+ bool(evt.oldState() & Qt.WindowState.WindowFullScreen) and
+ not bool(self.windowState() & Qt.WindowState.WindowFullScreen)
):
# leave full screen mode
self.setWindowState(self.__windowStates)
@@ -4605,7 +4618,7 @@
self,
self.tr("IP Address Report"),
self.tr("Enter a valid IPv4 address in dotted quad notation:"),
- QLineEdit.Normal)
+ QLineEdit.EchoMode.Normal)
if ok and ip:
if ip.count(".") == 3:
self.__virusTotal.getIpAddressReport(ip)
@@ -4624,7 +4637,7 @@
self,
self.tr("Domain Report"),
self.tr("Enter a valid domain name:"),
- QLineEdit.Normal)
+ QLineEdit.EchoMode.Normal)
if ok and domain:
self.__virusTotal.getDomainReport(domain)
@@ -4662,7 +4675,8 @@
script = QWebEngineScript()
script.setName(name)
- script.setInjectionPoint(QWebEngineScript.DocumentCreation)
+ script.setInjectionPoint(
+ QWebEngineScript.InjectionPoint.DocumentCreation)
script.setWorldId(WebBrowserPage.SafeJsWorld)
script.setRunsOnSubFrames(True)
script.setSourceCode(Scripts.setStyleSheet(userStyle))
@@ -4763,7 +4777,7 @@
if not private:
if Preferences.getWebBrowser("DiskCacheEnabled"):
cls._webProfile.setHttpCacheType(
- QWebEngineProfile.DiskHttpCache)
+ QWebEngineProfile.HttpCacheType.DiskHttpCache)
cls._webProfile.setHttpCacheMaximumSize(
Preferences.getWebBrowser("DiskCacheSize") *
1024 * 1024)
@@ -4771,13 +4785,14 @@
Utilities.getConfigDir(), "web_browser"))
else:
cls._webProfile.setHttpCacheType(
- QWebEngineProfile.MemoryHttpCache)
+ QWebEngineProfile.HttpCacheType.MemoryHttpCache)
cls._webProfile.setHttpCacheMaximumSize(0)
cls._webProfile.setPersistentStoragePath(os.path.join(
Utilities.getConfigDir(), "web_browser",
"persistentstorage"))
cls._webProfile.setPersistentCookiesPolicy(
- QWebEngineProfile.AllowPersistentCookies)
+ QWebEngineProfile.PersistentCookiesPolicy
+ .AllowPersistentCookies)
try:
cls._webProfile.setSpellCheckEnabled(
@@ -4794,7 +4809,8 @@
# WebChannel for SafeJsWorld
script = QWebEngineScript()
script.setName("_eric_webchannel")
- script.setInjectionPoint(QWebEngineScript.DocumentCreation)
+ script.setInjectionPoint(
+ QWebEngineScript.InjectionPoint.DocumentCreation)
script.setWorldId(WebBrowserPage.SafeJsWorld)
script.setRunsOnSubFrames(True)
script.setSourceCode(Scripts.setupWebChannel(script.worldId()))
@@ -4803,7 +4819,8 @@
# WebChannel for UnsafeJsWorld
script2 = QWebEngineScript()
script2.setName("_eric_webchannel2")
- script2.setInjectionPoint(QWebEngineScript.DocumentCreation)
+ script2.setInjectionPoint(
+ QWebEngineScript.InjectionPoint.DocumentCreation)
script2.setWorldId(WebBrowserPage.UnsafeJsWorld)
script2.setRunsOnSubFrames(True)
script2.setSourceCode(Scripts.setupWebChannel(script2.worldId()))
@@ -4812,7 +4829,8 @@
# document.window object addons
script3 = QWebEngineScript()
script3.setName("_eric_window_object")
- script3.setInjectionPoint(QWebEngineScript.DocumentCreation)
+ script3.setInjectionPoint(
+ QWebEngineScript.InjectionPoint.DocumentCreation)
script3.setWorldId(WebBrowserPage.UnsafeJsWorld)
script3.setRunsOnSubFrames(True)
script3.setSourceCode(Scripts.setupWindowObject())
