From 241bd474777174f652a49b60e313f3497647b06f Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 7 Jul 2020 13:38:29 +0200 Subject: [PATCH] Allow to share text --- CMakeLists.txt | 2 +- src/kmmainwidget.cpp | 2 ++ src/kmreadermainwin.cpp | 2 ++ src/kmreaderwin.cpp | 5 +++++ src/kmreaderwin.h | 2 ++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf5a28f37..022ace0af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,7 +66,7 @@ option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets) set(LIBGRAVATAR_VERSION_LIB "5.14.40") set(MAILCOMMON_LIB_VERSION_LIB "5.14.43") -set(MESSAGELIB_LIB_VERSION_LIB "5.14.45") +set(MESSAGELIB_LIB_VERSION_LIB "5.14.49") set(LIBKLEO_LIB_VERSION_LIB "5.14.40") set(PIMCOMMON_LIB_VERSION_LIB "5.14.47") set(LIBKDEPIM_LIB_VERSION_LIB "5.14.46") diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp index 8aebab0cb..7d5d56cc1 100644 --- a/src/kmmainwidget.cpp +++ b/src/kmmainwidget.cpp @@ -2747,6 +2747,8 @@ void KMMainWidget::showMessagePopup(const Akonadi::Item &msg, const QUrl &url, c menu.addSeparator(); menu.addAction(mMsgView->speakTextAction()); } + menu.addSeparator(); + menu.addAction(mMsgView->shareTextAction()); } else if (!urlMenuAdded) { // popup somewhere else (i.e., not a URL) on the message if (!mMessagePane->currentMessage()) { diff --git a/src/kmreadermainwin.cpp b/src/kmreadermainwin.cpp index e3efb3679..3a9bfb1c7 100644 --- a/src/kmreadermainwin.cpp +++ b/src/kmreadermainwin.cpp @@ -699,6 +699,8 @@ void KMReaderMainWin::showMessagePopup(const Akonadi::Item &msg, const QUrl &url menu->addSeparator(); menu->addAction(mReaderWin->speakTextAction()); } + menu->addSeparator(); + menu->addAction(mReaderWin->shareTextAction()); } else if (!urlMenuAdded) { if (!menu) { menu = new QMenu(this); diff --git a/src/kmreaderwin.cpp b/src/kmreaderwin.cpp index daab5dbab..1d327ea09 100644 --- a/src/kmreaderwin.cpp +++ b/src/kmreaderwin.cpp @@ -670,6 +670,11 @@ QAction *KMReaderWin::speakTextAction() const return mViewer->speakTextAction(); } +QAction *KMReaderWin::shareTextAction() const +{ + return mViewer->shareTextAction(); +} + QAction *KMReaderWin::downloadImageToDiskAction() const { return mImageUrlSaveAsAction; diff --git a/src/kmreaderwin.h b/src/kmreaderwin.h index f8af1f261..9d99dd6cf 100644 --- a/src/kmreaderwin.h +++ b/src/kmreaderwin.h @@ -148,6 +148,8 @@ public: QAction *resetMessageDisplayFormatAction() const; QAction *editContactAction() const; QAction *developmentToolsAction() const; + QAction *shareTextAction() const; + QMenu *viewHtmlOption() const; QAction *shareImage() const;