Commit 78996eb7 authored by Laurent Montel's avatar Laurent Montel 😁

forward QList<QAction *>

parent 3a0c1880
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
//#define KMAIL_READER_HTML_DEBUG 1 //#define KMAIL_READER_HTML_DEBUG 1
#include "viewer.h" #include "viewer.h"
#include "config-messageviewer.h"
#include "viewer_p.h" #include "viewer_p.h"
#include "widgets/configurewidget.h" #include "widgets/configurewidget.h"
#include "csshelper.h" #include "csshelper.h"
...@@ -685,5 +684,13 @@ QList<QAction *> Viewer::viewerPluginActionList(ViewerPluginInterface::SpecificF ...@@ -685,5 +684,13 @@ QList<QAction *> Viewer::viewerPluginActionList(ViewerPluginInterface::SpecificF
return d->viewerPluginActionList(features); return d->viewerPluginActionList(features);
} }
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE
QList<QAction *> Viewer::interceptorUrlActions(const MessageViewer::WebHitTestResult &result) const
{
Q_D(const Viewer);
return d->interceptorUrlActions(result);
}
#endif
} }
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#define MESSAGEVIEWER_H #define MESSAGEVIEWER_H
#include "messageviewer_export.h" #include "messageviewer_export.h"
#include "config-messageviewer.h"
#include "messageviewer/viewerplugininterface.h" #include "messageviewer/viewerplugininterface.h"
#include <MimeTreeParser/Enums> #include <MimeTreeParser/Enums>
...@@ -53,6 +54,10 @@ class QResizeEvent; ...@@ -53,6 +54,10 @@ class QResizeEvent;
namespace MessageViewer namespace MessageViewer
{ {
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE
class WebHitTestResult;
#endif
class HeaderStylePlugin; class HeaderStylePlugin;
class CSSHelper; class CSSHelper;
class ViewerPrivate; class ViewerPrivate;
...@@ -330,6 +335,9 @@ public: ...@@ -330,6 +335,9 @@ public:
void showOpenAttachmentFolderWidget(const QUrl &url); void showOpenAttachmentFolderWidget(const QUrl &url);
QList<QAction *> viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features); QList<QAction *> viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features);
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE
QList<QAction *> interceptorUrlActions(const MessageViewer::WebHitTestResult &result) const;
#endif
Q_SIGNALS: Q_SIGNALS:
void moveMessageToTrash(); void moveMessageToTrash();
......
...@@ -3125,3 +3125,10 @@ void ViewerPrivate::slotServiceUrlSelected(PimCommon::ShareServiceUrlManager::Se ...@@ -3125,3 +3125,10 @@ void ViewerPrivate::slotServiceUrlSelected(PimCommon::ShareServiceUrlManager::Se
const QUrl url = mShareServiceManager->generateServiceUrl(mClickedUrl.toString(), QString(), serviceType); const QUrl url = mShareServiceManager->generateServiceUrl(mClickedUrl.toString(), QString(), serviceType);
mShareServiceManager->openUrl(url); mShareServiceManager->openUrl(url);
} }
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE
QList<QAction *> ViewerPrivate::interceptorUrlActions(const MessageViewer::WebHitTestResult &result) const
{
return mViewer->interceptorUrlActions(result);
}
#endif
...@@ -438,6 +438,9 @@ public: ...@@ -438,6 +438,9 @@ public:
void setPluginName(const QString &pluginName); void setPluginName(const QString &pluginName);
QList<QAction *> viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features); QList<QAction *> viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features);
#ifdef MESSAGEVIEWER_USE_QTWEBENGINE
QList<QAction *> interceptorUrlActions(const MessageViewer::WebHitTestResult &result) const;
#endif
private Q_SLOTS: private Q_SLOTS:
void slotActivatePlugin(MessageViewer::ViewerPluginInterface *interface); void slotActivatePlugin(MessageViewer::ViewerPluginInterface *interface);
...@@ -586,7 +589,6 @@ Q_SIGNALS: ...@@ -586,7 +589,6 @@ Q_SIGNALS:
void changeDisplayMail(Viewer::DisplayFormatMessage, bool); void changeDisplayMail(Viewer::DisplayFormatMessage, bool);
void moveMessageToTrash(); void moveMessageToTrash();
void executeMailAction(MessageViewer::Viewer::MailAction type); void executeMailAction(MessageViewer::Viewer::MailAction type);
private: private:
QString attachmentInjectionHtml(); QString attachmentInjectionHtml();
QString recipientsQuickListLinkHtml(bool, const QString &); QString recipientsQuickListLinkHtml(bool, const QString &);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment