eric: comparison Helpviewer/HelpBrowserWV.py

-:47016f5af3b8
+:84626f18f2c3
 from PyQt4.QtCore import pyqtSlot, pyqtSignal, QObject, QT_TRANSLATE_NOOP, QUrl, \
 QBuffer, QIODevice, QFileInfo, Qt, QTimer, QEvent, QRect, QFile, QPoint
 from PyQt4.QtGui import qApp, QDesktopServices, QStyle, QMenu, QApplication, \
 QInputDialog, QLineEdit, QClipboard, QMouseEvent, QLabel, QToolTip, QColor, \
 QPalette, QFrame, QPrinter, QPrintDialog, QDialog
-from PyQt4 import QtWebKit
 from PyQt4.QtWebKit import QWebView, QWebPage, QWebSettings
 try:
 from PyQt4.QtWebKit import QWebElement
 except ImportError:
 pass
 import Preferences
 import UI.PixmapCache
 from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog
 from .Bookmarks.BookmarkNode import BookmarkNode
-from .JavaScriptResources import fetchLinks_js
 try:
 from .SslInfoDialog import SslInfoDialog
 from PyQt4.QtNetwork import QSslCertificate
 SSL_AVAILABLE = True
 except ImportError:
 self.mw.openSearchManager().currentEngineChanged.connect(
 self.__currentEngineChanged)
 self.setAcceptDrops(True)
-if hasattr(QtWebKit, 'QWebElement'):
+self.__enableAccessKeys = Preferences.getHelp("AccessKeysEnabled")
-self.__enableAccessKeys = Preferences.getHelp("AccessKeysEnabled")
+self.__accessKeysPressed = False
-self.__accessKeysPressed = False
+self.__accessKeyLabels = []
-self.__accessKeyLabels = []
+self.__accessKeyNodes = {}
-self.__accessKeyNodes = {}
+self.page().loadStarted.connect(self.__hideAccessKeys)
-self.page().loadStarted.connect(self.__hideAccessKeys)
+self.page().scrollRequested.connect(self.__hideAccessKeys)
-self.page().scrollRequested.connect(self.__hideAccessKeys)
 self.__rss = []
 self.__clickedFrame = None
 """
 Private slot to add javascript bindings for adding search providers.
 @param frame reference to the web frame (QWebFrame)
 """
-if not hasattr(QtWebKit, 'QWebElement'):
-# test this only for Qt < 4.6.0
-if not QWebSettings.globalSettings()\
-.testAttribute(QWebSettings.JavascriptEnabled):
-return
 self.page().settings().setAttribute(QWebSettings.JavascriptEnabled, True)
 if self.__javaScriptBinding is None:
 self.__javaScriptBinding = JavaScriptExternalObject(self.mw, self)
 if frame is None:
 @param relation relation to extract (string)
 @return list of linked resources (list of LinkedResource)
 """
 resources = []
-if hasattr(QtWebKit, 'QWebElement'):
+baseUrl = self.page().mainFrame().baseUrl()
-baseUrl = self.page().mainFrame().baseUrl()
+linkElements = self.page().mainFrame().findAllElements("html > head > link")
+for linkElement in linkElements.toList():
+rel = linkElement.attribute("rel")
+href = linkElement.attribute("href")
+type_ = linkElement.attribute("type")
+title = linkElement.attribute("title")
-linkElements = self.page().mainFrame().findAllElements("html > head > link")
+if href == "" or type_ == "":
+continue
+if relation and rel != relation:
+continue
-for linkElement in linkElements.toList():
+resource = LinkedResource()
-rel = linkElement.attribute("rel")
+resource.rel = rel
-href = linkElement.attribute("href")
+resource.type_ = type_
-type_ = linkElement.attribute("type")
+resource.href = baseUrl.resolved(QUrl.fromEncoded(href))
-title = linkElement.attribute("title")
+resource.title = title
-if href == "" or type_ == "":
-continue
-if relation and rel != relation:
-continue
-resource = LinkedResource()
-resource.rel = rel
-resource.type_ = type_
-resource.href = baseUrl.resolved(QUrl.fromEncoded(href))
-resource.title = title
-resources.append(resource)
-else:
-baseUrlString = self.page().mainFrame().evaluateJavaScript("document.baseURI")
-baseUrl = QUrl.fromEncoded(baseUrlString)
-lst = self.page().mainFrame().evaluateJavaScript(fetchLinks_js)
+resources.append(resource)
-for m in lst:
-rel = m["rel"]
-type_ = m["type"]
-href = m["href"]
-title = m["title"]
-if href == "" or type_ == "":
-continue
-if relation and rel != relation:
-continue
-resource = LinkedResource()
-resource.rel = rel
-resource.type_ = type_
-resource.href = baseUrl.resolved(QUrl.fromEncoded(href))
-resource.title = title
-resources.append(resource)
 return resources
 def __currentEngineChanged(self):
 """
 if self.__isUrlValid(guessedUrl):
 menu.addAction(self.trUtf8("Go to web address"), self.__openLinkInNewTab)\
 .setData(guessedUrl)
 menu.addSeparator()
-if hasattr(QtWebKit, 'QWebElement'):
+element = hit.element()
-element = hit.element()
+if not element.isNull() and \
-if not element.isNull() and \
+element.tagName().lower() == "input" and \
-element.tagName().lower() == "input" and \
+element.attribute("type", "text") == "text":
-element.attribute("type", "text") == "text":
+menu.addAction(self.trUtf8("Add to web search toolbar"),
-menu.addAction(self.trUtf8("Add to web search toolbar"),
+self.__addSearchEngine).setData(element)
-self.__addSearchEngine).setData(element)
+menu.addSeparator()
-menu.addSeparator()
 menu.addAction(UI.PixmapCache.getIcon("webInspector.png"),
 self.trUtf8("Web Inspector..."), self.__webInspector)
 menu.exec_(evt.globalPos())
 @param evt reference to the key event (QKeyEvent)
 """
 if self.mw.personalInformationManager().viewKeyPressEvent(self, evt):
 return
-if hasattr(QtWebKit, 'QWebElement'):
+if self.__enableAccessKeys:
-if self.__enableAccessKeys:
+self.__accessKeysPressed = (
-self.__accessKeysPressed = (
+evt.modifiers() == Qt.ControlModifier and \
-evt.modifiers() == Qt.ControlModifier and \
+evt.key() == Qt.Key_Control)
-evt.key() == Qt.Key_Control)
+if not self.__accessKeysPressed:
-if not self.__accessKeysPressed:
+if self.__checkForAccessKey(evt):
-if self.__checkForAccessKey(evt):
-self.__hideAccessKeys()
-evt.accept()
-return
 self.__hideAccessKeys()
-else:
+evt.accept()
-QTimer.singleShot(300, self.__accessKeyShortcut)
+return
+self.__hideAccessKeys()
+else:
+QTimer.singleShot(300, self.__accessKeyShortcut)
 self.ctrlPressed = (evt.key() == Qt.Key_Control)
 super().keyPressEvent(evt)
 def keyReleaseEvent(self, evt):
 """
 Protected method called by a key release.
 @param evt reference to the key event (QKeyEvent)
 """
-if hasattr(QtWebKit, 'QWebElement'):
+if self.__enableAccessKeys:
-if self.__enableAccessKeys:
+self.__accessKeysPressed = evt.key() == Qt.Key_Control
-self.__accessKeysPressed = evt.key() == Qt.Key_Control
 self.ctrlPressed = False
 super().keyReleaseEvent(evt)
 def focusOutEvent(self, evt):
 """
 Protected method called by a focus out event.
 @param evt reference to the focus event (QFocusEvent)
 """
-if hasattr(QtWebKit, 'QWebElement'):
+if self.__accessKeysPressed:
-if self.__accessKeysPressed:
+self.__hideAccessKeys()
-self.__hideAccessKeys()
+self.__accessKeysPressed = False
-self.__accessKeysPressed = False
 super().focusOutEvent(evt)
 def event(self, evt):
 """
 def preferencesChanged(self):
 """
 Public method to indicate a change of the settings.
 """
-if hasattr(QtWebKit, 'QWebElement'):
+self.__enableAccessKeys = Preferences.getHelp("AccessKeysEnabled")
-self.__enableAccessKeys = Preferences.getHelp("AccessKeysEnabled")
+if not self.__enableAccessKeys:
-if not self.__enableAccessKeys:
+self.__hideAccessKeys()
-self.__hideAccessKeys()
 self.reload()
 ############################################################################
 ## RSS related methods below

Mercurial Repositories > eric / file comparison

comparison: Helpviewer/HelpBrowserWV.py

Helpviewer/HelpBrowserWV.py