diff --git a/libksieve/src/ksieveui/vacation/vacation.cpp b/libksieve/src/ksieveui/vacation/vacation.cpp index 41b5f8ed3b..8a50b972e5 100644 --- a/libksieve/src/ksieveui/vacation/vacation.cpp +++ b/libksieve/src/ksieveui/vacation/vacation.cpp @@ -1,247 +1,254 @@ /* -*- c++ -*- vacation.cpp KMail, the KDE mail client. Copyright (c) 2002 Marc Mutz This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, as published by the Free Software Foundation. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ #include "vacation.h" #include "vacationutils.h" #include "vacationscriptextractor.h" #include "sieve-vacation.h" #include "util/util.h" #include "vacationdialog.h" #include #include #include "libksieve_debug.h" #include #include #include #include using namespace KSieveUi; Vacation::Vacation(QObject *parent, bool checkOnly, const QUrl &url) : QObject(parent), mSieveJob(Q_NULLPTR), mDialog(Q_NULLPTR), mWasActive(false), mCheckOnly(checkOnly) { if (url.isEmpty()) { mUrl = findURL(mServerName); } else { mUrl = url; } qCDebug(LIBKSIEVE_LOG) << "Vacation: found url \"" << mUrl.toDisplayString() << "\""; if (mUrl.isEmpty()) { // nothing to do... return; } mSieveJob = KManageSieve::SieveJob::get(mUrl); if (checkOnly) { mSieveJob->setInteractive(false); } connect(mSieveJob, &KManageSieve::SieveJob::gotScript, this, &Vacation::slotGetResult); } Vacation::~Vacation() { if (mSieveJob) { mSieveJob->kill(); } mSieveJob = Q_NULLPTR; delete mDialog; mDialog = Q_NULLPTR; qCDebug(LIBKSIEVE_LOG) << "~Vacation()"; } bool Vacation::isUsable() const { return !mUrl.isEmpty(); } QString Vacation::serverName() const { return mServerName; } QUrl Vacation::findURL(QString &serverName) const { const Akonadi::AgentInstance::List instances = Util::imapAgentInstances(); foreach(const Akonadi::AgentInstance &instance, instances) { if (instance.status() == Akonadi::AgentInstance::Broken) { continue; } const QUrl url = Util::findSieveUrlForAccount(instance.identifier()); if (!url.isEmpty()) { serverName = instance.name(); return url; } } return QUrl(); } void Vacation::slotGetResult(KManageSieve::SieveJob *job, bool success, const QString &script, bool active) { qCDebug(LIBKSIEVE_LOG) << success << ", ?," << active << ")" << endl << "script:" << endl << script; mSieveJob = Q_NULLPTR; // job deletes itself after returning from this slot! if (!mCheckOnly && mUrl.scheme() == QLatin1String("sieve") && !job->sieveCapabilities().contains(QStringLiteral("vacation"))) { KMessageBox::sorry(Q_NULLPTR, i18n("Your server did not list \"vacation\" in " "its list of supported Sieve extensions;\n" "without it, KMail cannot install out-of-" "office replies for you.\n" "Please contact your system administrator.")); Q_EMIT result(false); return; } const bool supportsDate = job->sieveCapabilities().contains(QStringLiteral("date")); if (!mDialog && !mCheckOnly) { mDialog = new VacationDialog(i18n("Configure \"Out of Office\" Replies"), Q_NULLPTR, false); } if (!success) { active = false; // default to inactive } KSieveUi::VacationUtils::Vacation vacation = KSieveUi::VacationUtils::parseScript(script); if (!mCheckOnly && (!success || (!vacation.isValid() && !script.trimmed().isEmpty()))) { KMessageBox::information(Q_NULLPTR, i18n("Someone (probably you) changed the " "vacation script on the server.\n" "KMail is no longer able to determine " "the parameters for the autoreplies.\n" "Default values will be used.")); } mWasActive = active; if (mDialog) { mDialog->setActivateVacation(active && vacation.active); + mDialog->setMailAction(vacation.mailAction, vacation.mailActionRecipient); mDialog->setSubject(vacation.subject); mDialog->setMessageText(vacation.messageText); mDialog->setNotificationInterval(vacation.notificationInterval); mDialog->setMailAliases(vacation.aliases); mDialog->setSendForSpam(vacation.sendForSpam); mDialog->setDomainName(vacation.excludeDomain); mDialog->enableDomainAndSendForSpam(!VacationSettings::allowOutOfOfficeUploadButNoSettings()); mDialog->enableDates(supportsDate); if (supportsDate) { mDialog->setStartDate(vacation.startDate); + mDialog->setStartTime(vacation.startTime); mDialog->setEndDate(vacation.endDate); + mDialog->setEndTime(vacation.endTime); } connect(mDialog, &VacationDialog::okClicked, this, &Vacation::slotDialogOk); connect(mDialog, &VacationDialog::cancelClicked, this, &Vacation::slotDialogCancel); mDialog->show(); } Q_EMIT scriptActive(mWasActive, mServerName); if (mCheckOnly && mWasActive) { if (KMessageBox::questionYesNo(Q_NULLPTR, i18n("There is still an active out-of-office reply configured.\n" "Do you want to edit it?"), i18n("Out-of-office reply still active"), KGuiItem(i18n("Edit"), QStringLiteral("document-properties")), KGuiItem(i18n("Ignore"), QStringLiteral("dialog-cancel"))) == KMessageBox::Yes) { Q_EMIT requestEditVacation(); } } } void Vacation::slotDialogOk() { qCDebug(LIBKSIEVE_LOG); // compose a new script: const bool active = mDialog->activateVacation(); VacationUtils::Vacation vacation; vacation.valid = true; vacation.active = active; vacation.messageText = mDialog->messageText(); vacation.subject = mDialog->subject(); + vacation.mailAction = mDialog->mailAction(); + vacation.mailActionRecipient = mDialog->mailActionRecipient(); vacation.notificationInterval = mDialog->notificationInterval(); vacation.aliases = mDialog->mailAliases(); vacation.sendForSpam = mDialog->sendForSpam(); vacation.excludeDomain = mDialog->domainName(); vacation.startDate = mDialog->startDate(); + vacation.startTime = mDialog->startTime(); vacation.endDate = mDialog->endDate(); + vacation.endTime = mDialog->endTime(); const QString script = VacationUtils::composeScript(vacation); emit scriptActive(active, mServerName); qCDebug(LIBKSIEVE_LOG) << "script:" << endl << script; // and commit the dialog's settings to the server: mSieveJob = KManageSieve::SieveJob::put(mUrl, script, active, mWasActive); if (active) { connect(mSieveJob, &KManageSieve::SieveJob::gotScript, this, &Vacation::slotPutActiveResult); } else { connect(mSieveJob, &KManageSieve::SieveJob::gotScript, this, &Vacation::slotPutInactiveResult); } // destroy the dialog: //mDialog->delayedDestruct(); mDialog->hide(); mDialog->deleteLater(); mDialog = Q_NULLPTR; } void Vacation::slotDialogCancel() { qCDebug(LIBKSIEVE_LOG); mDialog->hide(); mDialog->deleteLater(); mDialog = Q_NULLPTR; Q_EMIT result(false); } void Vacation::slotPutActiveResult(KManageSieve::SieveJob *job, bool success) { handlePutResult(job, success, true); } void Vacation::slotPutInactiveResult(KManageSieve::SieveJob *job, bool success) { handlePutResult(job, success, false); } void Vacation::handlePutResult(KManageSieve::SieveJob *, bool success, bool activated) { if (success) KMessageBox::information(Q_NULLPTR, activated ? i18n("Sieve script installed successfully on the server.\n" "Out of Office reply is now active.") : i18n("Sieve script installed successfully on the server.\n" "Out of Office reply has been deactivated.")); qCDebug(LIBKSIEVE_LOG) << "( ???," << success << ", ? )"; mSieveJob = Q_NULLPTR; // job deletes itself after returning from this slot! Q_EMIT result(success); Q_EMIT scriptActive(activated, mServerName); } void Vacation::showVacationDialog() { if (mDialog) { mDialog->show(); mDialog->raise(); mDialog->activateWindow(); } } diff --git a/libksieve/src/ksieveui/vacation/vacationdialog.cpp b/libksieve/src/ksieveui/vacation/vacationdialog.cpp index 65161810fe..a605bc2f0b 100644 --- a/libksieve/src/ksieveui/vacation/vacationdialog.cpp +++ b/libksieve/src/ksieveui/vacation/vacationdialog.cpp @@ -1,219 +1,254 @@ /* vacationdialog.cpp Copyright (c) 2013-2015 Montel Laurent Copyright (c) 2002 Marc Mutz This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, as published by the Free Software Foundation. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ #include "vacationdialog.h" #include "vacationeditwidget.h" #include "libksieve_debug.h" #include #include #include #include #include #include #include #include #include #include using KMime::Types::AddrSpecList; using namespace KSieveUi; VacationDialog::VacationDialog(const QString &caption, QWidget *parent, bool modal) : QDialog(parent) { setWindowTitle(caption); QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults); QVBoxLayout *mainLayout = new QVBoxLayout; setLayout(mainLayout); QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); okButton->setDefault(true); okButton->setShortcut(Qt::CTRL | Qt::Key_Return); connect(buttonBox, &QDialogButtonBox::accepted, this, &VacationDialog::slotAccepted); connect(buttonBox, &QDialogButtonBox::rejected, this, &VacationDialog::slotRejected); okButton->setDefault(true); setModal(modal); QWidget *w = new QWidget; QVBoxLayout *vbox = new QVBoxLayout; vbox->setMargin(0); w->setLayout(vbox); vbox->addWidget(mVacationEditWidget); mVacationEditWidget = new VacationEditWidget; KSeparator *separator = new KSeparator; vbox->addWidget(separator); mainLayout->addWidget(w); mainLayout->addWidget(buttonBox); KWindowSystem::setIcons(winId(), qApp->windowIcon().pixmap(IconSize(KIconLoader::Desktop), IconSize(KIconLoader::Desktop)), qApp->windowIcon().pixmap(IconSize(KIconLoader::Small), IconSize(KIconLoader::Small))); readConfig(); connect(buttonBox->button(QDialogButtonBox::RestoreDefaults), &QPushButton::clicked, this, &VacationDialog::slotDialogDefaults); } VacationDialog::~VacationDialog() { qCDebug(LIBKSIEVE_LOG) << "~VacationDialog()"; writeConfig(); } void VacationDialog::slotAccepted() { Q_EMIT okClicked(); } void VacationDialog::slotRejected() { Q_EMIT cancelClicked(); } void VacationDialog::writeConfig() { KConfigGroup group(KSharedConfig::openConfig(), "VacationDialog"); group.writeEntry("Size", size()); } void VacationDialog::readConfig() { KConfigGroup group(KSharedConfig::openConfig(), "VacationDialog"); const QSize size = group.readEntry("Size", QSize()); if (size.isValid()) { resize(size); } else { resize(sizeHint().width(), sizeHint().height()); } } bool VacationDialog::activateVacation() const { return mVacationEditWidget->activateVacation(); } void VacationDialog::setActivateVacation(bool activate) { mVacationEditWidget->setActivateVacation(activate); } QString VacationDialog::messageText() const { return mVacationEditWidget->messageText(); } void VacationDialog::setMessageText(const QString &text) { mVacationEditWidget->setMessageText(text); } QString VacationDialog::subject() const { return mVacationEditWidget->subject(); } void VacationDialog::setSubject(const QString &subject) { return mVacationEditWidget->setSubject(subject); } +VacationUtils::MailAction VacationDialog::mailAction() const +{ + return mVacationEditWidget->mailAction(); +} + +QString VacationDialog::mailActionRecipient() const +{ + return mVacationEditWidget->mailActionRecipient(); +} + +void VacationDialog::setMailAction(VacationUtils::MailAction action, const QString &recipient) +{ + mVacationEditWidget->setMailAction(action, recipient); +} + int VacationDialog::notificationInterval() const { return mVacationEditWidget->notificationInterval(); } void VacationDialog::setNotificationInterval(int days) { mVacationEditWidget->setNotificationInterval(days); } AddrSpecList VacationDialog::mailAliases() const { return mVacationEditWidget->mailAliases(); } void VacationDialog::setMailAliases(const AddrSpecList &aliases) { mVacationEditWidget->setMailAliases(aliases); } void VacationDialog::setMailAliases(const QString &aliases) { mVacationEditWidget->setMailAliases(aliases); } QString VacationDialog::domainName() const { return mVacationEditWidget->domainName(); } void VacationDialog::setDomainName(const QString &domain) { mVacationEditWidget->setDomainName(domain); } bool VacationDialog::domainCheck() const { return mVacationEditWidget->domainCheck(); } void VacationDialog::setDomainCheck(bool check) { mVacationEditWidget->setDomainCheck(check); } bool VacationDialog::sendForSpam() const { return mVacationEditWidget->sendForSpam(); } void VacationDialog::setSendForSpam(bool enable) { mVacationEditWidget->setSendForSpam(enable); } void VacationDialog::enableDomainAndSendForSpam(bool enable) { mVacationEditWidget->enableDomainAndSendForSpam(enable); } void VacationDialog::slotDialogDefaults() { mVacationEditWidget->setDefault(); } void VacationDialog::enableDates(bool enable) { mVacationEditWidget->enableDates(enable); } QDate VacationDialog::endDate() const { return mVacationEditWidget->endDate(); } void VacationDialog::setEndDate(const QDate &endDate) { mVacationEditWidget->setEndDate(endDate); } +QTime VacationDialog::endTime() const +{ + return mVacationEditWidget->endTime(); +} + +void VacationDialog::setEndTime(const QTime &endTime) +{ + mVacationEditWidget->setEndTime(endTime); +} + QDate VacationDialog::startDate() const { return mVacationEditWidget->startDate(); } void VacationDialog::setStartDate(const QDate &startDate) { mVacationEditWidget->setStartDate(startDate); } + +QTime VacationDialog::startTime() const +{ + return mVacationEditWidget->startTime(); +} + +void VacationDialog::setStartTime(const QTime &startTime) +{ + mVacationEditWidget->setStartTime(startTime); +} diff --git a/libksieve/src/ksieveui/vacation/vacationdialog.h b/libksieve/src/ksieveui/vacation/vacationdialog.h index b7e31d83cb..1d50eea441 100644 --- a/libksieve/src/ksieveui/vacation/vacationdialog.h +++ b/libksieve/src/ksieveui/vacation/vacationdialog.h @@ -1,95 +1,108 @@ /* -*- c++ -*- vacationdialog.h Copyright (c) 2002 Marc Mutz This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2.0, as published by the Free Software Foundation. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ #ifndef KSIEVE_KSIEVEUI_VACATIONDIALOG_H #define KSIEVE_KSIEVEUI_VACATIONDIALOG_H +#include "vacationutils.h" + #include template class QList; class QDate; +class QTime; namespace KMime { namespace Types { struct AddrSpec; typedef QVector AddrSpecList; } } namespace KSieveUi { class VacationEditWidget; class VacationDialog : public QDialog { Q_OBJECT public: explicit VacationDialog(const QString &caption, QWidget *parent = Q_NULLPTR, bool modal = true); ~VacationDialog(); void enableDomainAndSendForSpam(bool enable = true); void enableDates(bool enable = true); bool activateVacation() const; void setActivateVacation(bool activate); bool domainCheck() const; void setDomainCheck(bool check); QString messageText() const; void setMessageText(const QString &text); QString subject() const; void setSubject(const QString &subject); + VacationUtils::MailAction mailAction() const; + QString mailActionRecipient() const; + void setMailAction(KSieveUi::VacationUtils::MailAction action, const QString &recipient); + int notificationInterval() const; void setNotificationInterval(int days); KMime::Types::AddrSpecList mailAliases() const; void setMailAliases(const KMime::Types::AddrSpecList &aliases); void setMailAliases(const QString &aliases); QString domainName() const; void setDomainName(const QString &domain); bool sendForSpam() const; void setSendForSpam(bool enable); QDate startDate() const; void setStartDate(const QDate &startDate); + QTime startTime() const; + void setStartTime(const QTime &startTime); + QDate endDate() const; void setEndDate(const QDate &endDate); + QTime endTime() const; + void setEndTime(const QTime &endTime); + Q_SIGNALS: void okClicked(); void cancelClicked(); private Q_SLOTS: void slotDialogDefaults(); void slotAccepted(); void slotRejected(); private: void writeConfig(); void readConfig(); VacationEditWidget *mVacationEditWidget; }; } #endif diff --git a/libksieve/src/ksieveui/vacation/vacationeditwidget.cpp b/libksieve/src/ksieveui/vacation/vacationeditwidget.cpp index f273ce48b8..fe2c4b19e4 100644 --- a/libksieve/src/ksieveui/vacation/vacationeditwidget.cpp +++ b/libksieve/src/ksieveui/vacation/vacationeditwidget.cpp @@ -1,327 +1,438 @@ /* Copyright (c) 2013-2015 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "vacationeditwidget.h" #include "vacationutils.h" #include #include +#include #include #include #include +#include "libksieve_debug.h" #include #include #include #include #include +#include using KMime::Types::AddrSpecList; using KMime::Types::AddressList; using KMime::Types::MailboxList; using KMime::HeaderParsing::parseAddressList; using namespace KSieveUi; VacationEditWidget::VacationEditWidget(QWidget *parent) : QWidget(parent) { int row = -1; QGridLayout *glay = new QGridLayout(this); glay->setMargin(0); glay->setColumnStretch(1, 1); // explanation label: ++row; glay->addWidget(new QLabel(i18n("Configure vacation " "notifications to be sent:"), this), row, 0, 1, 2); // Activate checkbox: ++row; mActiveCheck = new QCheckBox(i18n("&Activate vacation notifications"), this); glay->addWidget(mActiveCheck, row, 0, 1, 2); // Message text edit: ++row; glay->setRowStretch(row, 1); mTextEdit = new KPIMTextEdit::PlainTextEditorWidget(this); mTextEdit->setObjectName(QStringLiteral("mTextEdit")); glay->addWidget(mTextEdit, row, 0, 1, 2); // Subject ++row; mSubject = new QLineEdit(this); mSubject->setObjectName(QStringLiteral("mSubject")); mSubject->setClearButtonEnabled(true); QLabel *tmpLabel = new QLabel(i18n("&Subject of the vacation mail:"), this); tmpLabel->setBuddy(mSubject); glay->addWidget(tmpLabel, row, 0); glay->addWidget(mSubject, row, 1); + QHBoxLayout *timeLayout = new QHBoxLayout(this); // Start date - ++row; mStartDate = new KDateComboBox(this); mStartDate->setObjectName(QStringLiteral("mStartDate")); mStartDate->setOptions(KDateComboBox::EditDate | KDateComboBox::SelectDate | KDateComboBox::DatePicker | KDateComboBox::DateKeywords); + + mStartTime = new KTimeComboBox(this); + mStartTime->setObjectName(QStringLiteral("mStartTime")); + mStartTime->setOptions(KTimeComboBox::EditTime | KTimeComboBox::SelectTime | KTimeComboBox::EditTime | KTimeComboBox::WarnOnInvalid); + mStartTime->setEnabled(false); // Disable by default - we need an extension to support this + + mStartTimeActive = new QCheckBox(this); + connect(mStartTimeActive, &QCheckBox::toggled, mStartTime, &KTimeComboBox::setEnabled); + + timeLayout->addWidget(mStartDate); + timeLayout->addWidget(mStartTimeActive); + timeLayout->addWidget(mStartTime); + + ++row; mStartDateLabel = new QLabel(i18n("&Start date:"), this); mStartDateLabel->setObjectName(QStringLiteral("mStartDateLabel")); mStartDateLabel->setBuddy(mStartDate); glay->addWidget(mStartDateLabel, row, 0); - glay->addWidget(mStartDate, row, 1); + glay->addLayout(timeLayout, row, 1); // End date - ++row; + timeLayout = new QHBoxLayout(this); + mEndDate = new KDateComboBox(this); mEndDate->setObjectName(QStringLiteral("mEndDate")); mEndDate->setOptions(KDateComboBox::EditDate | KDateComboBox::SelectDate | KDateComboBox::DatePicker | KDateComboBox::DateKeywords); + + mEndTime = new KTimeComboBox(this); + mEndTime->setObjectName(QStringLiteral("mEndTime")); + mEndTime->setOptions(KTimeComboBox::EditTime | KTimeComboBox::SelectTime | KTimeComboBox::EditTime | KTimeComboBox::WarnOnInvalid); + mEndTime->setEnabled(false); // Disable by default - we need an extension to support this + + mEndTimeActive = new QCheckBox(this); + connect(mEndTimeActive, &QCheckBox::toggled, mEndTime, &KTimeComboBox::setEnabled); + + timeLayout->addWidget(mEndDate); + timeLayout->addWidget(mEndTimeActive); + timeLayout->addWidget(mEndTime); + + ++row; mEndDateLabel = new QLabel(i18n("&End date:"), this); mEndDateLabel->setObjectName(QStringLiteral("mStartDateLabel")); mEndDateLabel->setBuddy(mEndDate); glay->addWidget(mEndDateLabel, row, 0); glay->addWidget(mEndDate, row, 1); // Hide the date edits by default - they must be enabled by caller when the // server supports this feature enableDates(false); // "Resent only after" spinbox and label: ++row; int defDayInterval = 7; //default day interval mIntervalSpin = new QSpinBox(this); mIntervalSpin->setMaximum(356); mIntervalSpin->setMinimum(1); mIntervalSpin->setSingleStep(1); mIntervalSpin->setValue(defDayInterval); mIntervalSpin->setObjectName(QStringLiteral("mIntervalSpin")); mIntervalSpin->setSuffix(i18np(" day", " days", defDayInterval)); connect(mIntervalSpin, static_cast(&QSpinBox::valueChanged), this, &VacationEditWidget::slotIntervalSpinChanged); QLabel *label = new QLabel(i18n("&Resend notification only after:"), this); label->setBuddy(mIntervalSpin); glay->addWidget(label, row, 0); glay->addWidget(mIntervalSpin, row, 1); // "Send responses for these addresses" lineedit and label: ++row; mMailAliasesEdit = new QLineEdit(this); mMailAliasesEdit->setObjectName(QStringLiteral("mMailAliasesEdit")); mMailAliasesEdit->setClearButtonEnabled(true); tmpLabel = new QLabel(i18n("&Send responses for these addresses:"), this); tmpLabel->setBuddy(mMailAliasesEdit); glay->addWidget(tmpLabel, row, 0); glay->addWidget(mMailAliasesEdit, row, 1); + // Action for incomming mails + mMailAction = new QComboBox(this); + for (int i = 0; i < 4; ++i) { + mMailAction->addItem(VacationUtils::mailAction((VacationUtils::MailAction) i)); + } + mMailAction->setObjectName(QStringLiteral("mMailAction")); + connect(mMailAction, static_cast(&QComboBox::currentIndexChanged), this, &VacationEditWidget::mailActionChanged); + + mMailActionRecipient = new QLineEdit(this); + mMailActionRecipient->setObjectName(QStringLiteral("mMailActionRecipient")); + mMailActionRecipient->setClearButtonEnabled(true); + mMailActionRecipient->setEnabled(false); + + QHBoxLayout *hLayout = new QHBoxLayout(this); + + hLayout->addWidget(mMailAction); + hLayout->addWidget(mMailActionRecipient); + + ++row; + tmpLabel = new QLabel(i18n("&Action for incomming mails:"), this); + tmpLabel->setBuddy(mMailAction); + glay->addWidget(tmpLabel, row, 0); + glay->addLayout(hLayout, row, 1); + // "Send responses also to SPAM mail" checkbox: ++row; mSpamCheck = new QCheckBox(i18n("Do not send vacation replies to spam messages"), this); mSpamCheck->setObjectName(QStringLiteral("mSpamCheck")); mSpamCheck->setChecked(true); glay->addWidget(mSpamCheck, row, 0, 1, 2); // domain checkbox and linedit: ++row; mDomainCheck = new QCheckBox(i18n("Only react to mail coming from domain"), this); mDomainCheck->setObjectName(QStringLiteral("mDomainCheck")); mDomainCheck->setChecked(false); mDomainEdit = new QLineEdit(this); mDomainEdit->setObjectName(QStringLiteral("mDomainEdit")); mDomainEdit->setClearButtonEnabled(true); mDomainEdit->setEnabled(false); mDomainEdit->setValidator(new QRegExpValidator(QRegExp(QLatin1String("[a-zA-Z0-9+-]+(?:\\.[a-zA-Z0-9+-]+)*")), mDomainEdit)); glay->addWidget(mDomainCheck, row, 0); glay->addWidget(mDomainEdit, row, 1); connect(mDomainCheck, &QCheckBox::toggled, mDomainEdit, &QLineEdit::setEnabled); } VacationEditWidget::~VacationEditWidget() { } bool VacationEditWidget::activateVacation() const { return mActiveCheck->isChecked(); } void VacationEditWidget::setActivateVacation(bool activate) { mActiveCheck->setChecked(activate); } QString VacationEditWidget::messageText() const { return mTextEdit->toPlainText().trimmed(); } void VacationEditWidget::setMessageText(const QString &text) { mTextEdit->setPlainText(text); const int height = (mTextEdit->fontMetrics().lineSpacing() + 1) * 11; mTextEdit->setMinimumHeight(height); } int VacationEditWidget::notificationInterval() const { return mIntervalSpin->value(); } void VacationEditWidget::setNotificationInterval(int days) { mIntervalSpin->setValue(days); } AddrSpecList VacationEditWidget::mailAliases() const { QByteArray text = mMailAliasesEdit->text().toLatin1(); // ### IMAA: !ok AddressList al; const char *s = text.begin(); parseAddressList(s, text.end(), al); AddrSpecList asl; AddressList::const_iterator end(al.constEnd()); for (AddressList::const_iterator it = al.constBegin(); it != end; ++it) { const MailboxList &mbl = (*it).mailboxList; for (MailboxList::const_iterator jt = mbl.constBegin(); jt != mbl.constEnd(); ++jt) { asl.push_back((*jt).addrSpec()); } } return asl; } void VacationEditWidget::setMailAliases(const AddrSpecList &aliases) { QStringList sl; AddrSpecList::const_iterator end(aliases.constEnd()); for (AddrSpecList::const_iterator it = aliases.constBegin(); it != end; ++it) { sl.push_back((*it).asString()); } mMailAliasesEdit->setText(sl.join(QStringLiteral(", "))); } void VacationEditWidget::setMailAliases(const QString &aliases) { mMailAliasesEdit->setText(aliases); } void VacationEditWidget::slotIntervalSpinChanged(int value) { mIntervalSpin->setSuffix(i18np(" day", " days", value)); } QString VacationEditWidget::domainName() const { return mDomainCheck->isChecked() ? mDomainEdit->text() : QString(); } void VacationEditWidget::setDomainName(const QString &domain) { if (!domain.isEmpty()) { mDomainEdit->setText(domain); mDomainCheck->setChecked(true); } } bool VacationEditWidget::domainCheck() const { return mDomainCheck->isChecked(); } void VacationEditWidget::setDomainCheck(bool check) { mDomainCheck->setChecked(check); } bool VacationEditWidget::sendForSpam() const { return !mSpamCheck->isChecked(); } void VacationEditWidget::setSendForSpam(bool enable) { mSpamCheck->setChecked(!enable); } QDate VacationEditWidget::endDate() const { if (mEndDate->isEnabled()) { return mEndDate->date(); } else { return QDate(); } } void VacationEditWidget::setEndDate(const QDate &endDate) { mEndDate->setDate(endDate); } +QTime VacationEditWidget::endTime() const +{ + if (mEndTime->isEnabled()) { + return mEndTime->time(); + } else { + return QTime(); + } +} + +void VacationEditWidget::setEndTime(const QTime &endTime) +{ + mEndTimeActive->setChecked(endTime.isValid()); + mEndTime->setEnabled(endTime.isValid()); + mEndTime->setTime(endTime); +} + QDate VacationEditWidget::startDate() const { if (mStartDate->isEnabled()) { return mStartDate->date(); } else { return QDate(); } } void VacationEditWidget::setStartDate(const QDate &startDate) { mStartDate->setDate(startDate); } +QTime VacationEditWidget::startTime() const +{ + if (mStartTime->isEnabled()) { + return mStartTime->time(); + } else { + return QTime(); + } +} + +void VacationEditWidget::setStartTime(const QTime &startTime) +{ + mStartTimeActive->setChecked(startTime.isValid()); + mStartTime->setEnabled(startTime.isValid()); + mStartTime->setTime(startTime); +} + void VacationEditWidget::setSubject(const QString &subject) { mSubject->setText(subject); } QString VacationEditWidget::subject() const { if (mSubject->isEnabled()) { return mSubject->text(); } else { return QString(); } } void VacationEditWidget::enableDates(bool enable) { mStartDate->setVisible(enable); mStartDateLabel->setVisible(enable); mEndDate->setVisible(enable); mEndDateLabel->setVisible(enable); } +void VacationEditWidget::mailActionChanged(int action) +{ + bool enable = (action == VacationUtils::CopyTo || action == VacationUtils::Sendto); + mMailActionRecipient->setEnabled(enable); +} + +void VacationEditWidget::setMailAction(VacationUtils::MailAction action, const QString &recipient) +{ + mMailAction->setCurrentIndex(action); + mMailActionRecipient->setText(recipient); +} + +VacationUtils::MailAction VacationEditWidget::mailAction() const +{ + return static_cast(mMailAction->currentIndex()); +} + +QString VacationEditWidget::mailActionRecipient() const +{ + return mMailActionRecipient->text(); +} + void VacationEditWidget::enableDomainAndSendForSpam(bool enable) { mDomainCheck->setEnabled(enable); mDomainEdit->setEnabled(enable && mDomainCheck->isChecked()); mSpamCheck->setEnabled(enable); } void VacationEditWidget::setDefault() { setActivateVacation(true); setMessageText(VacationUtils::defaultMessageText()); setSubject(VacationUtils::defaultSubject()); setNotificationInterval(VacationUtils::defaultNotificationInterval()); setMailAliases(VacationUtils::defaultMailAliases()); setSendForSpam(VacationUtils::defaultSendForSpam()); setDomainName(VacationUtils::defaultDomainName()); + setMailAction(VacationUtils::defaultMailAction(), QString()); setDomainCheck(false); } diff --git a/libksieve/src/ksieveui/vacation/vacationeditwidget.h b/libksieve/src/ksieveui/vacation/vacationeditwidget.h index 1db6e654a2..8788fb88f3 100644 --- a/libksieve/src/ksieveui/vacation/vacationeditwidget.h +++ b/libksieve/src/ksieveui/vacation/vacationeditwidget.h @@ -1,110 +1,134 @@ /* Copyright (c) 2013-2015 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef VACATIONEDITWIDGET_H #define VACATIONEDITWIDGET_H #include +#include "vacationutils.h" +class KDateComboBox; +class KTimeComboBox; + +class QComboBox; +class QDate; +class QTime; class QLabel; class QSpinBox; class QLineEdit; class KDateComboBox; class QDate; namespace KPIMTextEdit { class PlainTextEditorWidget; } class QCheckBox; namespace KMime { namespace Types { struct AddrSpec; typedef QVector AddrSpecList; } } namespace KSieveUi { class VacationEditWidget : public QWidget { Q_OBJECT public: explicit VacationEditWidget(QWidget *parent = Q_NULLPTR); ~VacationEditWidget(); void enableDomainAndSendForSpam(bool enable = true); void enableDates(bool enable = true); bool activateVacation() const; void setActivateVacation(bool activate); bool domainCheck() const; void setDomainCheck(bool check); QString messageText() const; void setMessageText(const QString &text); int notificationInterval() const; void setNotificationInterval(int days); KMime::Types::AddrSpecList mailAliases() const; void setMailAliases(const KMime::Types::AddrSpecList &aliases); void setMailAliases(const QString &aliases); QString domainName() const; void setDomainName(const QString &domain); QString subject() const; void setSubject(const QString &subject); bool sendForSpam() const; void setSendForSpam(bool enable); QDate startDate() const; void setStartDate(const QDate &startDate); + QTime startTime() const; + void setStartTime(const QTime &startTime); + QDate endDate() const; void setEndDate(const QDate &endDate); + QTime endTime() const; + void setEndTime(const QTime &endTime); + + VacationUtils::MailAction mailAction() const; + QString mailActionRecipient() const; + void setMailAction(VacationUtils::MailAction action, const QString &recipient); + void setDefault(); private Q_SLOTS: void slotIntervalSpinChanged(int value); + void mailActionChanged(int index); protected: QCheckBox *mActiveCheck; QSpinBox *mIntervalSpin; QLineEdit *mMailAliasesEdit; KPIMTextEdit::PlainTextEditorWidget *mTextEdit; QCheckBox *mSpamCheck; QCheckBox *mDomainCheck; QLineEdit *mDomainEdit; QLineEdit *mSubject; + QComboBox *mMailAction; + QLineEdit *mMailActionRecipient; KDateComboBox *mStartDate; + KTimeComboBox *mStartTime; + QCheckBox *mStartTimeActive; QLabel *mStartDateLabel; KDateComboBox *mEndDate; + KTimeComboBox *mEndTime; + QCheckBox *mEndTimeActive; QLabel *mEndDateLabel; }; } #endif // VACATIONEDITWIDGET_H diff --git a/libksieve/src/ksieveui/vacation/vacationpagewidget.cpp b/libksieve/src/ksieveui/vacation/vacationpagewidget.cpp index c1eaab2e44..b5f0303b70 100644 --- a/libksieve/src/ksieveui/vacation/vacationpagewidget.cpp +++ b/libksieve/src/ksieveui/vacation/vacationpagewidget.cpp @@ -1,182 +1,189 @@ /* Copyright (c) 2013-2015 Montel Laurent This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License, version 2, as published by the Free Software Foundation. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "vacationpagewidget.h" #include "vacationeditwidget.h" #include "vacationwarningwidget.h" #include "vacationcreatescriptjob.h" #include "vacationutils.h" #include "multiimapvacationmanager.h" #include #include "sieve-vacation.h" #include #include #include "libksieve_debug.h" #include #include #include #include #include "libksieve_debug.h" using namespace KSieveUi; VacationPageWidget::VacationPageWidget(QWidget *parent) : QWidget(parent), mVacationManager(Q_NULLPTR), mPageScript(Script), mWasActive(false), mHasDateSupport(false) { QVBoxLayout *lay = new QVBoxLayout; lay->setMargin(0); mStackWidget = new QStackedWidget; lay->addWidget(mStackWidget); //Main Page QWidget *mainPage = new QWidget; QVBoxLayout *vbox = new QVBoxLayout; mainPage->setLayout(vbox); mVacationWarningWidget = new VacationWarningWidget; vbox->addWidget(mVacationWarningWidget); mVacationEditWidget = new VacationEditWidget; vbox->addWidget(mVacationEditWidget); mStackWidget->addWidget(mainPage); QWidget *w = new QWidget; vbox = new QVBoxLayout; QLabel *lab = new QLabel(i18n("Your server did not list \"vacation\" in " "its list of supported Sieve extensions;" "without it, KMail cannot install out-of-" "office replies for you." "Please contact your system administrator.")); QFont font = lab->font(); font.setBold(true); lab->setFont(font); vbox->addWidget(lab); vbox->setAlignment(lab, Qt::AlignVCenter); lab->setWordWrap(true); w->setLayout(vbox); mStackWidget->addWidget(w); mStackWidget->setCurrentIndex(Script); setLayout(lay); } VacationPageWidget::~VacationPageWidget() { } void VacationPageWidget::setServerUrl(const QUrl &url) { mUrl = url; mVacationEditWidget->setEnabled(false); } void VacationPageWidget::setVacationManager(MultiImapVacationManager *vacationManager) { mVacationManager = vacationManager; connect(mVacationManager, &MultiImapVacationManager::scriptAvailable, this, &VacationPageWidget::slotGetResult); mVacationManager->checkVacation(mServerName, mUrl); } void VacationPageWidget::setServerName(const QString &serverName) { mServerName = serverName; } void VacationPageWidget::slotGetResult(const QString &serverName, const QStringList &sieveCapabilities, const QString &scriptName, const QString &script, bool active) { if (mServerName != serverName) { return; } qCDebug(LIBKSIEVE_LOG) << serverName << sieveCapabilities << endl << scriptName << "(" << active << ")" << endl; if (mUrl.scheme() == QStringLiteral("sieve") && !sieveCapabilities.contains(QStringLiteral("vacation"))) { mStackWidget->setCurrentIndex(ScriptNotSupported); return; } mUrl = mUrl.adjusted(QUrl::RemoveFilename); mUrl.setPath(mUrl.path() + scriptName); // Whether the server supports the "date" extension const bool supportsSieveDate = mUrl.scheme() == QStringLiteral("sieve") && sieveCapabilities.contains(QStringLiteral("date")); KSieveUi::VacationUtils::Vacation vacation = KSieveUi::VacationUtils::parseScript(script); if (!vacation.isValid() && !script.trimmed().isEmpty()) { mVacationWarningWidget->setVisible(true); } mWasActive = active; mVacationEditWidget->setEnabled(true); mVacationEditWidget->setActivateVacation(active && vacation.active); mVacationEditWidget->setMessageText(vacation.messageText); mVacationEditWidget->setSubject(vacation.subject); + mVacationEditWidget->setMailAction(vacation.mailAction, vacation.mailActionRecipient); mVacationEditWidget->setNotificationInterval(vacation.notificationInterval); mVacationEditWidget->setMailAliases(vacation.aliases); mVacationEditWidget->setSendForSpam(vacation.sendForSpam); mVacationEditWidget->setDomainName(vacation.excludeDomain); mVacationEditWidget->enableDomainAndSendForSpam(!VacationSettings::allowOutOfOfficeUploadButNoSettings()); mVacationEditWidget->enableDates(supportsSieveDate); if (supportsSieveDate) { mVacationEditWidget->setStartDate(vacation.startDate); + mVacationEditWidget->setStartTime(vacation.startTime); mVacationEditWidget->setEndDate(vacation.endDate); + mVacationEditWidget->setEndTime(vacation.endTime); } } KSieveUi::VacationCreateScriptJob *VacationPageWidget::writeScript() { if (mPageScript == Script) { KSieveUi::VacationCreateScriptJob *createJob = new KSieveUi::VacationCreateScriptJob; createJob->setServerUrl(mUrl); createJob->setServerName(mServerName); const bool active = mVacationEditWidget->activateVacation(); VacationUtils::Vacation vacation; vacation.valid = true; vacation.active = active; vacation.messageText = mVacationEditWidget->messageText(); vacation.subject = mVacationEditWidget->subject(); + vacation.mailAction = mVacationEditWidget->mailAction(); + vacation.mailActionRecipient = mVacationEditWidget->mailActionRecipient(); vacation.notificationInterval = mVacationEditWidget->notificationInterval(); vacation.aliases = mVacationEditWidget->mailAliases(); vacation.sendForSpam = mVacationEditWidget->sendForSpam(); vacation.excludeDomain = mVacationEditWidget->domainName(); vacation.startDate = mVacationEditWidget->startDate(); + vacation.startTime = mVacationEditWidget->startTime(); vacation.endDate = mVacationEditWidget->endDate(); + vacation.endTime = mVacationEditWidget->endTime(); const QString script = VacationUtils::composeScript(vacation); createJob->setStatus(active, mWasActive); createJob->setScript(script); return createJob; } return Q_NULLPTR; } void VacationPageWidget::setDefault() { if (mVacationEditWidget->isEnabled()) { mVacationEditWidget->setDefault(); } }