Merge branch 'master' into mainwindow

1 files changed, 14 insertions, 1 deletions

diff --git a/src/webview.cpp b/src/webview.cpp
index 436db54e..5d317597 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -42,7 +42,8 @@
 #include <QMouseEvent>
 #include <QWebHitTestResult>
 #include <QBuffer>
-
+// ---
+#include <QUiLoader>
 
 WebPage::WebPage(QObject *parent)
     : QWebPage(parent)
@@ -120,6 +121,16 @@ QWebPage *WebPage::createWindow(QWebPage::WebWindowType type)
 }
 
 
+QObject *WebPage::createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues)
+{
+    Q_UNUSED(url);
+    Q_UNUSED(paramNames);
+    Q_UNUSED(paramValues);
+    QUiLoader loader;
+    return loader.createWidget(classId, view());
+}
+
+
 void WebPage::handleUnsupportedContent(QNetworkReply *reply)
 {
     if (reply->error() == QNetworkReply::NoError) 
@@ -191,6 +202,8 @@ WebView::WebView(QWidget* parent)
 
 
 // TODO : improve and KDE-ize this menu
+// 1. Add link to bookmarks
+// 2. Add "save link as" action
 void WebView::contextMenuEvent(QContextMenuEvent *event)
 {
     QWebHitTestResult r = page()->mainFrame()->hitTestContent(event->pos());