Allow to configure mailmerge agent

agents/mailmergeagent/CMakeLists.txt

@@ -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

@@ -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

@@ -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

@@ -16,6 +16,7 @@ public:
     ~KMLaunchExternalComponent() override;
 
 public Q_SLOTS:
+    void slotConfigureMailMerge();
     void slotConfigureSendLater();
     void slotConfigureAutomaticArchiving();
     void slotConfigureFollowupReminder();