From b64ea0286a8e6eb3269588a4b48ccbf40158913b Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 1 Apr 2016 15:19:08 +0200 Subject: [PATCH] Add actions from popup --- akregator/src/articleviewer-ng/webengine/articleviewerwebengine.cpp | 4 +++- akregator/src/articleviewer-ng/webengine/articleviewerwebengine.h | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.cpp b/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.cpp index 2636e83a3b..55ac0e4b1d 100644 --- a/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.cpp +++ b/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.cpp @@ -60,7 +60,7 @@ ArticleViewerWebEngine::ArticleViewerWebEngine(KActionCollection *ac, QWidget *p mLastButtonClicked(LeftButton), mViewerPluginToolManager(Q_NULLPTR) { - new MessageViewer::NetworkAccessManagerWebEngine(this, ac, this); + mNetworkAccessManager = new MessageViewer::NetworkAccessManagerWebEngine(this, ac, this); mPageEngine = new ArticleViewerWebEnginePage(this); setPage(mPageEngine); @@ -255,6 +255,8 @@ void ArticleViewerWebEngine::slotWebHitFinished(const MessageViewer::WebHitTestR popup.addSeparator(); popup.addAction(ActionManager::getInstance()->action(QStringLiteral("speak_text"))); } + //TODO + popup.addActions(mNetworkAccessManager->actions()); popup.exec(mapToGlobal(result.pos())); } diff --git a/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.h b/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.h index ae7f1cf2df..9772404503 100644 --- a/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.h +++ b/akregator/src/articleviewer-ng/webengine/articleviewerwebengine.h @@ -30,6 +30,7 @@ class WebHitTestResult; class ViewerPluginToolManager; class ViewerPluginInterface; class MailWebEngineAccessKey; +class NetworkAccessManagerWebEngine; } namespace PimCommon { @@ -133,6 +134,7 @@ private: MousePressedButtonType mLastButtonClicked; MessageViewer::ViewerPluginToolManager *mViewerPluginToolManager; MessageViewer::MailWebEngineAccessKey *mWebEngineViewAccessKey; + MessageViewer::NetworkAccessManagerWebEngine *mNetworkAccessManager; }; } -- 2.11.4.GIT