--- a/src/eric7/WebBrowser/WebBrowserWindow.py Fri Nov 04 13:46:31 2022 +0100 +++ b/src/eric7/WebBrowser/WebBrowserWindow.py Fri Nov 04 13:52:26 2022 +0100 @@ -7,45 +7,45 @@ Module implementing the web browser main window. """ -import os -import shutil +import contextlib import functools -import contextlib +import os import pathlib +import shutil from PyQt6.QtCore import ( - pyqtSlot, - pyqtSignal, + QByteArray, + QEvent, + QProcess, + QSize, Qt, - QByteArray, - QSize, QTimer, QUrl, - QProcess, - QEvent, + pyqtSignal, + pyqtSlot, ) -from PyQt6.QtGui import QDesktopServices, QKeySequence, QAction, QFont, QFontMetrics -from PyQt6.QtWidgets import ( - QWidget, - QVBoxLayout, - QSizePolicy, - QDockWidget, - QComboBox, - QLabel, - QMenu, - QLineEdit, - QApplication, - QWhatsThis, - QDialog, - QHBoxLayout, - QProgressBar, - QInputDialog, -) +from PyQt6.QtGui import QAction, QDesktopServices, QFont, QFontMetrics, QKeySequence from PyQt6.QtWebEngineCore import ( - QWebEngineSettings, QWebEnginePage, QWebEngineProfile, QWebEngineScript, + QWebEngineSettings, +) +from PyQt6.QtWidgets import ( + QApplication, + QComboBox, + QDialog, + QDockWidget, + QHBoxLayout, + QInputDialog, + QLabel, + QLineEdit, + QMenu, + QProgressBar, + QSizePolicy, + QVBoxLayout, + QWhatsThis, + QWidget, ) try: @@ -55,34 +55,26 @@ except ImportError: QTHELP_AVAILABLE = False +from eric7 import Globals, Preferences, Utilities +from eric7.EricGui import EricPixmapCache from eric7.EricGui.EricAction import EricAction from eric7.EricGui.EricOverrideCursor import EricOverrideCursor - -from eric7.EricWidgets import EricMessageBox, EricFileDialog, EricErrorMessage +from eric7.EricNetwork.EricNetworkIcon import EricNetworkIcon +from eric7.EricWidgets import EricErrorMessage, EricFileDialog, EricMessageBox +from eric7.EricWidgets.EricApplication import ericApp from eric7.EricWidgets.EricMainWindow import EricMainWindow -from eric7.EricWidgets.EricApplication import ericApp from eric7.EricWidgets.EricZoomWidget import EricZoomWidget - -from eric7.EricNetwork.EricNetworkIcon import EricNetworkIcon - -from eric7 import Globals, Preferences, Utilities - +from eric7.Globals import getConfig from eric7.Preferences import Shortcuts - -from eric7.EricGui import EricPixmapCache from eric7.UI import Config from eric7.UI.Info import Version from eric7.UI.NotificationWidget import NotificationTypes +from eric7.WebBrowser.Tools import WebIconProvider +from eric7.WebBrowser.ZoomManager import ZoomManager from .Tools import Scripts, WebBrowserTools -from eric7.WebBrowser.Tools import WebIconProvider - -from eric7.WebBrowser.ZoomManager import ZoomManager - from .WebBrowserSingleApplication import WebBrowserSingleApplicationServer -from eric7.Globals import getConfig - class WebBrowserWindow(EricMainWindow): """ @@ -204,19 +196,19 @@ self.__windowStates = Qt.WindowState.WindowNoState self.__isClosing = False - from .SearchWidget import SearchWidget - from .QtHelp.HelpTocWidget import HelpTocWidget + from .AdBlock.AdBlockIcon import AdBlockIcon + from .Bookmarks.BookmarksToolBar import BookmarksToolBar + from .Navigation.NavigationBar import NavigationBar + from .Navigation.NavigationContainer import NavigationContainer from .QtHelp.HelpIndexWidget import HelpIndexWidget from .QtHelp.HelpSearchWidget import HelpSearchWidget - from .WebBrowserView import WebBrowserView - from .WebBrowserTabWidget import WebBrowserTabWidget - from .AdBlock.AdBlockIcon import AdBlockIcon - from .StatusBar.JavaScriptIcon import JavaScriptIcon + from .QtHelp.HelpTocWidget import HelpTocWidget + from .SearchWidget import SearchWidget from .StatusBar.ImagesIcon import ImagesIcon + from .StatusBar.JavaScriptIcon import JavaScriptIcon from .VirusTotal.VirusTotalApi import VirusTotalAPI - from .Navigation.NavigationBar import NavigationBar - from .Navigation.NavigationContainer import NavigationContainer - from .Bookmarks.BookmarksToolBar import BookmarksToolBar + from .WebBrowserTabWidget import WebBrowserTabWidget + from .WebBrowserView import WebBrowserView self.setStyle(Preferences.getUI("Style"), Preferences.getUI("StyleSheet")) @@ -3119,8 +3111,8 @@ """ Public slot to bookmark all open tabs. """ + from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog from .WebBrowserPage import WebBrowserPage - from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog dlg = AddBookmarkDialog() dlg.setFolder(True)