Commit b8f2445c authored by Laurent Montel's avatar Laurent Montel 😁

Use new signal

parent 0c28a551
......@@ -185,6 +185,9 @@ using KSieveUi::SieveDebugDialog;
#include <QDBusConnection>
#include <QTextDocument>
#include <QDir>
#ifdef QTWEBENGINE_SUPPORT_OPTION
#include <MessageViewer/WebHitTestResult>
#endif
// System includes
#include <AkonadiWidgets/standardactionmanager.h>
#include <KHelpClient>
......@@ -1012,8 +1015,12 @@ void KMMainWidget::createWidgets()
}
connect(mMsgView->viewer(), &MessageViewer::Viewer::replaceMsgByUnencryptedVersion,
this, &KMMainWidget::slotReplaceMsgByUnencryptedVersion);
connect(mMsgView->viewer(), &MessageViewer::Viewer::popupMenu,
this, &KMMainWidget::slotMessagePopup);
#ifdef QTWEBENGINE_SUPPORT_OPTION
connect(mMsgView->viewer(), &MessageViewer::Viewer::displayPopupMenu, this, &KMMainWidget::slotMessagePopup);
#else
connect(mMsgView->viewer(), &MessageViewer::Viewer::popupMenu, this, &KMMainWidget::slotMessagePopup);
#endif
connect(mMsgView->viewer(), &MessageViewer::Viewer::moveMessageToTrash,
this, &KMMainWidget::slotMoveMessageToTrash);
connect(mMsgView->viewer(), &MessageViewer::Viewer::executeMailAction,
......@@ -2638,8 +2645,16 @@ void KMMainWidget::slotSelectAllMessages()
updateMessageActions();
}
#ifdef QTWEBENGINE_SUPPORT_OPTION
void KMMainWidget::slotMessagePopup(const Akonadi::Item &msg, const MessageViewer::WebHitTestResult &result, const QPoint &aPoint)
#else
void KMMainWidget::slotMessagePopup(const Akonadi::Item &msg, const QUrl &aUrl, const QUrl &imageUrl, const QPoint &aPoint)
#endif
{
#ifdef QTWEBENGINE_SUPPORT_OPTION
QUrl aUrl = result.linkUrl();
QUrl imageUrl = result.imageUrl();
#endif
updateMessageMenu();
const QString email = KEmailAddress::firstEmailAddress(aUrl.path()).toLower();
......
......@@ -378,7 +378,11 @@ protected Q_SLOTS:
void slotSendQueuedVia(MailTransport::Transport *transport);
void slotOnlineStatus();
void slotUpdateOnlineStatus(KMailSettings::EnumNetworkState::type);
void slotMessagePopup(const Akonadi::Item &, const QUrl &, const QUrl &imageUrl, const QPoint &);
#ifdef QTWEBENGINE_SUPPORT_OPTION
void slotMessagePopup(const Akonadi::Item &aMsg, const MessageViewer::WebHitTestResult &result, const QPoint &aPoint);
#else
void slotMessagePopup(const Akonadi::Item &aMsg, const QUrl &aUrl, const QUrl &imageUrl, const QPoint &aPoint);
#endif
void slotContactSearchJobForMessagePopupDone(KJob *job);
void slotSelectAllMessages();
void slotFocusQuickSearch();
......
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