Commit 403035b4 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

dkim support is enabled by default now

parent 56bdf331
......@@ -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.55")
set(MESSAGELIB_LIB_VERSION_LIB "5.13.56")
set(LIBKLEO_LIB_VERSION_LIB "5.13.40")
set(PIMCOMMON_LIB_VERSION_LIB "5.13.43")
set(LIBKDEPIM_LIB_VERSION_LIB "5.13.40")
......
......@@ -46,7 +46,6 @@
#include "foldershortcutactionmanager.h"
#include "kmmigrateapplication.h"
#include <KLocalizedString>
#include "messageviewer/config-messageviewer.h"
#include <KSharedConfig>
K_PLUGIN_FACTORY(KMailFactory, registerPlugin<KMailPart>();
......@@ -93,9 +92,7 @@ KMailPart::KMailPart(QWidget *parentWidget, QObject *parent, const QVariantList
KParts::StatusBarExtension *statusBar = new KParts::StatusBarExtension(this);
statusBar->addStatusBarItem(mainWidget->vacationScriptIndicator(), 2, false);
statusBar->addStatusBarItem(mainWidget->zoomLabelIndicator(), 3, false);
#ifdef USE_DKIM_CHECKER
statusBar->addStatusBarItem(mainWidget->dkimWidgetInfo(), 4, false);
#endif
setXMLFile(QStringLiteral("kmail_part.rc"), true);
KSettings::Dispatcher::registerComponent(QStringLiteral("kmail2"), mKMailKernel, "slotConfigChanged");
......
......@@ -191,10 +191,8 @@
#include <job/removeduplicatemailjob.h>
#include <job/removecollectionjob.h>
#ifdef USE_DKIM_CHECKER
#include <MessageViewer/DKIMWidgetInfo>
#include <MessageViewer/DKIMViewerMenu>
#endif
using namespace KMime;
using namespace Akonadi;
......@@ -337,7 +335,6 @@ KMMainWidget::KMMainWidget(QWidget *parent, KXMLGUIClient *aGUIClient, KActionCo
setupUnifiedMailboxChecker();
}
#ifdef USE_DKIM_CHECKER
QWidget *KMMainWidget::dkimWidgetInfo() const
{
if (mMsgView) {
......@@ -346,8 +343,6 @@ QWidget *KMMainWidget::dkimWidgetInfo() const
return nullptr;
}
#endif
void KMMainWidget::restoreCollectionFolderViewConfig()
{
ETMViewStateSaver *saver = new ETMViewStateSaver;
......@@ -2800,12 +2795,10 @@ 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();
}
......
......@@ -31,7 +31,6 @@
#include "messageactions.h"
#include <KActionCollection>
#include <mailcommon/foldersettings.h>
#include "messageviewer/config-messageviewer.h"
#include <QPointer>
#include <QTimer>
#include <Akonadi/KMime/StandardMailActionManager>
......@@ -83,11 +82,9 @@ class SieveImapPasswordProvider;
class ManageSieveScriptsDialog;
class VacationManager;
}
#ifdef USE_DKIM_CHECKER
namespace MessageViewer {
class DKIMWidgetInfo;
}
#endif
namespace MailCommon {
class FolderSelectionDialog;
class FavoriteCollectionWidget;
......@@ -144,9 +141,7 @@ public:
static const PtrList *mainWidgetList();
QWidget *vacationScriptIndicator() const;
#ifdef USE_DKIM_CHECKER
QWidget *dkimWidgetInfo() const;
#endif
MailCommon::FolderTreeView *folderTreeView() const;
/** Returns the XML GUI client. */
......
......@@ -177,9 +177,7 @@ void KMMainWin::setupStatusBar()
statusBar()->addWidget(mMessageLabel);
QTimer::singleShot(2000, KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::reset);
#ifdef USE_DKIM_CHECKER
statusBar()->addPermanentWidget(mKMMainWidget->dkimWidgetInfo());
#endif
statusBar()->addPermanentWidget(mKMMainWidget->zoomLabelIndicator());
statusBar()->addPermanentWidget(mKMMainWidget->vacationScriptIndicator());
statusBar()->addPermanentWidget(mProgressBar->littleProgress());
......
......@@ -69,11 +69,8 @@
#include <Akonadi/KMime/MessageFlags>
#include "kpimtextedit/texttospeech.h"
#include <mailcommon/mailutil.h>
#include "messageviewer/config-messageviewer.h"
#ifdef USE_DKIM_CHECKER
#include <MessageViewer/DKIMWidgetInfo>
#include <MessageViewer/DKIMViewerMenu>
#endif
using namespace MailCommon;
KMReaderMainWin::KMReaderMainWin(MessageViewer::Viewer::DisplayFormatMessage format, bool htmlLoadExtDefault, const QString &name)
......@@ -113,9 +110,7 @@ void KMReaderMainWin::initKMReaderMainWin()
mZoomLabelIndicator = new ZoomLabelWidget(statusBar());
statusBar()->addPermanentWidget(mZoomLabelIndicator);
setZoomChanged(mReaderWin->viewer()->webViewZoomFactor());
#ifdef USE_DKIM_CHECKER
statusBar()->addPermanentWidget(mReaderWin->viewer()->dkimWidgetInfo());
#endif
if (!mReaderWin->message().isValid()) {
menuBar()->hide();
toolBar(QStringLiteral("mainToolBar"))->hide();
......@@ -758,12 +753,10 @@ 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,14 +597,11 @@ 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,16 +29,13 @@
#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 {
......@@ -172,9 +169,7 @@ public:
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