eric: comparison WebBrowser/WebBrowserView.py

-:15d416f1eca5
+:4ad656e4ebec
 self.__inspector = None
 WebInspector.registerView(self)
 self.grabGesture(Qt.PinchGesture)
-def __del__(self):
-"""
-Special method doing some cleanup stuff.
-"""
-WebInspector.unregisterView(self)
 ##    def __addExternalBinding(self, frame=None):
 ##        """
 ##        Private slot to add javascript bindings for adding search providers.
 ##
 # TODO: AdBlock
 ##        if not hitTest.isContentEditable() and not hitTest.isContentSelected():
 ##            self.__menu.addAction(self.__mw.adBlockIcon().menuAction())
-self.__menu.addSeparator()
+if Preferences.getWebBrowser("WebInspectorEnabled"):
-self.__menu.addAction(
+self.__menu.addSeparator()
-UI.PixmapCache.getIcon("webInspector.png"),
+self.__menu.addAction(
-self.tr("Inspect Element..."), self.__webInspector)
+UI.PixmapCache.getIcon("webInspector.png"),
+self.tr("Inspect Element..."), self.__webInspector)
 if not self.__menu.isEmpty():
 pos = evt.globalPos()
 self.__menu.popup(QPoint(pos.x(), pos.y() + 1))
 menu.addAction(
 UI.PixmapCache.getIcon("wikipedia.png"),
 self.tr("Dictionary"), self.__openLinkInNewTab)\
 .setData(wiktionaryUrl)
 menu.addSeparator()
-##    QString langCode = mApp->currentLanguage().left(2).toUtf8();
-##    QUrl googleTranslateUrl = QUrl(QString("https://translate.google.com/#auto/%1/%2").arg(langCode, selectedText));
-##    Action* gtwact = new Action(QIcon(":icons/sites/translate.png"), tr("Google Translate"));
-##    gtwact->setData(googleTranslateUrl);
-##    connect(gtwact, SIGNAL(triggered()), this, SLOT(openUrlInSelectedTab()));
-##    connect(gtwact, SIGNAL(ctrlTriggered()), this, SLOT(openUrlInBackgroundTab()));
-##    menu->addAction(gtwact);
-##
-##    Action* dictact = new Action(QIcon::fromTheme("accessories-dictionary"), tr("Dictionary"));
-##    dictact->setData(QUrl("http://" + (!langCode.isEmpty() ? langCode + "." : langCode) + "wiktionary.org/wiki/Special:Search?search=" + selectedText));
-##    connect(dictact, SIGNAL(triggered()), this, SLOT(openUrlInSelectedTab()));
-##    connect(dictact, SIGNAL(ctrlTriggered()), this, SLOT(openUrlInBackgroundTab()));
-##    menu->addAction(dictact);
 guessedUrl = QUrl.fromUserInput(self.selectedText().strip())
 if self.__isUrlValid(guessedUrl):
 menu.addAction(
 self.tr("Go to web address"),
 menu.addSeparator()
 menu.addAction(self.__mw.pageSourceAct)
 # TODO: Site Info
 ##        menu.addSeparator()
 ##        menu.addAction(self.__mw.siteInfoAct)
-##    if (url().scheme() == QLatin1String("http") || url().scheme() == QLatin1String("https")) {
+if self.url().scheme() in ["http", "https"]:
-##        const QUrl w3url = QUrl::fromEncoded("http://validator.w3.org/check?uri=" + QUrl::toPercentEncoding(url().toEncoded()));
+menu.addSeparator()
-##        menu->addAction(QIcon(":icons/sites/w3.png"), tr("Validate page"), this, SLOT(openUrlInSelectedTab()))->setData(w3url);
-##
+w3url = QUrl.fromEncoded(
-##        QByteArray langCode = mApp->currentLanguage().left(2).toUtf8();
+b"http://validator.w3.org/check?uri=" +
-##        const QUrl gturl = QUrl::fromEncoded("http://translate.google.com/translate?sl=auto&tl=" + langCode + "&u=" + QUrl::toPercentEncoding(url().toEncoded()));
+QUrl.toPercentEncoding(bytes(self.url().toEncoded()).decode()))
-##        menu->addAction(QIcon(":icons/sites/translate.png"), tr("Translate page"), this, SLOT(openUrlInSelectedTab()))->setData(gturl);
+menu.addAction(
-##    }
+UI.PixmapCache.getIcon("w3.png"),
+self.tr("Validate Page"), self.__openLinkInNewTab)\
+.setData(w3url)
+from .WebBrowserLanguagesDialog import WebBrowserLanguagesDialog
+languages = Preferences.toList(
+Preferences.Prefs.settings.value(
+"WebBrowser/AcceptLanguages",
+WebBrowserLanguagesDialog.defaultAcceptLanguages()))
+if languages:
+language = languages[0]
+langCode = language.split("[")[1][:2]
+googleTranslatorUrl = QUrl.fromEncoded(
+b"http://translate.google.com/translate?sl=auto&tl=" +
+langCode.encode() +
+b"&u=" +
+QUrl.toPercentEncoding(
+bytes(self.url().toEncoded()).decode()))
+menu.addAction(
+UI.PixmapCache.getIcon("translate.png"),
+self.tr("Google Translate"), self.__openLinkInNewTab)\
+.setData(googleTranslatorUrl)
 def __checkForForm(self, act, pos):
 """
 Private method to check the given position for an open search form.
 if self.__inspector is None:
 from .WebInspector import WebInspector
 self.__inspector = WebInspector()
 self.__inspector.setView(self, True)
 self.__inspector.show()
-elif self.__inspector.isVisible():
-self.__inspector.hide()
 else:
-self.__inspector.show()
+self.closeWebInspector()
 def closeWebInspector(self):
 """
 Public slot to close the web inspector.
 """
 if self.__inspector is not None:
 if self.__inspector.isVisible():
 self.__inspector.hide()
+WebInspector.unregisterView(self.__inspector)
 self.__inspector.deleteLater()
 self.__inspector = None
 def addBookmark(self):
 """
 self._keyReleaseEvent(evt)
 elif evt.type() == QEvent.MouseButtonPress:
 self._mousePressEvent(evt)
 elif evt.type() == QEvent.MouseButtonRelease:
 self._mouseReleaseEvent(evt)
-##            elif evt.type() == QEvent.MouseMove:
-##                self.__mouseMoveEvent(evt)
 elif evt.type() == QEvent.Wheel:
 self._wheelEvent(evt)
 elif evt.type() == QEvent.Gesture:
 self._gestureEvent(evt)
 ret = evt.isAccepted()
 # block already handled events
 if obj is self:
 if evt.type() in [QEvent.KeyPress, QEvent.KeyRelease,
 QEvent.MouseButtonPress,
 QEvent.MouseButtonRelease,
-##                              QEvent.MouseMove,
 QEvent.Wheel, QEvent.Gesture]:
 return True
 return super(WebBrowserView, self).eventFilter(obj, evt)
 ##       data.contains("<br") or \
 ##       data.contains("<p"):
 ##        return True
 ##
 ##    return False
-######################
-def renderWidgetPixmap(self):
-return self.__rwhvqt.grabFramebuffer()
-def repaintRenderWidget(self):
-self.__rwhvqt.repaint()

Mercurial Repositories > eric / file comparison

comparison: WebBrowser/WebBrowserView.py

WebBrowser/WebBrowserView.py