Commit 01ce259b authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Use new dkim menu

parent a7143d52
......@@ -67,7 +67,7 @@ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widget
set(LIBGRAVATAR_VERSION_LIB "5.13.40")
set(MAILCOMMON_LIB_VERSION_LIB "5.13.40")
set(KDEPIM_APPS_LIB_VERSION_LIB "5.13.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.13.44")
set(MESSAGELIB_LIB_VERSION_LIB "5.13.49")
set(LIBKLEO_LIB_VERSION_LIB "5.13.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.13.40")
set(LIBKDEPIM_LIB_VERSION_LIB "5.13.40")
......
......@@ -193,6 +193,7 @@
#ifdef USE_DKIM_CHECKER
#include <MessageViewer/DKIMWidgetInfo>
#include <MessageViewer/DKIMViewerMenu>
#endif
using namespace KMime;
......@@ -2799,6 +2800,12 @@ void KMMainWidget::showMessagePopup(const Akonadi::Item &msg, const QUrl &url, c
menu.addSeparator();
if (mMsgView) {
#ifdef USE_DKIM_CHECKER
if (mMsgView->dkimViewerMenu()) {
menu.addMenu(mMsgView->dkimViewerMenu()->menu());
menu.addSeparator();
}
#endif
menu.addActions(mMsgView->viewerPluginActionList(MessageViewer::ViewerPluginInterface::NeedMessage));
menu.addSeparator();
}
......
......@@ -72,6 +72,7 @@
#include "messageviewer/config-messageviewer.h"
#ifdef USE_DKIM_CHECKER
#include <MessageViewer/DKIMWidgetInfo>
#include <MessageViewer/DKIMViewerMenu>
#endif
using namespace MailCommon;
......@@ -666,7 +667,7 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg, const QUrl &url
menu->addAction(mReaderWin->copyURLAction());
menu->addSeparator();
menu->addAction(mReaderWin->shareServiceUrlMenu());
menu->addSeparator();
menu->addSeparator();
menu->addActions(mReaderWin->viewerPluginActionList(MessageViewer::ViewerPluginInterface::NeedUrl));
if (!imageUrl.isEmpty()) {
menu->addSeparator();
......@@ -757,6 +758,12 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg, const QUrl &url
menu->addAction(mReaderWin->saveAsAction());
menu->addAction(mSaveAtmAction);
if (msg.isValid()) {
#ifdef USE_DKIM_CHECKER
if (mReaderWin->dkimViewerMenu()) {
menu->addSeparator();
menu->addMenu(mReaderWin->dkimViewerMenu()->menu());
}
#endif
menu->addSeparator();
menu->addActions(mReaderWin->viewerPluginActionList(MessageViewer::ViewerPluginInterface::NeedMessage));
}
......
......@@ -597,6 +597,13 @@ KActionMenu *KMReaderWin::shareServiceUrlMenu() const
return mViewer->shareServiceUrlMenu();
}
#ifdef USE_DKIM_CHECKER
DKIMViewerMenu *KMReaderWin::dkimViewerMenu()
{
return mViewer->dkimViewerMenu();
}
#endif
QList<QAction *> KMReaderWin::viewerPluginActionList(ViewerPluginInterface::SpecificFeatureTypes features)
{
return mViewer->viewerPluginActionList(features);
......
......@@ -29,12 +29,16 @@
#include <MimeTreeParser/BodyPart>
#include <AkonadiCore/Item>
#include <KContacts/Addressee>
#include <messageviewer/config-messageviewer.h>
class KActionCollection;
class QAction;
class KToggleAction;
class QMenu;
namespace MessageViewer {
class CSSHelper;
#ifdef USE_DKIM_CHECKER
class DKIMViewerMenu;
#endif
}
namespace MimeTreeParser {
......@@ -121,7 +125,7 @@ public:
void displayResourceOfflinePage();
bool isFixedFont() const;
Q_REQUIRED_RESULT bool isFixedFont() const;
void setUseFixedFont(bool useFixedFont);
MessageViewer::Viewer *viewer() const;
KToggleAction *toggleFixFontAction() const;
......@@ -161,14 +165,16 @@ public:
MessageViewer::CSSHelper *cssHelper() const;
bool printSelectedText(bool preview);
Q_REQUIRED_RESULT bool printSelectedText(bool preview);
void setContactItem(const Akonadi::Item &contact, const KContacts::Addressee &address);
void clearContactItem();
bool mimePartTreeIsEmpty() const;
Q_REQUIRED_RESULT bool mimePartTreeIsEmpty() const;
KActionMenu *shareServiceUrlMenu() const;
#ifdef USE_DKIM_CHECKER
MessageViewer::DKIMViewerMenu *dkimViewerMenu();
#endif
Q_REQUIRED_RESULT QList<QAction *> viewerPluginActionList(MessageViewer::ViewerPluginInterface::SpecificFeatureTypes features);
Q_REQUIRED_RESULT QList<QAction *> interceptorUrlActions(const WebEngineViewer::WebHitTestResult &result) const;
......
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