eric: comparison WebBrowser/WebBrowserWindow.py

-:f794ff054d8f
+:8ef007140046
 @signal webBrowserClosed() emitted after the window was requested to close
 @signal zoomTextOnlyChanged(bool) emitted after the zoom text only setting
 was changed
 """
-##    zoomTextOnlyChanged = pyqtSignal(bool)
 webBrowserClosed = pyqtSignal()
 BrowserWindows = []
 ##    maxMenuFilePathLen = 75
 def __initWebEngineSettings(self):
 """
 Private method to set the global web settings.
 """
-standardFont = Preferences.getWebBrowser("StandardFont")
-fixedFont = Preferences.getWebBrowser("FixedFont")
-# TODO: Fonts: add support for other font types
 settings = QWebEngineSettings.globalSettings()
-##        settings.setAttribute(QWebSettings.DeveloperExtrasEnabled, True)
+settings.setFontFamily(
-settings.setFontFamily(QWebEngineSettings.StandardFont,
+QWebEngineSettings.StandardFont,
-standardFont.family())
+Preferences.getWebBrowser("StandardFontFamily"))
-settings.setFontSize(QWebEngineSettings.DefaultFontSize,
+settings.setFontFamily(
-standardFont.pointSize())
+QWebEngineSettings.FixedFont,
-settings.setFontFamily(QWebEngineSettings.FixedFont,
+Preferences.getWebBrowser("FixedFontFamily"))
-fixedFont.family())
+settings.setFontFamily(
-settings.setFontSize(QWebEngineSettings.DefaultFixedFontSize,
+QWebEngineSettings.SerifFont,
-fixedFont.pointSize())
+Preferences.getWebBrowser("SerifFontFamily"))
+settings.setFontFamily(
+QWebEngineSettings.SansSerifFont,
+Preferences.getWebBrowser("SansSerifFontFamily"))
+settings.setFontFamily(
+QWebEngineSettings.CursiveFont,
+Preferences.getWebBrowser("CursiveFontFamily"))
+settings.setFontFamily(
+QWebEngineSettings.FantasyFont,
+Preferences.getWebBrowser("FantasyFontFamily"))
+settings.setFontSize(
+QWebEngineSettings.DefaultFontSize,
+Preferences.getWebBrowser("DefaultFontSize"))
+settings.setFontSize(
+QWebEngineSettings.DefaultFixedFontSize,
+Preferences.getWebBrowser("DefaultFixedFontSize"))
 settings.setFontSize(
 QWebEngineSettings.MinimumFontSize,
 Preferences.getWebBrowser("MinimumFontSize"))
 settings.setFontSize(
 QWebEngineSettings.MinimumLogicalFontSize,
 self.__setUserStyleSheet(styleSheet)
 settings.setAttribute(
 QWebEngineSettings.AutoLoadImages,
 Preferences.getWebBrowser("AutoLoadImages"))
+# TODO: Qt 5.6
 ##        settings.setAttribute(
 ##            QWebSettings.JavaEnabled,
 ##            Preferences.getWebBrowser("JavaEnabled"))
 settings.setAttribute(
 QWebEngineSettings.JavascriptEnabled,
 QWebEngineSettings.JavascriptCanOpenWindows,
 Preferences.getWebBrowser("JavaScriptCanOpenWindows"))
 settings.setAttribute(
 QWebEngineSettings.JavascriptCanAccessClipboard,
 Preferences.getWebBrowser("JavaScriptCanAccessClipboard"))
+# TODO: Qt 5.6
 ##        settings.setAttribute(
 ##            QWebSettings.PluginsEnabled,
 ##            Preferences.getWebBrowser("PluginsEnabled"))
 ##        if hasattr(QWebSettings, "PrintElementBackgrounds"):
 QWebEngineSettings.LocalContentCanAccessFileUrls,
 Preferences.getWebBrowser("LocalContentCanAccessFileUrls"))
 settings.setAttribute(
 QWebEngineSettings.XSSAuditingEnabled,
 Preferences.getWebBrowser("XSSAuditingEnabled"))
-##        if hasattr(QWebSettings, "SiteSpecificQuirksEnabled"):
-##            settings.setAttribute(
-##                QWebSettings.SiteSpecificQuirksEnabled,
-##                Preferences.getWebBrowser("SiteSpecificQuirksEnabled"))
 ##
 ##        QWebSecurityOrigin.addLocalScheme("eric")
 settings.setAttribute(
 QWebEngineSettings.ScrollAnimatorEnabled,
 Preferences.getWebBrowser("ScrollAnimatorEnabled"))
 """This sets the zoom factor to 100%.</p>"""
 ))
 if not self.__initShortcutsOnly:
 self.zoomResetAct.triggered.connect(self.__zoomReset)
 self.__actions.append(self.zoomResetAct)
-##        if hasattr(QWebSettings, 'ZoomTextOnly'):
-##            self.zoomTextOnlyAct = E5Action(
-##                self.tr('Zoom text only'),
-##                self.tr('Zoom &text only'),
-##                0, 0, self, 'webbrowser_view_zoom_text_only')
-##            self.zoomTextOnlyAct.setCheckable(True)
-##            self.zoomTextOnlyAct.setStatusTip(self.tr(
-##                'Zoom text only; pictures remain constant'))
-##            self.zoomTextOnlyAct.setWhatsThis(self.tr(
-##                """<b>Zoom text only</b>"""
-##                """<p>Zoom text only; pictures remain constant.</p>"""
-##            ))
-##            if not self.__initShortcutsOnly:
-##                self.zoomTextOnlyAct.triggered[bool].connect(
-##                    self.__zoomTextOnly)
-##            self.__actions.append(self.zoomTextOnlyAct)
-##        else:
-##            self.zoomTextOnlyAct = None
 self.pageSourceAct = E5Action(
 self.tr('Show page source'),
 self.tr('Show page source'),
 QKeySequence(self.tr('Ctrl+U')), 0,
 menu = mb.addMenu(self.tr('&View'))
 menu.setTearOffEnabled(True)
 menu.addAction(self.zoomInAct)
 menu.addAction(self.zoomResetAct)
 menu.addAction(self.zoomOutAct)
-##        if self.zoomTextOnlyAct is not None:
-##            menu.addAction(self.zoomTextOnlyAct)
 menu.addSeparator()
 menu.addAction(self.pageSourceAct)
 menu.addAction(self.fullScreenAct)
 self.__textEncodingMenu = menu.addMenu(
 self.tr("Text Encoding"))
 menu.setTearOffEnabled(True)
 menu.addAction(self.feedsManagerAct)
 menu.addAction(self.siteInfoAct)
 menu.addSeparator()
 menu.addAction(self.synchronizationAct)
+# TODO: Network Monitor
 ##        menu.addSeparator()
 ##        menu.addAction(self.toolsMonitorAct)
 menu = mb.addMenu(self.tr("&Window"))
 menu.setTearOffEnabled(True)
 if not self.downloadManager().allowQuit():
 return False
 self.downloadManager().shutdown()
+# TODO: Network Monitor
 ##        self.__closeNetworkMonitor()
 ##
+# TODO: Cookies
 ##        self.cookieJar().close()
 ##
 self.bookmarksToolBar.setModel(None)
 self.bookmarksManager().close()
 self.historyManager().close()
 self.passwordManager().close()
+# TODO: AdBlock
 ##        self.adBlockManager().close()
 ##
+# TODO: UserAgents
 ##        self.userAgentsManager().close()
 ##
+# TODO: SpeedDial
 ##        self.speedDial().close()
 self.syncManager().close()
 ZoomManager.instance().close()
 def __reload(self):
 """
 Private slot called to handle the reload action.
 """
-##        self.currentBrowser().reload()
 self.currentBrowser().reloadBypassingCache()
 def __stopLoading(self):
 """
 Private slot called to handle loading of the current page.
 Private slot called to handle the zoom reset action.
 """
 self.currentBrowser().zoomReset()
 self.__zoomWidget.setValue(self.currentBrowser().zoomValue())
-##    def __zoomTextOnly(self, textOnly):
-##        """
-##        Private slot called to handle the zoom text only action.
-##
-##        @param textOnly flag indicating to zoom text only (boolean)
-##        """
-##        QWebSettings.globalSettings().setAttribute(
-##            QWebSettings.ZoomTextOnly, textOnly)
-##        self.zoomTextOnlyChanged.emit(textOnly)
-##
 def __viewFullScreen(self):
 """
 Private slot called to toggle fullscreen mode.
 """
 if self.__isFullScreen():
 self.__tabWidget.preferencesChanged()
 self.searchEdit.preferencesChanged()
+if not self.isPrivate():
+# TODO: Cache settings
+pass
 self.__virusTotal.preferencesChanged()
 if not Preferences.getWebBrowser("VirusTotalEnabled") or \
 Preferences.getWebBrowser("VirusTotalServiceKey") == "":
 self.virustotalScanCurrentAct.setEnabled(False)
 self.virustotalIpReportAct.setEnabled(False)
 from .WebBrowserLanguagesDialog import WebBrowserLanguagesDialog
 dlg = WebBrowserLanguagesDialog(self)
 dlg.exec_()
 self.networkManager().languagesChanged()
+# TODO: Cookies
 ##    def __showCookiesConfiguration(self):
 ##        """
 ##        Private slot to configure the cookies handling.
 ##        """
 ##        from .CookieJar.CookiesConfigurationDialog import \
 if cls._networkManager is None:
 from .Network.NetworkManager import NetworkManager
 cls._networkManager = NetworkManager()
 return cls._networkManager
+# TODO: Cookies
 ##    @classmethod
 ##    def cookieJar(cls):
 ##        """
 ##        Class method to get a reference to the cookie jar.
 ##
 @param url URL to be shown (QUrl)
 """
 if not self.__activating:
 self.__activating = True
-##            req = QNetworkRequest(url)
-##            req.setRawHeader(b"X-Eric6-UserLoadAction", b"1")
-##            self.currentBrowser().setSource(
-##                None, (req, QNetworkAccessManager.GetOperation, b""))
 self.currentBrowser().setUrl(url)
 self.__activating = False
 # TODO: QtHelp
 ##    def __linksActivated(self, links, keyword):
 Public method to get a list of all opened source files.
 @return dictionary with tab id as key and host/namespace as value
 """
 return self.__tabWidget.getSourceFileList()
+# TODO: QtHelp
 ##    def __manageQtHelpFilters(self):
 ##        """
 ##        Private slot to manage the QtHelp filters.
 ##        """
 ##        if WebBrowserWindow.UseQtHelp:
 """
 from .Passwords.PasswordsDialog import PasswordsDialog
 dlg = PasswordsDialog(self)
 dlg.exec_()
+# TODO: Certificates
 ##    def __showCertificatesDialog(self):
 ##        """
 ##        Private slot to show the certificates management dialog.
 ##        """
 ##        from E5Network.E5SslCertificatesDialog import E5SslCertificatesDialog
 ##
 ##        dlg = E5SslCertificatesDialog(self)
 ##        dlg.exec_()
 ##
+# TODO: AdBlock
 ##    def __showAdBlockDialog(self):
 ##        """
 ##        Private slot to show the AdBlock configuration dialog.
 ##        """
 ##        self.adBlockManager().showDialog()
 ##
+# TODO: Click2Flash
 ##    def __showClickToFlashDialog(self):
 ##        """
 ##        Private slot to open the ClickToFlash whitelist configuration dialog.
 ##        """
 ##        from .HelpBrowserWV import HelpWebPage
 """
 from .ZoomManager.ZoomValuesDialog import ZoomValuesDialog
 dlg = ZoomValuesDialog(self)
 dlg.exec_()
+# TODO: Network Monitor
 ##    def __showNetworkMonitor(self):
 ##        """
 ##        Private slot to show the network monitor dialog.
 ##        """
 ##        from E5Network.E5NetworkMonitor import E5NetworkMonitor
 """
 Private slot to show the downloads dialog.
 """
 self.downloadManager().show()
+# TODO: Network Monitor
 ##    def __closeNetworkMonitor(self):
 ##        """
 ##        Private slot to close the network monitor dialog.
 ##        """
 ##        from E5Network.E5NetworkMonitor import E5NetworkMonitor
 Public slot to load a URL in a new tab.
 @param url URL to be opened (QUrl)
 @param title title of the bookmark (string)
 """
-##        req = QNetworkRequest(url)
-##        req.setRawHeader(b"X-Eric6-UserLoadAction", b"1")
-##        self.newTab(None, (req, QNetworkAccessManager.GetOperation, b""))
 self.newTab(url)
 @classmethod
 def historyManager(cls):
 """
 if cls._passwordManager is None:
 from .Passwords.PasswordManager import PasswordManager
 cls._passwordManager = PasswordManager()
 return cls._passwordManager
+# TODO: AdBlock
 ##    @classmethod
 ##    def adBlockManager(cls):
 ##        """
 ##        Class method to get a reference to the AdBlock manager.
 ##
 else:
 cls._webProfile = QWebEngineProfile.defaultProfile()
 cls._webProfile.downloadRequested.connect(
 cls.downloadRequested)
+# TODO: Cache settings
 # Setup QWebChannel user script
 script = QWebEngineScript()
 script.setName("_eric_webchannel")
 script.setInjectionPoint(QWebEngineScript.DocumentCreation)
 script.setWorldId(QWebEngineScript.MainWorld)

Mercurial Repositories > eric / file comparison

comparison: WebBrowser/WebBrowserWindow.py

WebBrowser/WebBrowserWindow.py