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
0c2099db
Commit
0c2099db
authored
Jun 21, 2021
by
Laurent Montel
😁
Browse files
USe MailMergeConfigureDialog
parent
a9ef6de2
Changes
1
Hide whitespace changes
Inline
Side-by-side
agents/mailmergeagent/mailmergeagent.cpp
View file @
0c2099db
...
...
@@ -8,6 +8,7 @@
#include "mailmergeagent_debug.h"
#include "mailmergeagentadaptor.h"
#include "mailmergeagentsettings.h"
#include "mailmergeconfiguredialog.h"
#include "mailmergemanager.h"
#include <AgentInstance>
#include <AgentManager>
...
...
@@ -117,23 +118,24 @@ bool MailMergeAgent::enabledAgent() const
void
MailMergeAgent
::
configure
(
WId
windowId
)
{
//
QPointer<
SendLater
ConfigureDialog> dialog = new
SendLater
ConfigureDialog();
//
if (windowId) {
//
dialog->setAttribute(Qt::WA_NativeWindow, true);
//
KWindowSystem::setMainWindow(dialog->windowHandle(), windowId);
//
}
// connect(this, &MailMergeAgent::needUpdateConfigDialogBox, dialog.data(), &
SendLater
ConfigureDialog::slotNeedToReloadConfig);
QPointer
<
MailMerge
ConfigureDialog
>
dialog
=
new
MailMerge
ConfigureDialog
();
if
(
windowId
)
{
dialog
->
setAttribute
(
Qt
::
WA_NativeWindow
,
true
);
KWindowSystem
::
setMainWindow
(
dialog
->
windowHandle
(),
windowId
);
}
// connect(this, &MailMergeAgent::needUpdateConfigDialogBox, dialog.data(), &
MailMerge
ConfigureDialog::slotNeedToReloadConfig);
// connect(dialog.data(), &SendLaterConfigureDialog::sendNow, this, &MailMergeAgent::slotSendNow);
// if (dialog->exec()) {
// mManager->load();
// const QVector<Akonadi::Item::Id> listMessage = dialog->messagesToRemove();
// if (!listMessage.isEmpty()) {
// // Will delete in specific job when done.
// auto sendlaterremovejob = new SendLaterRemoveMessageJob(listMessage, this);
// sendlaterremovejob->start();
// }
// }
// delete dialog;
if
(
dialog
->
exec
())
{
// TODO
// mManager->load();
// const QVector<Akonadi::Item::Id> listMessage = dialog->messagesToRemove();
// if (!listMessage.isEmpty()) {
// // Will delete in specific job when done.
// auto sendlaterremovejob = new SendLaterRemoveMessageJob(listMessage, this);
// sendlaterremovejob->start();
// }
}
delete
dialog
;
}
void
MailMergeAgent
::
removeItem
(
qint64
item
)
...
...
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