Differential D29723 Diff 82813 src/editor/kmcomposerwin.cpp

Changeset View

Standalone View

View Options

src/editor/kmcomposerwin.cpp

Show First 20 Lines • Show All 141 Lines • ▼ Show 20 Line(s)
142#include <MimeTreeParser/ObjectTreeParser> 142​#include <MimeTreeParser/ObjectTreeParser>
143#include <MimeTreeParser/SimpleObjectTreeSource> 143​#include <MimeTreeParser/SimpleObjectTreeSource>
144 144​
145#include <PimCommon/CustomToolsWidgetng> 145​#include <PimCommon/CustomToolsWidgetng>
146#include <PimCommon/KActionMenuChangeCase> 146​#include <PimCommon/KActionMenuChangeCase>
147#include <PimCommon/LineEditWithAutoCorrection> 147​#include <PimCommon/LineEditWithAutoCorrection>
148#include <PimCommon/CustomToolsPluginManager> 148​#include <PimCommon/CustomToolsPluginManager>
149 149​
150#include <SendLater/SendLaterDialog> 150​#include <MessageComposer/SendLaterDialog>
151#include <SendLater/SendLaterInfo> 151​#include <MessageComposer/SendLaterInfo>
152#include <SendLater/SendLaterUtil> 152​#include <MessageComposer/SendLaterUtil>
153 153​
154#include <TemplateParser/TemplateParserJob> 154​#include <TemplateParser/TemplateParserJob>
155#include <TemplateParser/TemplatesConfiguration> 155​#include <TemplateParser/TemplatesConfiguration>
156 156​
157#include <QGpgME/Protocol> 157​#include <QGpgME/Protocol>
158#include <QGpgME/ExportJob> 158​#include <QGpgME/ExportJob>
159#include <QGpgME/KeyForMailboxJob> 159​#include <QGpgME/KeyForMailboxJob>
160 160​
▲ Show 20 Lines • Show All 2477 Lines • ▼ Show 20 Line(s)2621{
2638 if (method == MessageComposer::MessageSender::SendImmediate) { 2638​ if (method == MessageComposer::MessageSender::SendImmediate) {
2639 if (!MessageComposer::Util::sendMailDispatcherIsOnline()) { 2639​ if (!MessageComposer::Util::sendMailDispatcherIsOnline()) {
2640 method = MessageComposer::MessageSender::SendLater; 2640​ method = MessageComposer::MessageSender::SendLater;
2641 } 2641​ }
2642 if (KMailSettings::self()->enabledUndoSend()) { 2642​ if (KMailSettings::self()->enabledUndoSend()) {
2643 mComposerBase->setSendLaterInfo(nullptr); 2643​ mComposerBase->setSendLaterInfo(nullptr);
2644 const bool wasRegistered = sendLaterRegistered(); 2644​ const bool wasRegistered = sendLaterRegistered();
2645 if (wasRegistered) { 2645​ if (wasRegistered) {
2646 SendLater::SendLaterInfo *info = new SendLater::SendLaterInfo; 2646​ auto info = new MessageComposer::SendLaterInfo;
2647 info->setRecurrence(false); 2647​ info->setRecurrence(false);
2648 info->setSubject(subject()); 2648​ info->setSubject(subject());
2649 info->setDateTime(QDateTime::currentDateTime().addSecs(KMailSettings::self()->undoSendDelay())); 2649​ info->setDateTime(QDateTime::currentDateTime().addSecs(KMailSettings::self()->undoSendDelay()));
2650 mComposerBase->setSendLaterInfo(info); 2650​ mComposerBase->setSendLaterInfo(info);
2651 } 2651​ }
2652 method = MessageComposer::MessageSender::SendLater; 2652​ method = MessageComposer::MessageSender::SendLater;
2653 willSendItWithoutReediting = true; 2653​ willSendItWithoutReediting = true;
2654 saveIn = MessageComposer::MessageSender::SaveInOutbox; 2654​ saveIn = MessageComposer::MessageSender::SaveInOutbox;
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Line(s)2794#endif
2818 } 2818​ }
2819 2819​
2820 mComposerBase->setCustomHeader(customHeader); 2820​ mComposerBase->setCustomHeader(customHeader);
2821 mComposerBase->send(method, saveIn, false); 2821​ mComposerBase->send(method, saveIn, false);
2822} 2822​}
2823 2823​
2824bool KMComposerWin::sendLaterRegistered() const 2824​bool KMComposerWin::sendLaterRegistered() const
2825{ 2825​{
2826 return SendLater::SendLaterUtil::sentLaterAgentWasRegistered() && SendLater::SendLaterUtil::sentLaterAgentEnabled(); 2826​ return MessageComposer::SendLaterUtil::sentLaterAgentWasRegistered()
2827​ && MessageComposer::SendLaterUtil::sentLaterAgentEnabled();
2827} 2828​}
2828 2829​
2829void KMComposerWin::slotSendLater() 2830​void KMComposerWin::slotSendLater()
2830{ 2831​{
2831 if (!TransportManager::self()->showTransportCreationDialog(this, TransportManager::IfNoTransportExists)) { 2832​ if (!TransportManager::self()->showTransportCreationDialog(this, TransportManager::IfNoTransportExists)) {
2832 return; 2833​ return;
2833 } 2834​ }
2834 if (!checkRecipientNumber()) { 2835​ if (!checkRecipientNumber()) {
2835 return; 2836​ return;
2836 } 2837​ }
2837 mComposerBase->setSendLaterInfo(nullptr); 2838​ mComposerBase->setSendLaterInfo(nullptr);
2838 if (mComposerBase->editor()->checkExternalEditorFinished()) { 2839​ if (mComposerBase->editor()->checkExternalEditorFinished()) {
2839 const bool wasRegistered = sendLaterRegistered(); 2840​ const bool wasRegistered = sendLaterRegistered();
2840 if (wasRegistered) { 2841​ if (wasRegistered) {
2841 SendLater::SendLaterInfo *info = nullptr; 2842​ MessageComposer::SendLaterInfo *info = nullptr;
2842 QPointer<SendLater::SendLaterDialog> dlg = new SendLater::SendLaterDialog(info, this); 2843​ QPointer<MessageComposer::SendLaterDialog> dlg = new MessageComposer::SendLaterDialog(info, this);
2843 if (dlg->exec()) { 2844​ if (dlg->exec()) {
2844 info = dlg->info(); 2845​ info = dlg->info();
2845 const SendLater::SendLaterDialog::SendLaterAction action = dlg->action(); 2846​ const MessageComposer::SendLaterDialog::SendLaterAction action = dlg->action();
2846 delete dlg; 2847​ delete dlg;
2847 switch (action) { 2848​ switch (action) {
2848 case SendLater::SendLaterDialog::Unknown: 2849​ case MessageComposer::SendLaterDialog::Unknown:
2849 qCDebug(KMAIL_LOG) << "Sendlater action \"Unknown\": Need to fix it."; 2850​ qCDebug(KMAIL_LOG) << "Sendlater action \"Unknown\": Need to fix it.";
2850 break; 2851​ break;
2851 case SendLater::SendLaterDialog::Canceled: 2852​ case MessageComposer::SendLaterDialog::Canceled:
2852 return; 2853​ return;
2853 break; 2854​ break;
2854 case SendLater::SendLaterDialog::PutInOutbox: 2855​ case MessageComposer::SendLaterDialog::PutInOutbox:
2855 doSend(MessageComposer::MessageSender::SendLater); 2856​ doSend(MessageComposer::MessageSender::SendLater);
2856 break; 2857​ break;
2857 case SendLater::SendLaterDialog::SendDeliveryAtTime: 2858​ case MessageComposer::SendLaterDialog::SendDeliveryAtTime:
2858 mComposerBase->setSendLaterInfo(info); 2859​ mComposerBase->setSendLaterInfo(info);
2859 if (info->isRecurrence()) { 2860​ if (info->isRecurrence()) {
2860 doSend(MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInTemplates, true); 2861​ doSend(MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInTemplates, true);
2861 } else { 2862​ } else {
2862 doSend(MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInDrafts, true); 2863​ doSend(MessageComposer::MessageSender::SendLater, MessageComposer::MessageSender::SaveInDrafts, true);
2863 } 2864​ }
2864 break; 2865​ break;
2865 } 2866​ }
▲ Show 20 Lines • Show All 920 Lines • Show Last 20 Lines