eric: comparison WebBrowser/WebBrowserView.py

-:b19ff70ba509
+:c26e2a2dc0cb
 from PyQt5.QtCore import pyqtSlot, pyqtSignal, QObject, QT_TRANSLATE_NOOP, \
 QUrl, QBuffer, QIODevice, QFileInfo, Qt, QTimer, QEvent, \
 QRect, QFile, QPoint, QByteArray, qVersion
 from PyQt5.QtGui import QDesktopServices, QClipboard, QMouseEvent, QColor, \
-QPalette
+QPalette, QIcon
 from PyQt5.QtWidgets import qApp, QStyle, QMenu, QApplication, QInputDialog, \
 QLineEdit, QLabel, QToolTip, QFrame, QDialog
 from PyQt5.QtPrintSupport import QPrinter, QPrintDialog
 from PyQt5.QtNetwork import QNetworkReply, QNetworkRequest
 from PyQt5.QtWebEngineWidgets import QWebEngineView, QWebEnginePage
 from E5Gui import E5MessageBox, E5FileDialog
 import WebBrowser
 from .WebBrowserPage import WebBrowserPage
+from .Tools.WebIconLoader import WebIconLoader
 import Preferences
 import UI.PixmapCache
 import Globals
 @signal forwardAvailable(bool) emitted after the current URL has changed
 @signal backwardAvailable(bool) emitted after the current URL has changed
 @signal highlighted(str) emitted, when the mouse hovers over a link
 @signal search(QUrl) emitted, when a search is requested
 @signal zoomValueChanged(int) emitted to signal a change of the zoom value
+@signal iconChanged() emitted to signal a changed web site icon
 """
 sourceChanged = pyqtSignal(QUrl)
 forwardAvailable = pyqtSignal(bool)
 backwardAvailable = pyqtSignal(bool)
 highlighted = pyqtSignal(str)
 search = pyqtSignal(QUrl)
 zoomValueChanged = pyqtSignal(int)
+iconChanged = pyqtSignal()
 ZoomLevels = [
 30, 40, 50, 67, 80, 90,
 100,
 110, 120, 133, 150, 170, 200, 220, 233, 250, 270, 285, 300,
 self.__mw = mainWindow
 self.__ctrlPressed = False
 self.__isLoading = False
 self.__progress = 0
+self.__siteIconLoader = None
+self.__siteIcon = QIcon()
 self.__currentZoom = 100
 self.__zoomLevels = WebBrowserView.ZoomLevels[:]
 ##
 ##        self.__javaScriptBinding = None
 ##        self.__mw.zoomTextOnlyChanged.connect(self.__applyZoom)
 ##        self.page().setLinkDelegationPolicy(QWebPage.DelegateAllLinks)
 ##        self.linkClicked.connect(self.setSource)
 ##
+self.iconUrlChanged.connect(self.__iconUrlChanged)
 self.urlChanged.connect(self.__urlChanged)
 ##        self.statusBarMessage.connect(self.__statusBarMessage)
 self.page().linkHovered.connect(self.__linkHovered)
 self.loadStarted.connect(self.__loadStarted)
 ##            self.__currentEngineChanged)
 self.setAcceptDrops(True)
 # TODO: Access Keys
-##        self.__enableAccessKeys = Preferences.getHelp("AccessKeysEnabled")
+##        self.__enableAccessKeys = Preferences.getWebBrowser("AccessKeysEnabled")
 ##        self.__accessKeysPressed = False
 ##        self.__accessKeyLabels = []
 ##        self.__accessKeyNodes = {}
 ##
 ##        self.page().loadStarted.connect(self.__hideAccessKeys)
 ##        """
 ##        Private slot to track a change of the current search engine.
 ##        """
 ##        if self.url().toString() == "eric:home":
 ##            self.reload()
+def mainWindow(self):
+"""
+Public method to get a reference to the main window.
+@return reference to the main window
+@rtype WebBrowserWindow
+"""
+return self.__mw
 # TODO: eliminate requestData, add param to get rid of __ctrlPressed
 def setSource(self, name, requestData=None):
 """
 Public method used to set the source to be displayed.
 @param value zoom value (integer)
 @keyparam saveValue flag indicating to save the zoom value with the
 zoom manager
 @type bool
 """
-if value != self.zoomValue():
+if value != self.__currentZoom:
 self.setZoomFactor(value / 100.0)
 self.__currentZoom = value
-# TODO: Zoom Manager
+if saveValue and not self.__mw.isPrivate():
-##            if saveValue:
+from .ZoomManager import ZoomManager
-##                Helpviewer.HelpWindow.HelpWindow.zoomManager().setZoomValue(
+ZoomManager.instance().setZoomValue(self.url(), value)
-##                    self.url(), value)
 self.zoomValueChanged.emit(value)
 def zoomValue(self):
 """
 Public method to get the current zoom value.
 @param highlightAll flag indicating to highlight all occurrences
 (boolean)
 @param callback reference to a function with a bool parameter
 @type function(bool) or None
 """
 findFlags = QWebEnginePage.FindFlags()
 if case:
 findFlags |= QWebEnginePage.FindCaseSensitively
 if backwards:
 findFlags |= QWebEnginePage.FindBackward
 ##                self.tr("Copy Link to Clipboard"), self.__copyLink)
 ##            menu.addAction(
 ##                UI.PixmapCache.getIcon("mailSend.png"),
 ##                self.tr("Send Link"),
 ##                self.__sendLink).setData(hit.linkUrl())
-##            if Preferences.getHelp("VirusTotalEnabled") and \
+##            if Preferences.getWebBrowser("VirusTotalEnabled") and \
-##               Preferences.getHelp("VirusTotalServiceKey") != "":
+##               Preferences.getWebBrowser("VirusTotalServiceKey") != "":
 ##                menu.addAction(
 ##                    UI.PixmapCache.getIcon("virustotal.png"),
 ##                    self.tr("Scan Link with VirusTotal"),
 ##                    self.__virusTotal).setData(hit.linkUrl())
 ##            menu.addSeparator()
 ##            menu.addAction(
 ##                UI.PixmapCache.getIcon("adBlockPlus.png"),
 ##                self.tr("Block Image"), self.__blockImage)\
 ##                .setData(hit.imageUrl().toString())
-##            if Preferences.getHelp("VirusTotalEnabled") and \
+##            if Preferences.getWebBrowser("VirusTotalEnabled") and \
-##               Preferences.getHelp("VirusTotalServiceKey") != "":
+##               Preferences.getWebBrowser("VirusTotalServiceKey") != "":
 ##                menu.addAction(
 ##                    UI.PixmapCache.getIcon("virustotal.png"),
 ##                    self.tr("Scan Image with VirusTotal"),
 ##                    self.__virusTotal).setData(hit.imageUrl())
 self.__applyZoom()
 evt.accept()
 def eventFilter(self, obj, evt):
 """
-Protected method to process event for other objects.
+Public method to process event for other objects.
 @param obj reference to object to process events for
 @type QObject
 @param evt reference to event to be processed
 @type QEvent
 self.sourceChanged.emit(url)
 self.forwardAvailable.emit(self.isForwardAvailable())
 self.backwardAvailable.emit(self.isBackwardAvailable())
+def __iconUrlChanged(self, url):
+"""
+Private slot to handle the iconUrlChanged signal.
+@param url URL to get web site icon from
+@type QUrl
+"""
+self.__siteIcon = QIcon()
+if self.__siteIconLoader is not None:
+self.__siteIconLoader.deleteLater()
+self.__siteIconLoader = WebIconLoader(url, self)
+self.__siteIconLoader.iconLoaded.connect(self.__iconLoaded)
+def __iconLoaded(self, icon):
+"""
+Private slot handling the loaded web site icon.
+@param icon web site icon
+@type QIcon
+"""
+self.__siteIcon = icon
+from .Tools import WebIconProvider
+WebIconProvider.instance().saveIcon(self)
+self.iconChanged.emit()
+def icon(self):
+"""
+Public method to get the web site icon.
+@return web site icon
+@rtype QIcon
+"""
+if not self.__siteIcon.isNull():
+return QIcon(self.__siteIcon)
+from .Tools import WebIconProvider
+return WebIconProvider.instance().iconForUrl(self.url())
 ##    def __statusBarMessage(self, text):
 ##        """
 ##        Private slot to handle the statusBarMessage signal.
 ##
 ##        @param text text to be shown in the status bar (string)
 """
 self.__isLoading = False
 self.__progress = 0
 # TODO: ClickToFlash (?)
-##        if Preferences.getHelp("ClickToFlashEnabled"):
+##        if Preferences.getWebBrowser("ClickToFlashEnabled"):
 ##            # this is a hack to make the ClickToFlash button appear
 ##            self.zoomIn()
 ##            self.zoomOut()
-# TODO: Zoom Manager
+from .ZoomManager import ZoomManager
-##        zoomValue = Helpviewer.HelpWindow.HelpWindow.zoomManager()\
+zoomValue = ZoomManager.instance().zoomValue(self.url())
-##            .zoomValue(self.url())
+self.setZoomValue(zoomValue)
-##        self.setZoomValue(zoomValue)
 if ok:
 pass
 # TODO: AdBlock
 ##            self.__mw.adBlockManager().page().hideBlockedPageEntries(self.page())
 def preferencesChanged(self):
 """
 Public method to indicate a change of the settings.
 """
 # TODO: Access Keys
-##        self.__enableAccessKeys = Preferences.getHelp("AccessKeysEnabled")
+##        self.__enableAccessKeys = Preferences.getWebBrowser("AccessKeysEnabled")
 ##        if not self.__enableAccessKeys:
 ##            self.__hideAccessKeys()
 self.reload()

Mercurial Repositories > eric / file comparison

comparison: WebBrowser/WebBrowserView.py

WebBrowser/WebBrowserView.py