eric: comparison eric6/WebBrowser/WebBrowserWindow.py

-:41d09cf20415
+:2cac5b7abcce
 import os
 import shutil
 import sys
-from PyQt5.QtCore import pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, \
+from PyQt5.QtCore import (
-QUrl, QTextCodec, QProcess, QEvent, QFileInfo
+pyqtSlot, pyqtSignal, Qt, QByteArray, QSize, QTimer, QUrl, QTextCodec,
+QProcess, QEvent, QFileInfo
+)
 from PyQt5.QtGui import QDesktopServices, QKeySequence, QFont, QFontMetrics
-from PyQt5.QtWidgets import QWidget, QVBoxLayout, QSizePolicy, QDockWidget, \
+from PyQt5.QtWidgets import (
-QComboBox, QLabel, QMenu, QLineEdit, QApplication, \
+QWidget, QVBoxLayout, QSizePolicy, QDockWidget, QComboBox, QLabel, QMenu,
-QWhatsThis, QDialog, QHBoxLayout, QProgressBar, QInputDialog, QAction
+QLineEdit, QApplication, QWhatsThis, QDialog, QHBoxLayout, QProgressBar,
-from PyQt5.QtWebEngineWidgets import QWebEngineSettings, QWebEnginePage, \
+QInputDialog, QAction
-QWebEngineProfile, QWebEngineScript
+)
+from PyQt5.QtWebEngineWidgets import (
+QWebEngineSettings, QWebEnginePage, QWebEngineProfile, QWebEngineScript
+)
 try:
 from PyQt5.QtHelp import QHelpEngine, QHelpEngineCore, QHelpSearchQuery
 QTHELP_AVAILABLE = True
 except ImportError:
 QTHELP_AVAILABLE = False
 self.__shortcutsDialog = None
 self.__eventMouseButtons = Qt.NoButton
 self.__eventKeyboardModifiers = Qt.NoModifier
-if qVersionTuple() < (5, 11, 0) and \
+if (
-Preferences.getWebBrowser("WebInspectorEnabled"):
+qVersionTuple() < (5, 11, 0) and
-os.environ["QTWEBENGINE_REMOTE_DEBUGGING"] = \
+Preferences.getWebBrowser("WebInspectorEnabled")
-str(Preferences.getWebBrowser("WebInspectorPort"))
+):
+os.environ["QTWEBENGINE_REMOTE_DEBUGGING"] = str(
+Preferences.getWebBrowser("WebInspectorPort"))
 WebBrowserWindow.setUseQtHelp(qthelp or bool(searchWord))
 self.webProfile(private)
 self.networkManager()
 self.__searchDock.setObjectName("SearchWindow")
 self.__searchDock.setWidget(self.__searchWindow)
 self.addDockWidget(Qt.LeftDockWidgetArea, self.__searchDock)
 # JavaScript Console window
-from .WebBrowserJavaScriptConsole import \
+from .WebBrowserJavaScriptConsole import WebBrowserJavaScriptConsole
-WebBrowserJavaScriptConsole
 self.__javascriptConsole = WebBrowserJavaScriptConsole(self)
 self.__javascriptConsoleDock = QDockWidget(
 self.tr("JavaScript Console"))
 self.__javascriptConsoleDock.setObjectName("JavascriptConsole")
 self.__javascriptConsoleDock.setAllowedAreas(
 syncMgr = self.syncManager()
 syncMgr.syncMessage.connect(self.statusBar().showMessage)
 syncMgr.syncError.connect(self.statusBar().showMessage)
 restoreSessionData = {}
-if WebBrowserWindow._performingStartup and not home and \
+if (
-not WebBrowserWindow.isPrivate():
+WebBrowserWindow._performingStartup and
+not home and
+not WebBrowserWindow.isPrivate()
+):
 startupBehavior = Preferences.getWebBrowser("StartupBehavior")
 if not private and startupBehavior in [3, 4]:
 if startupBehavior == 3:
 # restore last session
-restoreSessionFile = \
+restoreSessionFile = (
 self.sessionManager().lastActiveSessionFile()
+)
 elif startupBehavior == 4:
 # select session
-restoreSessionFile = \
+restoreSessionFile = self.sessionManager().selectSession()
-self.sessionManager().selectSession()
+sessionData = self.sessionManager().readSessionFromFile(
-sessionData = \
+restoreSessionFile)
-self.sessionManager().readSessionFromFile(
-restoreSessionFile)
 if self.sessionManager().isValidSession(sessionData):
 restoreSessionData = sessionData
 restoreSession = True
 else:
 if Preferences.getWebBrowser("StartupBehavior") == 0:
 self, 'webbrowser_virustotal_domain_report')
 self.virustotalDomainReportAct.triggered.connect(
 self.__virusTotalDomainReport)
 self.__actions.append(self.virustotalDomainReportAct)
-if not Preferences.getWebBrowser("VirusTotalEnabled") or \
+if (
-Preferences.getWebBrowser("VirusTotalServiceKey") == "":
+not Preferences.getWebBrowser("VirusTotalEnabled") or
+Preferences.getWebBrowser("VirusTotalServiceKey") == ""
+):
 self.virustotalScanCurrentAct.setEnabled(False)
 self.virustotalIpReportAct.setEnabled(False)
 self.virustotalDomainReportAct.setEnabled(False)
 self.shortcutsAct = E5Action(
 args.append("--settings={0}".format(self.__settingsDir))
 args.append("--private")
 if linkName:
 args.append(linkName)
-if not os.path.isfile(applPath) or \
+if (
-not QProcess.startDetached(sys.executable, args):
+not os.path.isfile(applPath) or
+not QProcess.startDetached(sys.executable, args)
+):
 E5MessageBox.critical(
 self,
 self.tr('New Private Window'),
 self.tr(
 '<p>Could not start the process.<br>'
 def __about(self):
 """
 Private slot to show the about information.
 """
-chromeVersion, webengineVersion = \
+chromeVersion, webengineVersion = (
 WebBrowserTools.getWebEngineVersions()
+)
 E5MessageBox.about(
 self,
 self.tr("eric6 Web Browser"),
 self.tr(
 """<b>eric6 Web Browser - {0}</b>"""
 if not self.__tabWidget.shallShutDown():
 return False
 self.__isClosing = True
-if not WebBrowserWindow._performingShutdown and \
+if (
-len(WebBrowserWindow.BrowserWindows) == 1 and \
+not WebBrowserWindow._performingShutdown and
-not WebBrowserWindow.isPrivate():
+len(WebBrowserWindow.BrowserWindows) == 1 and
+not WebBrowserWindow.isPrivate()
+):
 # shut down the session manager in case the last window is
 # about to be closed
 self.sessionManager().shutdown()
 self.__bookmarksToolBar.setModel(None)
 del WebBrowserWindow.BrowserWindows[browserIndex]
 except ValueError:
 pass
 Preferences.syncPreferences()
-if not WebBrowserWindow._performingShutdown and \
+if (
-len(WebBrowserWindow.BrowserWindows) == 0:
+not WebBrowserWindow._performingShutdown and
+len(WebBrowserWindow.BrowserWindows) == 0
+):
 # shut down the browser in case the last window was
 # simply closed
 self.shutdown()
 return True
 @return flag indicating successful shutdown (boolean)
 """
 if not self.__shallShutDown():
 return False
-if WebBrowserWindow._downloadManager is not None and \
+if (
-not self.downloadManager().allowQuit():
+WebBrowserWindow._downloadManager is not None and
+not self.downloadManager().allowQuit()
+):
 return False
 WebBrowserWindow._performingShutdown = True
 if not WebBrowserWindow.isPrivate():
 except AttributeError:
 # not yet supported
 pass
 self.__virusTotal.preferencesChanged()
-if not Preferences.getWebBrowser("VirusTotalEnabled") or \
+if (
-Preferences.getWebBrowser("VirusTotalServiceKey") == "":
+not Preferences.getWebBrowser("VirusTotalEnabled") or
+Preferences.getWebBrowser("VirusTotalServiceKey") == ""
+):
 self.virustotalScanCurrentAct.setEnabled(False)
 self.virustotalIpReportAct.setEnabled(False)
 self.virustotalDomainReportAct.setEnabled(False)
 else:
 self.virustotalScanCurrentAct.setEnabled(True)
 def __showCookiesConfiguration(self):
 """
 Private slot to configure the cookies handling.
 """
-from .CookieJar.CookiesConfigurationDialog import \
+from .CookieJar.CookiesConfigurationDialog import (
 CookiesConfigurationDialog
+)
 dlg = CookiesConfigurationDialog(self)
 dlg.exec_()
 def __showFlashCookiesManagement(self):
 """
 def __manageQtHelpDocumentation(self):
 """
 Private slot to manage the QtHelp documentation database.
 """
 if WebBrowserWindow._useQtHelp:
-from .QtHelp.QtHelpDocumentationDialog import \
+from .QtHelp.QtHelpDocumentationDialog import (
 QtHelpDocumentationDialog
+)
 dlg = QtHelpDocumentationDialog(self.__helpEngine, self)
 dlg.exec_()
 if dlg.hasDocumentationChanges():
 for i in sorted(dlg.getTabsToClose(), reverse=True):
 self.__tabWidget.closeBrowserAt(i)
 def __searchForWord(self):
 """
 Private slot to search for a word.
 """
-if WebBrowserWindow._useQtHelp and not self.__indexing and \
+if (
-self.__searchWord is not None:
+WebBrowserWindow._useQtHelp and
+not self.__indexing and
+self.__searchWord is not None
+):
 self.__searchDock.show()
 self.__searchDock.raise_()
 query = QHelpSearchQuery(QHelpSearchQuery.DEFAULT,
 [self.__searchWord])
 self.__searchEngine.search([query])
 def __clearPrivateData(self):
 """
 Private slot to clear the private data.
 """
-from .WebBrowserClearPrivateDataDialog import \
+from .WebBrowserClearPrivateDataDialog import (
 WebBrowserClearPrivateDataDialog
+)
 dlg = WebBrowserClearPrivateDataDialog(self)
 if dlg.exec_() == QDialog.Accepted:
 # browsing history, search history, favicons, disk cache, cookies,
 # passwords, web databases, downloads, Flash cookies
 (history, searches, favicons, cache, cookies,
 @return reference to the personal information manager
 (PersonalInformationManager)
 """
 if cls._personalInformationManager is None:
-from .PersonalInformationManager.PersonalInformationManager \
+from .PersonalInformationManager import PersonalInformationManager
-import PersonalInformationManager
+cls._personalInformationManager = (
-cls._personalInformationManager = PersonalInformationManager()
+PersonalInformationManager.PersonalInformationManager()
+)
 return cls._personalInformationManager
 @classmethod
 def greaseMonkeyManager(cls):
 @return reference to the feature permission manager
 @rtype FeaturePermissionManager
 """
 if cls._featurePermissionManager is None:
-from .FeaturePermissions.FeaturePermissionManager import \
+from .FeaturePermissions.FeaturePermissionManager import (
 FeaturePermissionManager
+)
 cls._featurePermissionManager = FeaturePermissionManager()
 return cls._featurePermissionManager
 @classmethod
 @return reference to the flash cookies manager
 @rtype FlashCookieManager
 """
 if cls._flashCookieManager is None:
-from .FlashCookieManager.FlashCookieManager import \
+from .FlashCookieManager.FlashCookieManager import (
 FlashCookieManager
+)
 cls._flashCookieManager = FlashCookieManager()
 return cls._flashCookieManager
 @classmethod
 @return reference to the image finder object
 @rtype ImageSearchEngine
 """
 if cls._imageSearchEngine is None:
-from .ImageSearch.ImageSearchEngine import \
+from .ImageSearch.ImageSearchEngine import (
 ImageSearchEngine
+)
 cls._imageSearchEngine = ImageSearchEngine()
 return cls._imageSearchEngine
 @classmethod
 @type list of str
 @param parentMenu reference to the parent menu
 @type QMenu
 """
 if codecNames:
-defaultCodec = \
+defaultCodec = self.webSettings().defaultTextEncoding().lower()
-self.webSettings().defaultTextEncoding().lower()
 menu = QMenu(title, parentMenu)
 for codec in codecNames:
 self.__createTextEncodingAction(codec, defaultCodec, menu)
 @type QEvent
 @return flag indicating a handled event
 @rtype bool
 """
 if evt.type() == QEvent.WindowStateChange:
-if not bool(evt.oldState() & Qt.WindowFullScreen) and \
+if (
-bool(self.windowState() & Qt.WindowFullScreen):
+not bool(evt.oldState() & Qt.WindowFullScreen) and
+bool(self.windowState() & Qt.WindowFullScreen)
+):
 # enter full screen mode
 self.__windowStates = evt.oldState()
 self.__toolbarStates = self.saveState()
 self.menuBar().hide()
 self.statusBar().hide()
 if toolbar is not self.__bookmarksToolBar:
 toolbar.hide()
 self.__navigationBar.exitFullScreenButton().setVisible(True)
 self.__navigationContainer.hide()
-elif bool(evt.oldState() & Qt.WindowFullScreen) and \
+elif (
-not bool(self.windowState() & Qt.WindowFullScreen):
+bool(evt.oldState() & Qt.WindowFullScreen) and
+not bool(self.windowState() & Qt.WindowFullScreen)
+):
 # leave full screen mode
 self.setWindowState(self.__windowStates)
 self.__htmlFullScreen = False
 if Preferences.getWebBrowser("MenuBarVisible"):
 self.menuBar().show()
 @param styleSheetFile name of the user style sheet file (string)
 """
 name = "_eric_userstylesheet"
 userStyle = ""
-userStyle += WebBrowserTools.readAllFileContents(styleSheetFile)\
+userStyle += (
+WebBrowserTools.readAllFileContents(styleSheetFile)
 .replace("\n", "")
+)
 oldScript = self.webProfile().scripts().findScript(name)
 if not oldScript.isNull():
 self.webProfile().scripts().remove(oldScript)

Mercurial Repositories > eric / file comparison

comparison: eric6/WebBrowser/WebBrowserWindow.py

eric6/WebBrowser/WebBrowserWindow.py