From f85b85973168ad59f0ad3e9df2513ecfeb11e976 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 12 Jun 2020 07:39:10 +0200 Subject: [PATCH] Use new PimCommon::BroadcastStatus --- CMakeLists.txt | 4 ++-- src/job/addemailtoexistingcontactjob.cpp | 4 ++-- src/job/createnewcontactjob.cpp | 4 ++-- src/kmcommands.cpp | 4 ++-- src/kmkernel.cpp | 4 ++-- src/kmmainwidget.cpp | 4 ++-- src/kmmainwin.cpp | 8 ++++---- src/kmreaderwin.cpp | 8 ++++++-- src/kontactplugin/summary/CMakeLists.txt | 2 +- src/kontactplugin/summary/summaryview_part.cpp | 6 +++--- 10 files changed, 26 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ad837ed19..89957d8fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,8 +68,8 @@ set(LIBGRAVATAR_VERSION_LIB "5.14.40") set(MAILCOMMON_LIB_VERSION_LIB "5.14.43") set(MESSAGELIB_LIB_VERSION_LIB "5.14.45") set(LIBKLEO_LIB_VERSION_LIB "5.14.40") -set(PIMCOMMON_LIB_VERSION_LIB "5.14.41") -set(LIBKDEPIM_LIB_VERSION_LIB "5.14.42") +set(PIMCOMMON_LIB_VERSION_LIB "5.14.43") +set(LIBKDEPIM_LIB_VERSION_LIB "5.14.46") set(LIBKSIEVE_LIB_VERSION_LIB "5.14.40") find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) diff --git a/src/job/addemailtoexistingcontactjob.cpp b/src/job/addemailtoexistingcontactjob.cpp index 871740adc..2fafbbfc6 100644 --- a/src/job/addemailtoexistingcontactjob.cpp +++ b/src/job/addemailtoexistingcontactjob.cpp @@ -19,7 +19,7 @@ #include "addemailtoexistingcontactjob.h" #include "kmail_debug.h" -#include +#include #include @@ -66,7 +66,7 @@ void AddEmailToExistingContactJob::slotAddEmailDone(KJob *job) setError(job->error()); setErrorText(job->errorText()); } else { - KPIM::BroadcastStatus::instance()->setStatusMsg(i18n("Email added successfully.")); + PimCommon::BroadcastStatus::instance()->setStatusMsg(i18n("Email added successfully.")); } emitResult(); } diff --git a/src/job/createnewcontactjob.cpp b/src/job/createnewcontactjob.cpp index 6dc6c8243..ca103fdce 100644 --- a/src/job/createnewcontactjob.cpp +++ b/src/job/createnewcontactjob.cpp @@ -21,7 +21,7 @@ #include "createnewcontactjob.h" #include "util.h" -#include +#include #include #include @@ -132,7 +132,7 @@ void CreateNewContactJob::createContact() void CreateNewContactJob::contactStored(const Akonadi::Item &item) { Q_UNUSED(item); - KPIM::BroadcastStatus::instance()->setStatusMsg(i18n("Contact created successfully")); + PimCommon::BroadcastStatus::instance()->setStatusMsg(i18n("Contact created successfully")); } void CreateNewContactJob::slotContactEditorError(const QString &error) diff --git a/src/kmcommands.cpp b/src/kmcommands.cpp index 1d63a0b3d..af1b85e4c 100644 --- a/src/kmcommands.cpp +++ b/src/kmcommands.cpp @@ -106,7 +106,7 @@ #include #include -#include +#include #ifndef QT_NO_CURSOR #include #endif @@ -1347,7 +1347,7 @@ KMCommand::Result KMFilterActionCommand::execute() progressItem->updateProgress(); const QString statusMsg = i18n("Filtering message %1 of %2", msgCount, msgCountToFilter); - KPIM::BroadcastStatus::instance()->setStatusMsg(statusMsg); + PimCommon::BroadcastStatus::instance()->setStatusMsg(statusMsg); qApp->processEvents(QEventLoop::ExcludeUserInputEvents, 50); } diff --git a/src/kmkernel.cpp b/src/kmkernel.cpp index 4d91f0d37..12e16ff77 100644 --- a/src/kmkernel.cpp +++ b/src/kmkernel.cpp @@ -3,14 +3,14 @@ #include "kmkernel.h" #include "settings/kmailsettings.h" -#include +#include #include "job/opencomposerjob.h" #include "job/newmessagejob.h" #include "job/opencomposerhiddenjob.h" #include "job/fillcomposerjob.h" #include #include -using KPIM::BroadcastStatus; +using PimCommon::BroadcastStatus; #include "kmmainwin.h" #include "editor/composer.h" #include "kmreadermainwin.h" diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp index 0fb7799d4..8aebab0cb 100644 --- a/src/kmmainwidget.cpp +++ b/src/kmmainwidget.cpp @@ -106,7 +106,7 @@ // LIBKDEPIM includes #include -#include +#include // KDEPIMLIBS includes #include @@ -200,7 +200,7 @@ using namespace KMime; using namespace Akonadi; using namespace MailCommon; using KPIM::ProgressManager; -using KPIM::BroadcastStatus; +using PimCommon::BroadcastStatus; using KMail::SearchWindow; using KMime::Types::AddrSpecList; using MessageViewer::AttachmentStrategy; diff --git a/src/kmmainwin.cpp b/src/kmmainwin.cpp index 51a7c0ca1..76f3b7cef 100644 --- a/src/kmmainwin.cpp +++ b/src/kmmainwin.cpp @@ -22,7 +22,7 @@ #include "kmmainwidget.h" #include #include -#include +#include #include "util.h" #include "tag/tagactionmanager.h" @@ -77,7 +77,7 @@ KMMainWin::KMMainWin(QWidget *) //must be after createGUI, otherwise e.g toolbar settings are not loaded setAutoSaveSettings(KMKernel::self()->config()->group("Main Window")); - connect(KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::statusMsg, + connect(PimCommon::BroadcastStatus::instance(), &PimCommon::BroadcastStatus::statusMsg, this, &KMMainWin::displayStatusMessage); connect(mKMMainWidget, &KMMainWidget::captionChangeRequest, @@ -92,7 +92,7 @@ KMMainWin::~KMMainWin() { // Avoids a crash if there are any Akonadi jobs running, which may // attempt to display a status message when they are killed. - disconnect(KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::statusMsg, this, nullptr); + disconnect(PimCommon::BroadcastStatus::instance(), &PimCommon::BroadcastStatus::statusMsg, this, nullptr); } KMMainWidget *KMMainWin::mainKMWidget() const @@ -175,7 +175,7 @@ void KMMainWin::setupStatusBar() mMessageLabel->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); statusBar()->addWidget(mMessageLabel); - QTimer::singleShot(2000, KPIM::BroadcastStatus::instance(), &KPIM::BroadcastStatus::reset); + QTimer::singleShot(2000, PimCommon::BroadcastStatus::instance(), &PimCommon::BroadcastStatus::reset); statusBar()->addPermanentWidget(mKMMainWidget->dkimWidgetInfo()); statusBar()->addPermanentWidget(mKMMainWidget->zoomLabelIndicator()); statusBar()->addPermanentWidget(mKMMainWidget->vacationScriptIndicator()); diff --git a/src/kmreaderwin.cpp b/src/kmreaderwin.cpp index 4f095ce0c..914dc64bc 100644 --- a/src/kmreaderwin.cpp +++ b/src/kmreaderwin.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "kmcommands.h" #include #include @@ -455,6 +455,10 @@ void KMReaderWin::slotMailtoAddAddrBook() const QString emailString = KEmailAddress::decodeMailtoUrl(url); KPIM::AddEmailAddressJob *job = new KPIM::AddEmailAddressJob(emailString, mMainWindow, this); + job->setInteractive(true); + connect(job, &KPIM::AddEmailAddressJob::successMessage, this, [this](const QString &message) { + PimCommon::BroadcastStatus::instance()->setStatusMsg(message); + }); job->start(); } @@ -876,7 +880,7 @@ void KMReaderWin::contactStored(const Akonadi::Item &item) setContactItem(item, contact); mViewer->slotChangeDisplayMail(mViewAsHtml->isChecked() ? Viewer::Html : Viewer::Text, mLoadExternalReference->isChecked()); } - KPIM::BroadcastStatus::instance()->setStatusMsg(i18n("Contact modified successfully")); + PimCommon::BroadcastStatus::instance()->setStatusMsg(i18n("Contact modified successfully")); } QAction *KMReaderWin::saveMessageDisplayFormatAction() const diff --git a/src/kontactplugin/summary/CMakeLists.txt b/src/kontactplugin/summary/CMakeLists.txt index 9777ede43..32c8da2a4 100644 --- a/src/kontactplugin/summary/CMakeLists.txt +++ b/src/kontactplugin/summary/CMakeLists.txt @@ -9,7 +9,7 @@ qt5_add_dbus_interfaces(kontact_summaryplugin_PART_SRCS ${kmail_BINARY_DIR}/src/ add_library(kontact_summaryplugin MODULE ${kontact_summaryplugin_PART_SRCS}) add_dependencies(kontact_summaryplugin kmail_xml) -target_link_libraries(kontact_summaryplugin KF5::KCMUtils KF5::IdentityManagement KF5::KontactInterface KF5::Libkdepim KF5::ConfigCore) +target_link_libraries(kontact_summaryplugin KF5::KCMUtils KF5::IdentityManagement KF5::KontactInterface KF5::PimCommon KF5::ConfigCore) kcoreaddons_desktop_to_json(kontact_summaryplugin summaryplugin.desktop) diff --git a/src/kontactplugin/summary/summaryview_part.cpp b/src/kontactplugin/summary/summaryview_part.cpp index d4034352a..648e33e5c 100644 --- a/src/kontactplugin/summary/summaryview_part.cpp +++ b/src/kontactplugin/summary/summaryview_part.cpp @@ -25,8 +25,8 @@ #include "summaryview_part.h" #include "dropwidget.h" -#include -using KPIM::BroadcastStatus; +#include +using PimCommon::BroadcastStatus; #include #include @@ -161,7 +161,7 @@ void SummaryViewPart::updateWidgets() mSummaries.insert(plugin->identifier(), summary); connect(summary, &KontactInterface::Summary::message, - BroadcastStatus::instance(), &KPIM::BroadcastStatus::setStatusMsg); + BroadcastStatus::instance(), &PimCommon::BroadcastStatus::setStatusMsg); connect(summary, &KontactInterface::Summary::summaryWidgetDropped, this, &SummaryViewPart::summaryWidgetMoved);