eric: comparison WebBrowser/WebBrowserWindow.py

-:a3bcc42a82a9
+:8d2ea02ed785
 from E5Gui import E5MessageBox, E5FileDialog, E5ErrorMessage
 from E5Gui.E5MainWindow import E5MainWindow
 from E5Gui.E5Application import e5App
 from E5Gui.E5ZoomWidget import E5ZoomWidget
-##from E5Network.E5NetworkIcon import E5NetworkIcon
+from E5Network.E5NetworkIcon import E5NetworkIcon
 import Preferences
 from Preferences import Shortcuts
 import Utilities
 if self.__initShortcutsOnly:
 self.__initActions()
 else:
 self.webProfile(private)
-##            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
 from .WebBrowserView import WebBrowserView
 from .WebBrowserTabWidget import WebBrowserTabWidget
 # TODO: AdBlock
 ##            from .AdBlock.AdBlockIcon import AdBlockIcon
-# TODO: VirusTotal
+from .VirusTotal.VirusTotalApi import VirusTotalAPI
-##            from .VirusTotal.VirusTotalApi import VirusTotalAPI
 # TODO: allow using Qt Help even if not called from eric6
 WebBrowserWindow.setUseQtHelp(self.__fromEric)
 if not self.__fromEric:
 self.__initActions()
 self.__initMenus()
 self.__initToolbars()
-##            self.historyManager()
+self.historyManager()
-##
+# TODO: Sync
 ##            syncMgr = self.syncManager()
 ##            syncMgr.syncMessage.connect(self.statusBar().showMessage)
 ##            syncMgr.syncError.connect(self.statusBar().showMessage)
 ##
 self.__tabWidget.newBrowser(home)
 self.__tabWidget.currentBrowser().setFocus()
 WebBrowserWindow.BrowserWindows.append(self)
+# TODO: AdBlock
 ##            self.__adBlockIcon = AdBlockIcon(self)
 ##            self.statusBar().addPermanentWidget(self.__adBlockIcon)
 ##            self.__adBlockIcon.setEnabled(
 ##                Preferences.getWebBrowser("AdBlockEnabled"))
 ##            self.__tabWidget.currentChanged[int].connect(
 ##                self.__adBlockIcon.currentChanged)
 ##            self.__tabWidget.sourceChanged.connect(
 ##                self.__adBlockIcon.sourceChanged)
 ##
-##            self.networkIcon = E5NetworkIcon(self)
+self.networkIcon = E5NetworkIcon(self)
-##            self.statusBar().addPermanentWidget(self.networkIcon)
+self.statusBar().addPermanentWidget(self.networkIcon)
-##
 QDesktopServices.setUrlHandler("http", self.__linkActivated)
 QDesktopServices.setUrlHandler("https", self.__linkActivated)
 # setup connections
 self.__activating = False
 ##                    self.__activateCurrentBrowser)
 state = Preferences.getWebBrowser("WebBrowserState")
 self.restoreState(state)
+# TODO: QtHelp
 ##            self.__initHelpDb()
-##            self.__virusTotal = VirusTotalAPI(self)
+self.__virusTotal = VirusTotalAPI(self)
-##            self.__virusTotal.submitUrlError.connect(
+self.__virusTotal.submitUrlError.connect(
-##                self.__virusTotalSubmitUrlError)
+self.__virusTotalSubmitUrlError)
-##            self.__virusTotal.urlScanReport.connect(
+self.__virusTotal.urlScanReport.connect(
-##                self.__virusTotalUrlScanReport)
+self.__virusTotalUrlScanReport)
-##            self.__virusTotal.fileScanReport.connect(
+self.__virusTotal.fileScanReport.connect(
-##                self.__virusTotalFileScanReport)
+self.__virusTotalFileScanReport)
-##
 self.__previewer = None
 self.__shutdownCalled = False
-##            self.flashCookieManager()
+self.flashCookieManager()
-##
 # TODO: QtHelp, do these once Qt 5.6 is available
 ##            if WebBrowserWindow.UseQtHelp:
 ##                QTimer.singleShot(0, self.__lookForNewDocumentation)
 ##                if self.__searchWord is not None:
 ##                    QTimer.singleShot(0, self.__searchForWord)
 ##
 self.__lastActiveWindow = None
 e5App().focusChanged[QWidget, QWidget].connect(
 self.__appFocusChanged)
+#TODO: Sync
 ##
 ##            QTimer.singleShot(0, syncMgr.loadSettings)
 def __del__(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(QWebEngineSettings.StandardFont,
 """ It pops up a file selection dialog.</p>"""
 ))
 if not self.__initShortcutsOnly:
 self.openTabAct.triggered.connect(self.__openFileNewTab)
 self.__actions.append(self.openTabAct)
+# TODO: Save
 ##
 ##        self.saveAsAct = E5Action(
 ##            self.tr('Save As'),
 ##            UI.PixmapCache.getIcon("fileSaveAs.png"),
 ##            self.tr('&Save As...'),
 if not self.__initShortcutsOnly:
 self.featurePermissionAct.triggered.connect(
 self.__showFeaturePermissionDialog)
 self.__actions.append(self.featurePermissionAct)
-# TODO: re-enable once Qt 5.6 is available
+# TODO: QtHelp: re-enable once Qt 5.6 is available
 ##        if WebBrowserWindow.UseQtHelp or self.__initShortcutsOnly:
 ##            self.syncTocAct = E5Action(
 ##                self.tr('Sync with Table of Contents'),
 ##                UI.PixmapCache.getIcon("syncToc.png"),
 ##                self.tr('Sync with Table of Contents'),
 ##        self.__userAgentMenu = UserAgentMenu(self.tr("Global User Agent"))
 ##        menu.addMenu(self.__userAgentMenu)
 ##        menu.addAction(self.userAgentManagerAct)
 ##        menu.addSeparator()
+# TODO: QtHelp
 ##        if WebBrowserWindow.UseQtHelp:
 ##            menu.addAction(self.manageQtHelpDocsAct)
 ##            menu.addAction(self.manageQtHelpFiltersAct)
 ##            menu.addAction(self.reindexDocumentationAct)
 ##            menu.addSeparator()
 menu.addAction(self.clearPrivateDataAct)
 menu.addAction(self.clearIconsAct)
-##        menu = mb.addMenu(self.tr("&Tools"))
+menu = mb.addMenu(self.tr("&Tools"))
-##        menu.setTearOffEnabled(True)
+menu.setTearOffEnabled(True)
 ##        menu.addAction(self.feedsManagerAct)
 ##        menu.addAction(self.siteInfoAct)
 ##        menu.addSeparator()
 ##        menu.addAction(self.synchronizationAct)
 ##        menu.addSeparator()
 findtb.setIconSize(UI.Config.ToolBarIconSize)
 findtb.addAction(self.findAct)
 findtb.addAction(self.findNextAct)
 findtb.addAction(self.findPrevAct)
+# TODO: QtHelp
 ##        if WebBrowserWindow.UseQtHelp:
 ##            filtertb = self.addToolBar(self.tr("Filter"))
 ##            filtertb.setObjectName("FilterToolBar")
 ##            self.filterCombo = QComboBox()
 ##            self.filterCombo.setMinimumWidth(
 ##        settingstb.addAction(self.offlineStorageAct)
 settingstb.addAction(self.personalDataAct)
 ##        settingstb.addAction(self.greaseMonkeyAct)
 settingstb.addAction(self.featurePermissionAct)
-##        toolstb = self.addToolBar(self.tr("Tools"))
+toolstb = self.addToolBar(self.tr("Tools"))
-##        toolstb.setObjectName("ToolsToolBar")
+toolstb.setObjectName("ToolsToolBar")
-##        toolstb.setIconSize(UI.Config.ToolBarIconSize)
+toolstb.setIconSize(UI.Config.ToolBarIconSize)
 ##        toolstb.addAction(self.feedsManagerAct)
 ##        toolstb.addAction(self.siteInfoAct)
 ##        toolstb.addSeparator()
 ##        toolstb.addAction(self.synchronizationAct)
 self.bookmarksToolBar.openUrl.connect(self.openUrl)
 self.bookmarksToolBar.newUrl.connect(self.openUrlNewTab)
 self.addToolBarBreak()
 self.addToolBar(self.bookmarksToolBar)
-##        self.addToolBarBreak()
+self.addToolBarBreak()
-##        vttb = self.addToolBar(self.tr("VirusTotal"))
+vttb = self.addToolBar(self.tr("VirusTotal"))
-##        vttb.setObjectName("VirusTotalToolBar")
+vttb.setObjectName("VirusTotalToolBar")
-##        vttb.setIconSize(UI.Config.ToolBarIconSize)
+vttb.setIconSize(UI.Config.ToolBarIconSize)
-##        vttb.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
+vttb.setToolButtonStyle(Qt.ToolButtonTextBesideIcon)
-##        self.virustotalScanCurrentAct = vttb.addAction(
+self.virustotalScanCurrentAct = vttb.addAction(
-##            UI.PixmapCache.getIcon("virustotal.png"),
+UI.PixmapCache.getIcon("virustotal.png"),
-##            self.tr("Scan current site"),
+self.tr("Scan current site"),
-##            self.__virusTotalScanCurrentSite)
+self.__virusTotalScanCurrentSite)
-##        self.virustotalIpReportAct = vttb.addAction(
+self.virustotalIpReportAct = vttb.addAction(
-##            UI.PixmapCache.getIcon("virustotal.png"),
+UI.PixmapCache.getIcon("virustotal.png"),
-##            self.tr("IP Address Report"),
+self.tr("IP Address Report"),
-##            self.__virusTotalIpAddressReport)
+self.__virusTotalIpAddressReport)
-##        self.virustotalDomainReportAct = vttb.addAction(
+self.virustotalDomainReportAct = vttb.addAction(
-##            UI.PixmapCache.getIcon("virustotal.png"),
+UI.PixmapCache.getIcon("virustotal.png"),
-##            self.tr("Domain Report"),
+self.tr("Domain Report"),
-##            self.__virusTotalDomainReport)
+self.__virusTotalDomainReport)
-##        if not Preferences.getWebBrowser("VirusTotalEnabled") or \
+if not Preferences.getWebBrowser("VirusTotalEnabled") or \
-##           Preferences.getWebBrowser("VirusTotalServiceKey") == "":
+Preferences.getWebBrowser("VirusTotalServiceKey") == "":
-##            self.virustotalScanCurrentAct.setEnabled(False)
+self.virustotalScanCurrentAct.setEnabled(False)
-##            self.virustotalIpReportAct.setEnabled(False)
+self.virustotalIpReportAct.setEnabled(False)
-##            self.virustotalDomainReportAct.setEnabled(False)
+self.virustotalDomainReportAct.setEnabled(False)
 def __nextTab(self):
 """
 Private slot used to show the next tab.
 """
 ##        self.cookieJar().close()
 ##
 self.bookmarksToolBar.setModel(None)
 self.bookmarksManager().close()
-##        self.historyManager().close()
+self.historyManager().close()
-##
 self.passwordManager().close()
 ##        self.adBlockManager().close()
 ##
 ##        self.userAgentsManager().close()
 ##        self.syncManager().close()
 ZoomManager.instance().close()
 WebIconProvider.instance().close()
-##
-##        self.__virusTotal.close()
+self.__virusTotal.close()
-##
-##        self.flashCookieManager().shutdown()
+self.flashCookieManager().shutdown()
-##
 self.searchEdit.openSearchManager().close()
+# TODO: QtHelp
 ##        if WebBrowserWindow.UseQtHelp:
 ##            self.__searchEngine.cancelIndexing()
 ##            self.__searchEngine.cancelSearching()
 ##
 ##            if self.__helpInstaller:
 def __selectAll(self):
 """
 Private slot to handle the select all action.
 """
 self.currentBrowser().selectAll()
+# TODO: Private Browsing
 ##
 ##    def __privateBrowsing(self):
 ##        """
 ##        Private slot to switch private browsing.
 ##        """
 self.__tabWidget.preferencesChanged()
 self.searchEdit.preferencesChanged()
-# TODO: VirusTotal
+self.__virusTotal.preferencesChanged()
-##        self.__virusTotal.preferencesChanged()
+if not Preferences.getWebBrowser("VirusTotalEnabled") or \
-##        if not Preferences.getWebBrowser("VirusTotalEnabled") or \
+Preferences.getWebBrowser("VirusTotalServiceKey") == "":
-##           Preferences.getWebBrowser("VirusTotalServiceKey") == "":
+self.virustotalScanCurrentAct.setEnabled(False)
-##            self.virustotalScanCurrentAct.setEnabled(False)
+self.virustotalIpReportAct.setEnabled(False)
-##            self.virustotalIpReportAct.setEnabled(False)
+self.virustotalDomainReportAct.setEnabled(False)
-##            self.virustotalDomainReportAct.setEnabled(False)
+else:
-##        else:
+self.virustotalScanCurrentAct.setEnabled(True)
-##            self.virustotalScanCurrentAct.setEnabled(True)
+self.virustotalIpReportAct.setEnabled(True)
-##            self.virustotalIpReportAct.setEnabled(True)
+self.virustotalDomainReportAct.setEnabled(True)
-##            self.virustotalDomainReportAct.setEnabled(True)
 def masterPasswordChanged(self, oldPassword, newPassword):
 """
 Public slot to handle the change of the master password.
 if use:
 cls.useQtHelp = use and QTHELP_AVAILABLE
 else:
 cls.useQtHelp = False
+# TODO: QtHelp
 ##    @classmethod
 ##    def helpEngine(cls):
 ##        """
 ##        Class method to get a reference to the help engine.
 ##
 ##            self.currentBrowser().setSource(
 ##                None, (req, QNetworkAccessManager.GetOperation, b""))
 self.currentBrowser().setUrl(url)
 self.__activating = False
+# TODO: QtHelp
 ##    def __linksActivated(self, links, keyword):
 ##        """
 ##        Private slot to select a topic to be shown.
 ##
 ##        @param links dictionary with help topic as key (string) and
 """
 Private slot to activate the current browser.
 """
 self.currentBrowser().setFocus()
+# TODO: QtHelp
 ##    def __syncTOC(self):
 ##        """
 ##        Private slot to synchronize the TOC with the currently shown page.
 ##        """
 ##        if WebBrowserWindow.UseQtHelp:
 self.currentBrowser().triggerPageAction(QWebEnginePage.Back)
 elif evt.button() == Qt.XButton2:
 self.currentBrowser().triggerPageAction(QWebEnginePage.Forward)
 else:
 super(WebBrowserWindow, self).mousePressEvent(evt)
+# TODO: RSS
 ##    @classmethod
 ##    def feedsManager(cls):
 ##        """
 ##        Class method to get a reference to the RSS feeds manager.
 ##
 ##        feedsManager = self.sender()
 ##        feedsManager.openUrl.disconnect(self.openUrl)
 ##        feedsManager.newUrl.disconnect(self.openUrlNewTab)
 ##        feedsManager.rejected.disconnect(self.__feedsManagerClosed)
 ##
+# TODO: Site Info
 ##    def __showSiteinfoDialog(self):
 ##        """
 ##        Private slot to show the site info dialog.
 ##        """
 ##        from .SiteInfo.SiteInfoDialog import SiteInfoDialog
 ##        self.__siteinfoDialog = SiteInfoDialog(self.currentBrowser(), self)
 ##        self.__siteinfoDialog.show()
 ##
+# TODO: User Agents
 ##    @classmethod
 ##    def userAgentsManager(cls):
 ##        """
 ##        Class method to get a reference to the user agents manager.
 ##
 ##        from .UserAgent.UserAgentsDialog import UserAgentsDialog
 ##
 ##        dlg = UserAgentsDialog(self)
 ##        dlg.exec_()
 ##
+# TODO: Sync
 ##    @classmethod
 ##    def syncManager(cls):
 ##        """
 ##        Class method to get a reference to the data synchronization manager.
 ##
 ##        """
 ##        Private slot to show the synchronization dialog.
 ##        """
 ##        self.syncManager().showSyncDialog()
 ##
+# TODO: SpeedDial
 ##    @classmethod
 ##    def speedDial(cls):
 ##        """
 ##        Class methdo to get a reference to the speed dial.
 ##
 if evt.modifiers() == Qt.KeyboardModifiers(Qt.AltModifier):
 if number == 10:
 number = self.__tabWidget.count()
 self.__tabWidget.setCurrentIndex(number - 1)
 return
+# TODO: SpeeedDial
 ##
 ##            if evt.modifiers() == Qt.KeyboardModifiers(Qt.MetaModifier):
 ##                url = self.speedDial().urlForShortcut(number - 1)
 ##                if url.isValid():
 ##                    self.__linkActivated(url)
 ##                    return
 super(WebBrowserWindow, self).keyPressEvent(evt)
-##    ###########################################################################
+###########################################################################
-##    ## Interface to VirusTotal below                                         ##
+## Interface to VirusTotal below                                         ##
-##    ###########################################################################
+###########################################################################
-##
-##    def __virusTotalScanCurrentSite(self):
+def __virusTotalScanCurrentSite(self):
-##        """
+"""
-##        Private slot to ask VirusTotal for a scan of the URL of the current
+Private slot to ask VirusTotal for a scan of the URL of the current
-##        browser.
+browser.
-##        """
+"""
-##        cb = self.currentBrowser()
+cb = self.currentBrowser()
-##        if cb is not None:
+if cb is not None:
-##            url = cb.url()
+url = cb.url()
-##            if url.scheme() in ["http", "https", "ftp"]:
+if url.scheme() in ["http", "https", "ftp"]:
-##                self.requestVirusTotalScan(url)
+self.requestVirusTotalScan(url)
-##
-##    def requestVirusTotalScan(self, url):
+def requestVirusTotalScan(self, url):
-##        """
+"""
-##        Public method to submit a request to scan an URL by VirusTotal.
+Public method to submit a request to scan an URL by VirusTotal.
-##
-##        @param url URL to be scanned (QUrl)
+@param url URL to be scanned (QUrl)
-##        """
+"""
-##        self.__virusTotal.submitUrl(url)
+self.__virusTotal.submitUrl(url)
-##
-##    def __virusTotalSubmitUrlError(self, msg):
+def __virusTotalSubmitUrlError(self, msg):
-##        """
+"""
-##        Private slot to handle an URL scan submission error.
+Private slot to handle an URL scan submission error.
-##
-##        @param msg error message (str)
+@param msg error message (str)
-##        """
+"""
-##        E5MessageBox.critical(
+E5MessageBox.critical(
-##            self,
+self,
-##            self.tr("VirusTotal Scan"),
+self.tr("VirusTotal Scan"),
-##            self.tr("""<p>The VirusTotal scan could not be"""
+self.tr("""<p>The VirusTotal scan could not be"""
-##                    """ scheduled.<p>\n<p>Reason: {0}</p>""").format(msg))
+""" scheduled.<p>\n<p>Reason: {0}</p>""").format(msg))
-##
-##    def __virusTotalUrlScanReport(self, url):
+def __virusTotalUrlScanReport(self, url):
-##        """
+"""
-##        Private slot to initiate the display of the URL scan report page.
+Private slot to initiate the display of the URL scan report page.
-##
-##        @param url URL of the URL scan report page (string)
+@param url URL of the URL scan report page (string)
-##        """
+"""
-##        self.newTab(url)
+self.newTab(url)
-##
-##    def __virusTotalFileScanReport(self, url):
+def __virusTotalFileScanReport(self, url):
-##        """
+"""
-##        Private slot to initiate the display of the file scan report page.
+Private slot to initiate the display of the file scan report page.
-##
-##        @param url URL of the file scan report page (string)
+@param url URL of the file scan report page (string)
-##        """
+"""
-##        self.newTab(url)
+self.newTab(url)
-##
-##    def __virusTotalIpAddressReport(self):
+def __virusTotalIpAddressReport(self):
-##        """
+"""
-##        Private slot to retrieve an IP address report.
+Private slot to retrieve an IP address report.
-##        """
+"""
-##        ip, ok = QInputDialog.getText(
+ip, ok = QInputDialog.getText(
-##            self,
+self,
-##            self.tr("IP Address Report"),
+self.tr("IP Address Report"),
-##            self.tr("Enter a valid IPv4 address in dotted quad notation:"),
+self.tr("Enter a valid IPv4 address in dotted quad notation:"),
-##            QLineEdit.Normal)
+QLineEdit.Normal)
-##        if ok and ip:
+if ok and ip:
-##            if ip.count(".") == 3:
+if ip.count(".") == 3:
-##                self.__virusTotal.getIpAddressReport(ip)
+self.__virusTotal.getIpAddressReport(ip)
-##            else:
+else:
-##                E5MessageBox.information(
+E5MessageBox.information(
-##                    self,
+self,
-##                    self.tr("IP Address Report"),
+self.tr("IP Address Report"),
-##                    self.tr("""The given IP address is not in dotted quad"""
+self.tr("""The given IP address is not in dotted quad"""
-##                            """ notation."""))
+""" notation."""))
-##
-##    def __virusTotalDomainReport(self):
+def __virusTotalDomainReport(self):
-##        """
+"""
-##        Private slot to retrieve a domain report.
+Private slot to retrieve a domain report.
-##        """
+"""
-##        domain, ok = QInputDialog.getText(
+domain, ok = QInputDialog.getText(
-##            self,
+self,
-##            self.tr("Domain Report"),
+self.tr("Domain Report"),
-##            self.tr("Enter a valid domain name:"),
+self.tr("Enter a valid domain name:"),
-##            QLineEdit.Normal)
+QLineEdit.Normal)
-##        if ok and domain:
+if ok and domain:
-##            self.__virusTotal.getDomainReport(domain)
+self.__virusTotal.getDomainReport(domain)
 ###########################################################################
 ## Style sheet handling below                                            ##
 ###########################################################################

Mercurial Repositories > eric / file comparison

comparison: WebBrowser/WebBrowserWindow.py

WebBrowser/WebBrowserWindow.py