eric: comparison WebBrowser/WebBrowserWindow.py

-:5841f229baf7
+:b19ff70ba509
 from PyQt5.QtWidgets import QWidget, QVBoxLayout, QSizePolicy, QDockWidget, \
 QComboBox, QLabel, QSplitter, QMenu, QToolButton, QLineEdit, \
 QApplication, QWhatsThis, QDialog, QHBoxLayout, QProgressBar, QAction, \
 QInputDialog
 ##from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest
-from PyQt5.QtWebEngineWidgets import QWebEngineSettings, QWebEnginePage
+from PyQt5.QtWebEngineWidgets import QWebEngineSettings, QWebEnginePage, \
+QWebEngineProfile, QWebEngineScript
 try:
 from PyQt5.QtHelp import QHelpEngine, QHelpEngineCore, QHelpSearchQuery
 QTHELP_AVAILABLE = True
 except ImportError:
 QTHELP_AVAILABLE = False
-##
-##from .Network.NetworkAccessManager import SSL_AVAILABLE
-##
-##from .data import icons_rc          # __IGNORE_WARNING__
-##from .data import html_rc           # __IGNORE_WARNING__
-##from .data import javascript_rc     # __IGNORE_WARNING__
-##
 from E5Gui.E5Action import E5Action
 from E5Gui import E5MessageBox, E5FileDialog, E5ErrorMessage
 from E5Gui.E5MainWindow import E5MainWindow
 from E5Gui.E5Application import e5App
 from E5Gui.E5ZoomWidget import E5ZoomWidget
 import Utilities
 import UI.PixmapCache
 import UI.Config
 from UI.Info import Version
+##
+##from .Network.NetworkAccessManager import SSL_AVAILABLE
+##
+##from .data import icons_rc          # __IGNORE_WARNING__
+##from .data import html_rc           # __IGNORE_WARNING__
+##from .data import javascript_rc     # __IGNORE_WARNING__
+##
+from .Tools import Scripts, WebBrowserTools
 class WebBrowserWindow(E5MainWindow):
 """
 Class implementing the web browser main window.
 ##    maxMenuFilePathLen = 75
 ##
 _fromEric = False
 UseQtHelp = QTHELP_AVAILABLE
-##    _networkAccessManager = None
+_networkManager = None
 ##    _cookieJar = None
 ##    _helpEngine = None
 ##    _bookmarksManager = None
 ##    _historyManager = None
 ##    _passwordManager = None
 ##    _featurePermissionManager = None
 ##    _flashCookieManager = None
 ##    _zoomManager = None
 def __init__(self, home, path, parent, name, fromEric=False,
-initShortcutsOnly=False, searchWord=None):
+initShortcutsOnly=False, searchWord=None,
+private=False):
 """
 Constructor
 @param home the URL to be shown (string)
 @param path the path of the working dir (usually '.') (string)
 @param fromEric flag indicating whether it was called from within
 eric6 (boolean)
 @keyparam initShortcutsOnly flag indicating to just initialize the
 keyboard shortcuts (boolean)
 @keyparam searchWord word to search for (string)
+@keyparam private flag indicating a private browsing window (bool)
 """
 super(WebBrowserWindow, self).__init__(parent)
 self.setObjectName(name)
 self.setWindowTitle(self.tr("eric6 Web Browser"))
 self.setWindowIcon(UI.PixmapCache.getIcon("ericWeb.png"))
 self.__mHistory = []
 self.__lastConfigurationPageName = ""
+self.__isPrivate = private
 ##        self.__eventMouseButtons = Qt.NoButton
 ##        self.__eventKeyboardModifiers = Qt.NoModifier
 ##
 if self.__initShortcutsOnly:
 self.__initActions()
 else:
+if self.isPrivate():
+self.__webProfile = QWebEngineProfile(self)
+else:
+self.__webProfile = QWebEngineProfile.defaultProfile()
+self.__webProfile.downloadRequested.connect(
+self.__downloadRequested)
+# Setup QWebChannel user script
+script = QWebEngineScript()
+script.setName("_eric_webchannel")
+script.setInjectionPoint(QWebEngineScript.DocumentCreation)
+script.setWorldId(QWebEngineScript.MainWorld)
+script.setRunsOnSubFrames(True)
+script.setSourceCode(Scripts.setupWebChannel())
+self.__webProfile.scripts().insert(script)
 from .SearchWidget import SearchWidget
 # TODO: QtHelp
 ##            from .HelpTocWidget import HelpTocWidget
 ##            from .HelpIndexWidget import HelpIndexWidget
 ##            from .HelpSearchWidget import HelpSearchWidget
 standardFont.pointSize())
 settings.setFontFamily(QWebEngineSettings.FixedFont,
 fixedFont.family())
 settings.setFontSize(QWebEngineSettings.DefaultFixedFontSize,
 fixedFont.pointSize())
+settings.setFontSize(
-##        styleSheet = Preferences.getHelp("UserStyleSheet")
+QWebEngineSettings.MinimumFontSize,
-##        settings.setUserStyleSheetUrl(self.__userStyleSheet(styleSheet))
+Preferences.getWebBrowser("MinimumFontSize"))
-##
+settings.setFontSize(
+QWebEngineSettings.MinimumLogicalFontSize,
+Preferences.getWebBrowser("MinimumLogicalFontSize"))
+styleSheet = Preferences.getHelp("UserStyleSheet")
+self.__setUserStyleSheet(styleSheet)
 settings.setAttribute(
 QWebEngineSettings.AutoLoadImages,
 Preferences.getWebBrowser("AutoLoadImages"))
 ##        settings.setAttribute(
 ##            QWebSettings.JavaEnabled,
 ##            settings.setOfflineWebApplicationCachePath(appCacheDir)
 ##            settings.setOfflineWebApplicationCacheQuota(
 ##                Preferences.getHelp("OfflineWebApplicationCacheQuota") *
 ##                1024 * 1024)
 ##
-settings.setAttribute(
+if self.isPrivate():
-QWebEngineSettings.LocalStorageEnabled,
+settings.setAttribute(
-Preferences.getWebBrowser("LocalStorageEnabled"))
+QWebEngineSettings.LocalStorageEnabled, False)
+else:
+settings.setAttribute(
+QWebEngineSettings.LocalStorageEnabled,
+Preferences.getWebBrowser("LocalStorageEnabled"))
 ##        localStorageDir = os.path.join(
 ##            Utilities.getConfigDir(), "browser", "weblocalstorage")
 ##        if not os.path.exists(localStorageDir):
 ##            os.makedirs(localStorageDir)
 ##        settings.setLocalStoragePath(localStorageDir)
 ##        else:
 ##            self.__setIconDatabasePath(True)
 ##        self.privateBrowsingAct.setChecked(on)
 ##        self.privacyChanged.emit(on)
+def isPrivate(self):
+"""
+Public method to check the private browsing mode.
+@return flag indicating private browsing mode
+@rtype bool
+"""
+return self.__isPrivate
 def currentBrowser(self):
 """
 Public method to get a reference to the current web browser.
 @return reference to the current help browser (WebBrowserView)
 ##                                             "browser", "eric6help.qhc"))
 ##            return cls._helpEngine
 ##        else:
 ##            return None
 ##
-##    @classmethod
+@classmethod
-##    def networkAccessManager(cls):
+def networkManager(cls):
-##        """
+"""
-##        Class method to get a reference to the network access manager.
+Class method to get a reference to the network manager object.
-##
-##        @return reference to the network access manager (NetworkAccessManager)
+@return reference to the network access manager (NetworkManager)
-##        """
+"""
-##        if cls._networkAccessManager is None:
+if cls._networkManager is None:
-##            from .Network.NetworkAccessManager import NetworkAccessManager
+from .Network.NetworkManager import NetworkManager
-##            from .CookieJar.CookieJar import CookieJar
+cls._networkManager = NetworkManager()
-##            cls._networkAccessManager = \
-##                NetworkAccessManager(cls.helpEngine())
+return cls._networkManager
-##            cls._cookieJar = CookieJar()
-##            cls._networkAccessManager.setCookieJar(cls._cookieJar)
-##
-##        return cls._networkAccessManager
-##
 ##    @classmethod
 ##    def cookieJar(cls):
 ##        """
 ##        Class method to get a reference to the cookie jar.
 ##
 ##        @return reference to the cookie jar (CookieJar)
 ##        """
+##            from .CookieJar.CookieJar import CookieJar
+##            cls._cookieJar = CookieJar()
 ##        return cls.networkAccessManager().cookieJar()
 ##
 ##    def __clearIconsDatabase(self):
 ##        """
 ##        Private slot to clear the icons databse.
 ##            self.tr("Domain Report"),
 ##            self.tr("Enter a valid domain name:"),
 ##            QLineEdit.Normal)
 ##        if ok and domain:
 ##            self.__virusTotal.getDomainReport(domain)
-##
-##    ###########################################################################
+###########################################################################
-##    ## Style sheet handling below                                            ##
+## Style sheet handling below                                            ##
-##    ###########################################################################
+###########################################################################
-##
-##    def reloadUserStyleSheet(self):
+def reloadUserStyleSheet(self):
-##        """
+"""
-##        Public method to reload the user style sheet.
+Public method to reload the user style sheet.
-##        """
+"""
-##        settings = QWebSettings.globalSettings()
+styleSheet = Preferences.getWebBrowser("UserStyleSheet")
-##        styleSheet = Preferences.getHelp("UserStyleSheet")
+self.__setUserStyleSheet(styleSheet)
-##        settings.setUserStyleSheetUrl(self.__userStyleSheet(styleSheet))
-##
+def __setUserStyleSheet(self, styleSheetFile):
-##    def __userStyleSheet(self, styleSheetFile):
+"""
-##        """
+Private method to set a user style sheet.
-##        Private method to generate the user style sheet.
-##
+@param styleSheetFile name of the user style sheet file (string)
-##        @param styleSheetFile name of the user style sheet file (string)
+"""
-##        @return style sheet (QUrl)
+# TODO: AdBlock
-##        """
+userStyle = ""
-##        userStyle = self.adBlockManager().elementHidingRules() + \
+##        userStyle = \
-##            "{display:none !important;}"
+##            self.adBlockManager().elementHidingRules().replace('"', '\\"')
-##
-##        if styleSheetFile:
+userStyle += WebBrowserTools.readAllFileContents(styleSheetFile)\
-##            try:
+.replace("\n", "")
-##                f = open(styleSheetFile, "r")
+name = "_eric_userstylesheet"
-##                fileData = f.read()
-##                f.close()
+oldScript = self.__webProfile.scripts().findScript(name)
-##                fileData = fileData.replace("\n", "")
+if not oldScript.isNull():
-##                userStyle += fileData
+self.__webProfile.scripts().remove(oldScript)
-##            except IOError:
-##                pass
+if userStyle:
-##
+script = QWebEngineScript()
-##        encodedStyle = bytes(QByteArray(userStyle.encode("utf-8")).toBase64())\
+script.setName(name)
-##            .decode()
+script.setInjectionPoint(QWebEngineScript.DocumentCreation)
-##        dataString = "data:text/css;charset=utf-8;base64,{0}".format(
+script.setWorldId(QWebEngineScript.ApplicationWorld)
-##            encodedStyle)
+script.setRunsOnSubFrames(True)
-##
+script.setSourceCode(Scripts.setStyleSheet(userStyle))
-##        return QUrl(dataString)
+self.__webProfile.scripts().insert(script)
 ##########################################
 ## Support for desktop notifications below
 ##########################################
 """
 if cls._fromEric:
 return e5App().getObject("UserInterface").notificationsEnabled()
 else:
 return Preferences.getUI("NotificationsEnabled")
+###################################
+## Support for download files below
+###################################
+def __downloadRequested(self, download):
+"""
+Private slot to handle a download request.
+@param download reference to the download data
+@type QWebEngineDownloadItem
+"""
+pass
+# TODO: DownloadManager
+##        self.downloadManager().download(download, mainWindow=self)

Mercurial Repositories > eric / file comparison

comparison: WebBrowser/WebBrowserWindow.py

WebBrowser/WebBrowserWindow.py