Mercurial Repositories > eric / file diff

--- a/WebBrowser/WebBrowserView.py	Sat Feb 20 14:34:32 2016 +0100
+++ b/WebBrowser/WebBrowserView.py	Sat Feb 20 15:25:51 2016 +0100
@@ -808,30 +808,42 @@
         
         menu.addSeparator()
         
-        # TODO: Languages Dialog
-##        from .HelpLanguagesDialog import HelpLanguagesDialog
-##        languages = Preferences.toList(
-##            Preferences.Prefs.settings.value(
-##                "Help/AcceptLanguages",
-##                HelpLanguagesDialog.defaultAcceptLanguages()))
-##        if languages:
-##            language = languages[0]
-##            langCode = language.split("[")[1][:2]
-##            googleTranslatorUrl = QUrl(
-##                "http://translate.google.com/#auto|{0}|{1}".format(
-##                    langCode, self.selectedText()))
-##            menu.addAction(
-##                UI.PixmapCache.getIcon("translate.png"),
-##                self.tr("Google Translate"), self.__openLinkInNewTab)\
-##                .setData(googleTranslatorUrl)
-##            wiktionaryUrl = QUrl(
-##                "http://{0}.wiktionary.org/wiki/Special:Search?search={1}"
-##                .format(langCode, self.selectedText()))
-##            menu.addAction(
-##                UI.PixmapCache.getIcon("wikipedia.png"),
-##                self.tr("Dictionary"), self.__openLinkInNewTab)\
-##                .setData(wiktionaryUrl)
-##            menu.addSeparator()
+        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(
+                "http://translate.google.com/#auto|{0}|{1}".format(
+                    langCode, self.selectedText()))
+            menu.addAction(
+                UI.PixmapCache.getIcon("translate.png"),
+                self.tr("Google Translate"), self.__openLinkInNewTab)\
+                .setData(googleTranslatorUrl)
+            wiktionaryUrl = QUrl(
+                "http://{0}.wiktionary.org/wiki/Special:Search?search={1}"
+                .format(langCode, self.selectedText()))
+            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):
@@ -889,6 +901,14 @@
         # TODO: Site Info
 ##        menu.addSeparator()
 ##        menu.addAction(self.__mw.siteInfoAct)
+##    if (url().scheme() == QLatin1String("http") || url().scheme() == QLatin1String("https")) {
+##        const QUrl w3url = QUrl::fromEncoded("http://validator.w3.org/check?uri=" + QUrl::toPercentEncoding(url().toEncoded()));
+##        menu->addAction(QIcon(":icons/sites/w3.png"), tr("Validate page"), this, SLOT(openUrlInSelectedTab()))->setData(w3url);
+##
+##        QByteArray langCode = mApp->currentLanguage().left(2).toUtf8();
+##        const QUrl gturl = QUrl::fromEncoded("http://translate.google.com/translate?sl=auto&tl=" + langCode + "&u=" + QUrl::toPercentEncoding(url().toEncoded()));
+##        menu->addAction(QIcon(":icons/sites/translate.png"), tr("Translate page"), this, SLOT(openUrlInSelectedTab()))->setData(gturl);
+##    }
         
     def __checkForForm(self, act, pos):
         """