Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
KMail
Commits
3b629b27
Commit
3b629b27
authored
Mar 17, 2021
by
Laurent Montel
😁
Browse files
Allow to configure mailmerge agent
parent
88df1a80
Pipeline
#54606
passed with stage
in 26 minutes and 22 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
agents/mailmergeagent/CMakeLists.txt
View file @
3b629b27
...
...
@@ -25,8 +25,6 @@ set(mailmergeagent_SRCS
qt5_add_dbus_adaptor
(
mailmergeagent_SRCS org.freedesktop.Akonadi.MailMergeAgent.xml mailmergeagent.h MailMergeAgent
)
#ki18n_wrap_ui(libsendlateragent_SRCS ui/sendlaterconfigurewidget.ui)
kconfig_add_kcfg_files
(
libmailmergeagent_SRCS mailmergeagentsettings.kcfgc
)
add_library
(
mailmergeagent STATIC
${
libmailmergeagent_SRCS
}
)
#if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
...
...
src/CMakeLists.txt
View file @
3b629b27
...
...
@@ -261,6 +261,10 @@ qt5_add_dbus_interfaces(kmailprivate_LIB_SRCS
../agents/sendlateragent/org.freedesktop.Akonadi.SendLaterAgent.xml
)
qt5_add_dbus_interfaces
(
kmailprivate_LIB_SRCS
../agents/mailmergeagent/org.freedesktop.Akonadi.MailMergeAgent.xml
)
qt5_add_dbus_interfaces
(
kmailprivate_LIB_SRCS
dbusinterface/org.freedesktop.Akonadi.NewMailNotifier.xml
)
...
...
src/kmlaunchexternalcomponent.cpp
View file @
3b629b27
...
...
@@ -11,6 +11,7 @@
#include "archivemailagentinterface.h"
#include "followupreminderinterface.h"
#include "mailmergeagentinterface.h"
#include "sendlateragentinterface.h"
#include "util.h"
#include <MailCommon/FilterManager>
...
...
@@ -50,6 +51,16 @@ void KMLaunchExternalComponent::slotConfigureSendLater()
}
}
void
KMLaunchExternalComponent
::
slotConfigureMailMerge
()
{
auto
agent
=
Akonadi
::
AgentManager
::
self
()
->
instance
(
QStringLiteral
(
"akonadi_mailmerge_agent"
));
if
(
agent
.
isValid
())
{
agent
.
configure
(
mParentWidget
);
}
else
{
KMessageBox
::
error
(
mParentWidget
,
i18n
(
"Mail Merge Agent was not registered."
));
}
}
void
KMLaunchExternalComponent
::
slotConfigureFollowupReminder
()
{
auto
agent
=
Akonadi
::
AgentManager
::
self
()
->
instance
(
QStringLiteral
(
"akonadi_followupreminder_agent"
));
...
...
src/kmlaunchexternalcomponent.h
View file @
3b629b27
...
...
@@ -16,6 +16,7 @@ public:
~
KMLaunchExternalComponent
()
override
;
public
Q_SLOTS
:
void
slotConfigureMailMerge
();
void
slotConfigureSendLater
();
void
slotConfigureAutomaticArchiving
();
void
slotConfigureFollowupReminder
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment