Commit f85b8597 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Use new PimCommon::BroadcastStatus

parent efc982a4
Pipeline #23288 failed with stage
in 8 minutes and 16 seconds
......@@ -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)
......
......@@ -19,7 +19,7 @@
#include "addemailtoexistingcontactjob.h"
#include "kmail_debug.h"
#include <Libkdepim/BroadcastStatus>
#include <PimCommon/BroadcastStatus>
#include <AkonadiCore/ItemModifyJob>
......@@ -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();
}
......@@ -21,7 +21,7 @@
#include "createnewcontactjob.h"
#include "util.h"
#include <Libkdepim/BroadcastStatus>
#include <PimCommon/BroadcastStatus>
#include <KContacts/Addressee>
#include <KContacts/ContactGroup>
......@@ -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)
......
......@@ -106,7 +106,7 @@
#include <MailTransport/TransportManager>
#include <Libkdepim/ProgressManager>
#include <Libkdepim/BroadcastStatus>
#include <PimCommon/BroadcastStatus>
#ifndef QT_NO_CURSOR
#include <Libkdepim/KCursorSaver>
#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);
}
......
......@@ -3,14 +3,14 @@
#include "kmkernel.h"
#include "settings/kmailsettings.h"
#include <Libkdepim/BroadcastStatus>
#include <PimCommon/BroadcastStatus>
#include "job/opencomposerjob.h"
#include "job/newmessagejob.h"
#include "job/opencomposerhiddenjob.h"
#include "job/fillcomposerjob.h"
#include <AkonadiSearch/PIM/indexeditems.h>
#include <LibkdepimAkonadi/ProgressManagerAkonadi>
using KPIM::BroadcastStatus;
using PimCommon::BroadcastStatus;
#include "kmmainwin.h"
#include "editor/composer.h"
#include "kmreadermainwin.h"
......
......@@ -106,7 +106,7 @@
// LIBKDEPIM includes
#include <Libkdepim/ProgressManager>
#include <Libkdepim/BroadcastStatus>
#include <PimCommon/BroadcastStatus>
// KDEPIMLIBS includes
#include <AkonadiCore/AgentManager>
......@@ -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;
......
......@@ -22,7 +22,7 @@
#include "kmmainwidget.h"
#include <Libkdepim/ProgressStatusBarWidget>
#include <Libkdepim/StatusbarProgressWidget>
#include <Libkdepim/BroadcastStatus>
#include <PimCommon/BroadcastStatus>
#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());
......
......@@ -34,7 +34,7 @@
#include <LibkdepimAkonadi/AddEmailAddressJob>
#include <LibkdepimAkonadi/OpenEmailAddressJob>
#include <LibkdepimAkonadi/AddEmailDisplayJob>
#include <Libkdepim/BroadcastStatus>
#include <PimCommon/BroadcastStatus>
#include "kmcommands.h"
#include <MailCommon/SendMdnHandler>
#include <QVBoxLayout>
......@@ -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
......
......@@ -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)
......
......@@ -25,8 +25,8 @@
#include "summaryview_part.h"
#include "dropwidget.h"
#include <Libkdepim/BroadcastStatus>
using KPIM::BroadcastStatus;
#include <PimCommon/BroadcastStatus>
using PimCommon::BroadcastStatus;
#include <KIdentityManagement/Identity>
#include <KIdentityManagement/IdentityManager>
......@@ -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);
......
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