eric: comparison Helpviewer/HelpBrowserWV.py

-:0c976706e8c1
+:bace7fb85a01
 self.page().featurePermissionRequested.connect(
 self.__featurePermissionRequested)
 self.page().downloadRequested.connect(self.__downloadRequested)
-self.page().frameCreated.connect(self.__addExternalBinding)
+self.page().frameCreated.connect(
-self.__addExternalBinding(self.page().mainFrame())
+lambda frame: self.__addExternalBinding(frame, False))
+self.__addExternalBinding(self.page().mainFrame(), False)
 self.page().databaseQuotaExceeded.connect(self.__databaseQuotaExceeded)
 self.mw.openSearchManager().currentEngineChanged.connect(
 self.__currentEngineChanged)
 self.__inspector = None
 self.grabGesture(Qt.PinchGesture)
-def __addExternalBinding(self, frame=None):
+def __addExternalBinding(self, frame, frameCleared):
 """
 Private slot to add javascript bindings for adding search providers.
-@param frame reference to the web frame (QWebFrame)
+@param frame reference to the web frame
+@type QWebFrame
+@param frameCleared flag indicate, that the frame was cleared
+@type bool
 """
 self.page().settings().setAttribute(QWebSettings.JavascriptEnabled,
 True)
 if self.__javaScriptBinding is None:
 self.__javaScriptBinding = JavaScriptExternalObject(self.mw, self)
-if frame is None:
+if frameCleared:
 # called from QWebFrame.javaScriptWindowObjectCleared
-frame = self.sender()
 if isinstance(frame, HelpWebPage):
 frame = frame.mainFrame()
 if frame.url().scheme() == "eric" and frame.url().path() == "home":
 if self.__javaScriptEricObject is None:
 self.__javaScriptEricObject = JavaScriptEricObject(
 "speeddial", self.__speedDial)
 self.__speedDial.addWebFrame(frame)
 else:
 # called from QWebPage.frameCreated
 frame.javaScriptWindowObjectCleared.connect(
-self.__addExternalBinding)
+lambda: self.__addExternalBinding(frame, True))
 frame.addToJavaScriptWindowObject("external", self.__javaScriptBinding)
 def linkedResources(self, relation=""):
 """
 Public method to extract linked resources.
 return
 frameAtPos = self.page().frameAt(evt.pos())
 hit = self.page().mainFrame().hitTestContent(evt.pos())
 if not hit.linkUrl().isEmpty():
-menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("openNewTab.png"),
-self.tr("Open Link in New Tab\tCtrl+LMB"),
+self.tr("Open Link in New Tab\tCtrl+LMB"))
-self.__openLinkInNewTab).setData(hit.linkUrl())
+act.setData(hit.linkUrl())
+act.triggered.connect(
+lambda: self.__openLinkInNewTab(act))
 menu.addSeparator()
 menu.addAction(
 UI.PixmapCache.getIcon("download.png"),
 self.tr("Save Lin&k"), self.__downloadLink)
-menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("bookmark22.png"),
-self.tr("Bookmark this Link"), self.__bookmarkLink)\
+self.tr("Bookmark this Link"))
-.setData(hit.linkUrl())
+act.setData(hit.linkUrl())
+act.triggered.connect(
+lambda: self.__bookmarkLink(act))
 menu.addSeparator()
 menu.addAction(
 UI.PixmapCache.getIcon("editCopy.png"),
 self.tr("Copy Link to Clipboard"), self.__copyLink)
-menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("mailSend.png"),
-self.tr("Send Link"),
+self.tr("Send Link"))
-self.__sendLink).setData(hit.linkUrl())
+act.setData(hit.linkUrl())
+act.triggered.connect(
+lambda: self.__sendLink(act))
 if Preferences.getHelp("VirusTotalEnabled") and \
 Preferences.getHelp("VirusTotalServiceKey") != "":
-menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("virustotal.png"),
-self.tr("Scan Link with VirusTotal"),
+self.tr("Scan Link with VirusTotal"))
-self.__virusTotal).setData(hit.linkUrl())
+act.setData(hit.linkUrl())
+act.triggered.connect(
+lambda: self.__virusTotal(act))
 if not hit.imageUrl().isEmpty():
 if not menu.isEmpty():
 menu.addSeparator()
-menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("openNewTab.png"),
-self.tr("Open Image in New Tab"),
+self.tr("Open Image in New Tab"))
-self.__openLinkInNewTab).setData(hit.imageUrl())
+act.setData(hit.imageUrl())
+act.triggered.connect(
+lambda: self.__openLinkInNewTab(act))
 menu.addSeparator()
 menu.addAction(
 UI.PixmapCache.getIcon("download.png"),
 self.tr("Save Image"), self.__downloadImage)
 menu.addAction(
 self.tr("Copy Image to Clipboard"), self.__copyImage)
-menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("editCopy.png"),
-self.tr("Copy Image Location to Clipboard"),
+self.tr("Copy Image Location to Clipboard"))
-self.__copyLocation).setData(hit.imageUrl().toString())
+act.setData(hit.imageUrl().toString())
-menu.addAction(
+act.triggered.connect(
+lambda: self.__copyLocation(act))
+act = menu.addAction(
 UI.PixmapCache.getIcon("mailSend.png"),
-self.tr("Send Image Link"),
+self.tr("Send Image Link"))
-self.__sendLink).setData(hit.imageUrl())
+act.setData(hit.imageUrl())
+act.triggered.connect(
+lambda: self.__sendLink(act))
 menu.addSeparator()
-menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("adBlockPlus.png"),
-self.tr("Block Image"), self.__blockImage)\
+self.tr("Block Image"))
-.setData(hit.imageUrl().toString())
+act.setData(hit.imageUrl().toString())
+act.triggered.connect(
+lambda: self.__blockImage(act))
 if Preferences.getHelp("VirusTotalEnabled") and \
 Preferences.getHelp("VirusTotalServiceKey") != "":
-menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("virustotal.png"),
-self.tr("Scan Image with VirusTotal"),
+self.tr("Scan Image with VirusTotal"))
-self.__virusTotal).setData(hit.imageUrl())
+act.setData(hit.imageUrl())
+act.triggered.connect(
+lambda: self.__virusTotal(act))
 element = hit.element()
 if not element.isNull():
 if self.__isMediaElement(element):
 if not menu.isEmpty():
 else:
 menu.addAction(
 UI.PixmapCache.getIcon("audioVolumeMuted.png"),
 self.tr("Mute"), self.__muteMedia)
 menu.addSeparator()
-menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("editCopy.png"),
-self.tr("Copy Media Address to Clipboard"),
+self.tr("Copy Media Address to Clipboard"))
-self.__copyLocation).setData(videoUrl.toString())
+act.setData(videoUrl.toString())
-menu.addAction(
+act.triggered.connect(
+lambda: self.__copyLocation(act))
+act = menu.addAction(
 UI.PixmapCache.getIcon("mailSend.png"),
-self.tr("Send Media Address"), self.__sendLink)\
+self.tr("Send Media Address"))
-.setData(videoUrl)
+act.setData(videoUrl)
-menu.addAction(
+act.triggered.connect(
+lambda: self.__sendLink(act))
+act = menu.addAction(
 UI.PixmapCache.getIcon("download.png"),
-self.tr("Save Media"), self.__downloadMedia)\
+self.tr("Save Media"))
-.setData(videoUrl)
+act.setData(videoUrl)
+act.triggered.connect(
+lambda: self.__downloadMedia(act))
 if element.tagName().lower() in ["input", "textarea"]:
 if menu.isEmpty():
 pageMenu = self.page().createStandardContextMenu()
 directionFound = False
 frameUrl = self.__clickedFrame.url()
 if frameUrl.isValid():
 fmenu.addAction(
 self.tr("Show &only this frame"),
 self.__loadClickedFrame)
-fmenu.addAction(
+act = fmenu.addAction(
 UI.PixmapCache.getIcon("openNewTab.png"),
-self.tr("Show in new &tab"),
+self.tr("Show in new &tab"))
-self.__openLinkInNewTab).setData(self.__clickedFrame.url())
+act.setData(self.__clickedFrame.url())
+act.triggered.connect(
+lambda: self.__openLinkInNewTab(act))
 fmenu.addSeparator()
 fmenu.addAction(
 UI.PixmapCache.getIcon("print.png"),
 self.tr("&Print"), self.__printClickedFrame)
 fmenu.addAction(
 menu.addSeparator()
 menu.addAction(
 UI.PixmapCache.getIcon("bookmark22.png"),
 self.tr("Bookmark this Page"), self.addBookmark)
-menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("mailSend.png"),
-self.tr("Send Page Link"), self.__sendLink).setData(self.url())
+self.tr("Send Page Link"))
+act.setData(self.url())
+act.triggered.connect(
+lambda: self.__sendLink(act))
 menu.addSeparator()
 self.__userAgentMenu = UserAgentMenu(self.tr("User Agent"),
 url=self.url())
 menu.addMenu(self.__userAgentMenu)
 menu.addSeparator()
 menu.addAction(self.mw.zoomResetAct)
 menu.addAction(self.mw.zoomOutAct)
 menu.addSeparator()
 if self.selectedText():
 menu.addAction(self.mw.copyAct)
-menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("mailSend.png"),
-self.tr("Send Text"),
+self.tr("Send Text"))
-self.__sendLink).setData(self.selectedText())
+act.setData(self.selectedText())
+act.triggered.connect(
+lambda: self.__sendLink(act))
 menu.addAction(self.mw.findAct)
 menu.addSeparator()
 if self.selectedText():
 self.__searchMenu = menu.addMenu(self.tr("Search with..."))
 language = languages[0]
 langCode = language.split("[")[1][:2]
 googleTranslatorUrl = QUrl(
 "http://translate.google.com/#auto|{0}|{1}".format(
 langCode, self.selectedText()))
-menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("translate.png"),
-self.tr("Google Translate"), self.__openLinkInNewTab)\
+self.tr("Google Translate"))
-.setData(googleTranslatorUrl)
+act.setData(googleTranslatorUrl)
+act.triggered.connect(
+lambda: self.__openLinkInNewTab(act))
 wiktionaryUrl = QUrl(
 "http://{0}.wiktionary.org/wiki/Special:Search?search={1}"
 .format(langCode, self.selectedText()))
-menu.addAction(
+act = menu.addAction(
 UI.PixmapCache.getIcon("wikipedia.png"),
-self.tr("Dictionary"), self.__openLinkInNewTab)\
+self.tr("Dictionary"))
-.setData(wiktionaryUrl)
+act.setData(wiktionaryUrl)
+act.triggered.connect(
+lambda: self.__openLinkInNewTab(act))
 menu.addSeparator()
 guessedUrl = QUrl.fromUserInput(self.selectedText().strip())
 if self.__isUrlValid(guessedUrl):
-menu.addAction(
+act = menu.addAction(self.tr("Go to web address"))
-self.tr("Go to web address"),
+act.setData(guessedUrl)
-self.__openLinkInNewTab).setData(guessedUrl)
+act.triggered.connect(
+lambda: self.__openLinkInNewTab(act))
 menu.addSeparator()
 element = hit.element()
 if not element.isNull() and \
 element.tagName().lower() == "input" and \
 element.attribute("type", "text") == "text":
-menu.addAction(self.tr("Add to web search toolbar"),
+act = menu.addAction(
-self.__addSearchEngine).setData(element)
+self.tr("Add to web search toolbar"))
+act.setData(element)
+act.triggered.connect(
+lambda: self.__addSearchEngine(act))
 menu.addSeparator()
 menu.addAction(
 UI.PixmapCache.getIcon("webInspector.png"),
 self.tr("Web Inspector..."), self.__webInspector)
 return url.isValid() and \
 bool(url.host()) and \
 bool(url.scheme()) and \
 "." in url.host()
-def __openLinkInNewTab(self):
+def __openLinkInNewTab(self, act):
 """
 Private method called by the context menu to open a link in a new
 window.
-"""
-act = self.sender()
+@param act reference to the action that triggered
+@type QAction
+"""
 url = act.data()
 if url.isEmpty():
 return
 self.ctrlPressed = True
 self.setSource(url)
 self.ctrlPressed = False
-def __bookmarkLink(self):
+def __bookmarkLink(self, act):
 """
 Private slot to bookmark a link via the context menu.
-"""
-act = self.sender()
+@param act reference to the action that triggered
+@type QAction
+"""
 url = act.data()
 if url.isEmpty():
 return
 from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog
 dlg = AddBookmarkDialog()
 dlg.setUrl(bytes(url.toEncoded()).decode())
 dlg.exec_()
-def __sendLink(self):
+def __sendLink(self, act):
 """
 Private slot to send a link via email.
-"""
-act = self.sender()
+@param act reference to the action that triggered
+@type QAction
+"""
 data = act.data()
 if isinstance(data, QUrl) and data.isEmpty():
 return
 if isinstance(data, QUrl):
 """
 Private slot to copy an image to the clipboard.
 """
 self.pageAction(QWebPage.CopyImageToClipboard).trigger()
-def __copyLocation(self):
+def __copyLocation(self, act):
 """
 Private slot to copy an image or media location to the clipboard.
-"""
-act = self.sender()
+@param act reference to the action that triggered
+@type QAction
+"""
 url = act.data()
 QApplication.clipboard().setText(url)
-def __blockImage(self):
+def __blockImage(self, act):
 """
 Private slot to add a block rule for an image URL.
+@param act reference to the action that triggered
+@type QAction
 """
 import Helpviewer.HelpWindow
-act = self.sender()
 url = act.data()
 dlg = Helpviewer.HelpWindow.HelpWindow.adBlockManager().showDialog()
 dlg.addCustomRule(url)
-def __downloadMedia(self):
+def __downloadMedia(self, act):
 """
 Private slot to download a media and save it to disk.
-"""
-act = self.sender()
+@param act reference to the action that triggered
+@type QAction
+"""
 url = act.data()
 self.mw.downloadManager().download(url, True, mainWindow=self.mw)
 def __pauseMedia(self):
 """
 if muted:
 self.__clickedMediaElement.evaluateJavaScript("this.muted = false")
 else:
 self.__clickedMediaElement.evaluateJavaScript("this.muted = true")
-def __virusTotal(self):
+def __virusTotal(self, act):
 """
 Private slot to scan the selected URL with VirusTotal.
-"""
-act = self.sender()
+@param act reference to the action that triggered
+@type QAction
+"""
 url = act.data()
 self.mw.requestVirusTotalScan(url)
 def __searchRequested(self, act):
 """
 engineName = act.data()
 if engineName:
 engine = self.mw.openSearchManager().engine(engineName)
 self.search.emit(engine.searchUrl(searchText))
-def __addSearchEngine(self):
+def __addSearchEngine(self, act):
 """
 Private slot to add a new search engine.
-"""
-act = self.sender()
+@param act reference to the action that triggered
-if act is None:
+@type QAction
-return
+"""
 element = act.data()
 elementName = element.attribute("name")
 formElement = QWebElement(element)
 while formElement.tagName().lower() != "form":
 formElement = formElement.parent()
 """{0} method is not supported.""").format(method.upper()))
 return
 searchUrl = QUrl(self.page().mainFrame().baseUrl().resolved(
 QUrl(formElement.attribute("action"))))
-##        if searchUrl.scheme() != "http":
-##            return
 if qVersionTuple() >= (5, 0, 0):
 from PyQt5.QtCore import QUrlQuery
 searchUrlQuery = QUrlQuery(searchUrl)
 searchEngines = {}

Mercurial Repositories > eric / file comparison

comparison: Helpviewer/HelpBrowserWV.py

Helpviewer/HelpBrowserWV.py