diff --git a/src/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp b/src/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp index 9003f4d..17bde7d 100644 --- a/src/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp +++ b/src/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp @@ -1,150 +1,150 @@ /* Copyright (C) 2013-2019 Laurent Montel This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "sieveaction.h" #include "libksieve_debug.h" #include #include #include #include "autocreatescripts/sieveeditorgraphicalmodewidget.h" using namespace KSieveUi; SieveAction::SieveAction(SieveEditorGraphicalModeWidget *sieveGraphicalModeWidget, const QString &name, const QString &label, QObject *parent) : QObject(parent) , mSieveGraphicalModeWidget(sieveGraphicalModeWidget) , mName(name) , mLabel(label) { } SieveAction::~SieveAction() { } KSieveUi::SieveImapAccountSettings SieveAction::sieveImapAccountSettings() const { if (mSieveGraphicalModeWidget) { return mSieveGraphicalModeWidget->sieveImapAccountSettings(); } qCWarning(LIBKSIEVE_LOG) << "SieveAction::sieveImapAccountSettings Problem during initialize mSieveGraphicalModeWidget "; return {}; } QStringList SieveAction::listOfIncludeFile() const { if (mSieveGraphicalModeWidget) { return mSieveGraphicalModeWidget->listOfIncludeFile(); } qCWarning(LIBKSIEVE_LOG) << "SieveAction::listOfIncludeFile Problem during initialize mSieveGraphicalModeWidget "; return {}; } QStringList SieveAction::sieveCapabilities() const { if (mSieveGraphicalModeWidget) { return mSieveGraphicalModeWidget->sieveCapabilities(); } qCWarning(LIBKSIEVE_LOG) << "SieveAction::sieveCapabilities Problem during initialize mSieveGraphicalModeWidget "; return {}; } QString SieveAction::name() const { return mName; } QString SieveAction::label() const { return mLabel; } QWidget *SieveAction::createParamWidget(QWidget *parent) const { return new QWidget(parent); } QString SieveAction::code(QWidget *) const { return QString(); } QStringList SieveAction::needRequires(QWidget *parent) const { Q_UNUSED(parent); return QStringList(); } bool SieveAction::needCheckIfServerHasCapability() const { return false; } QString SieveAction::serverNeedsCapability() const { return QString(); } QString SieveAction::help() const { return QString(); } bool SieveAction::setParamWidgetValue(QXmlStreamReader &n, QWidget *, QString &) { n.skipCurrentElement(); return true; } QString SieveAction::comment() const { return mComment; } void SieveAction::setComment(const QString &comment) { mComment = comment; } void SieveAction::unknownTag(const QStringRef &tag, QString &error) { error += i18n("An unknown tag \"%1\" was found during parsing action \"%2\".", *tag.string(), name()) + QLatin1Char('\n'); } void SieveAction::unknownTagValue(const QString &tagValue, QString &error) { error += i18n("An unknown tag value \"%1\" was found during parsing action \"%2\".", tagValue, name()) + QLatin1Char('\n'); } void SieveAction::tooManyArguments(const QStringRef &tagName, int index, int maxValue, QString &error) { - error += i18n("Too many argument found for \"%1\", max value is %2, number of value found %3 for %4", name(), maxValue, index, *tagName.string()) + QLatin1Char('\n'); + error += i18n("Too many arguments found for \"%1\", max value is %2, number of value found %3 for %4", name(), maxValue, index, *tagName.string()) + QLatin1Char('\n'); } void SieveAction::serverDoesNotSupportFeatures(const QString &feature, QString &error) { error += i18n("A feature \"%1\" in condition \"%2\" is not supported by server", feature, name()) + QLatin1Char('\n'); } QUrl SieveAction::href() const { return QUrl(); } diff --git a/src/ksieveui/editor/warningwidget/sieveeditorparsingmissingfeaturewarning.cpp b/src/ksieveui/editor/warningwidget/sieveeditorparsingmissingfeaturewarning.cpp index b5e306c..98af4d8 100644 --- a/src/ksieveui/editor/warningwidget/sieveeditorparsingmissingfeaturewarning.cpp +++ b/src/ksieveui/editor/warningwidget/sieveeditorparsingmissingfeaturewarning.cpp @@ -1,106 +1,106 @@ /* Copyright (C) 2013-2019 Laurent Montel This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "sieveeditorparsingmissingfeaturewarning.h" #include "autocreatescripts/sievescriptparsingerrordialog.h" #include #include #include using namespace KSieveUi; SieveEditorParsingMissingFeatureWarning::SieveEditorParsingMissingFeatureWarning(TextEditorType type, QWidget *parent) : KMessageWidget(parent) { setVisible(false); setCloseButtonVisible(false); setMessageType(Error); setText(i18n("Some errors were found during parsing. (Details...)")); connect(this, &SieveEditorParsingMissingFeatureWarning::linkActivated, this, &SieveEditorParsingMissingFeatureWarning::slotShowDetails); switch (type) { case TextEditor: { - QAction *action = new QAction(i18n("Switch in graphical mode"), this); + QAction *action = new QAction(i18n("Switch to Graphical Mode"), this); connect(action, &QAction::triggered, this, &SieveEditorParsingMissingFeatureWarning::slotSwitchInGraphicalMode); addAction(action); - action = new QAction(i18n("Keep in text mode"), this); + action = new QAction(i18n("Stay in Text Mode"), this); connect(action, &QAction::triggered, this, &SieveEditorParsingMissingFeatureWarning::slotInActualMode); addAction(action); break; } case GraphicEditor: { - QAction *action = new QAction(i18n("Switch in text mode"), this); + QAction *action = new QAction(i18n("Switch to Text Mode"), this); connect(action, &QAction::triggered, this, &SieveEditorParsingMissingFeatureWarning::slotSwitchInTextMode); addAction(action); - action = new QAction(i18n("Keep in Graphical mode"), this); + action = new QAction(i18n("Stay in Graphical Mode"), this); connect(action, &QAction::triggered, this, &SieveEditorParsingMissingFeatureWarning::slotInActualMode); addAction(action); break; } } setWordWrap(true); } SieveEditorParsingMissingFeatureWarning::~SieveEditorParsingMissingFeatureWarning() { } QString SieveEditorParsingMissingFeatureWarning::initialScript() const { return mScript; } void SieveEditorParsingMissingFeatureWarning::slotShowDetails(const QString &content) { if (content == QLatin1String("sieveerrordetails")) { QPointer dlg = new SieveScriptParsingErrorDialog(this); dlg->setError(mScript, mErrors); dlg->exec(); delete dlg; } } void SieveEditorParsingMissingFeatureWarning::setErrors(const QString &initialScript, const QString &errors) { mErrors = errors; mScript = initialScript; } void SieveEditorParsingMissingFeatureWarning::slotSwitchInTextMode() { Q_EMIT switchToTextMode(); setVisible(false); } void SieveEditorParsingMissingFeatureWarning::slotSwitchInGraphicalMode() { Q_EMIT switchToGraphicalMode(); setVisible(false); } void SieveEditorParsingMissingFeatureWarning::slotInActualMode() { setVisible(false); } diff --git a/src/ksieveui/managescriptsjob/parseuserscriptjob.cpp b/src/ksieveui/managescriptsjob/parseuserscriptjob.cpp index bfe348d..5d4148f 100644 --- a/src/ksieveui/managescriptsjob/parseuserscriptjob.cpp +++ b/src/ksieveui/managescriptsjob/parseuserscriptjob.cpp @@ -1,170 +1,170 @@ /* Copyright (C) 2013-2019 Laurent Montel 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 "parseuserscriptjob.h" #include "ksieveui/scriptsparsing/parsingutil.h" #include #include #include using namespace KSieveUi; ParseUserScriptJob::ParseUserScriptJob(const QUrl &url, QObject *parent) : QObject(parent) , mCurrentUrl(url) { } ParseUserScriptJob::~ParseUserScriptJob() { kill(); delete mStreamReader; } void ParseUserScriptJob::kill() { if (mSieveJob) { mSieveJob->kill(); } mSieveJob = nullptr; } QUrl ParseUserScriptJob::scriptUrl() const { return mCurrentUrl; } void ParseUserScriptJob::start() { if (mCurrentUrl.isEmpty()) { emitError(i18n("Path is not specified.")); return; } if (mSieveJob) { mSieveJob->kill(); } mActiveScripts = QStringList(); mError = QString(); mSieveJob = KManageSieve::SieveJob::get(mCurrentUrl); connect(mSieveJob, &KManageSieve::SieveJob::result, this, &ParseUserScriptJob::slotGetResult); } void ParseUserScriptJob::setAutoDelete(bool deleteMe) { mAutoDelete = deleteMe; } void ParseUserScriptJob::slotGetResult(KManageSieve::SieveJob *job, bool success, const QString &script, bool) { mSieveJob = nullptr; if (!success) { emitError(i18n("Retrieving the script failed.\n" "The server responded:\n%1", job->errorString())); return; } if (script.isEmpty()) { emitError(i18n("Script is empty. (%1)", mCurrentUrl.fileName())); return; } bool result; const QStringList lst = parsescript(script, result); if (result) { emitSuccess(lst); } else { - emitError(i18n("Script parsing error")); + emitError(i18n("Script parsing error.")); } } void ParseUserScriptJob::emitError(const QString &msgError) { mError = msgError; Q_EMIT finished(this); if (mAutoDelete) { deleteLater(); } } void ParseUserScriptJob::emitSuccess(const QStringList &activeScriptList) { mActiveScripts = activeScriptList; Q_EMIT finished(this); if (mAutoDelete) { deleteLater(); } } QStringList ParseUserScriptJob::parsescript(const QString &script, bool &result) { QStringList lst; const QString doc = ParsingUtil::parseScript(script, result); if (result) { lst = extractActiveScript(doc); } return lst; } QStringList ParseUserScriptJob::activeScriptList() const { return mActiveScripts; } QString ParseUserScriptJob::error() const { return mError; } QStringList ParseUserScriptJob::extractActiveScript(const QString &doc) { mStreamReader = new QXmlStreamReader(doc); QStringList lstScript; if (mStreamReader->readNextStartElement()) { while (mStreamReader->readNextStartElement()) { const QStringRef tagname = mStreamReader->name(); if (tagname == QLatin1String("action")) { if (mStreamReader->attributes().hasAttribute(QLatin1String("name"))) { const QString actionName = mStreamReader->attributes().value(QLatin1String("name")).toString(); if (actionName == QLatin1String("include")) { //Load includes const QString str = loadInclude(); if (!str.isEmpty()) { if (!lstScript.contains(str)) { lstScript.append(str); } } } else { mStreamReader->skipCurrentElement(); } } } else { mStreamReader->skipCurrentElement(); } } } return lstScript; } QString ParseUserScriptJob::loadInclude() { QString scriptName; while (mStreamReader->readNextStartElement()) { if (mStreamReader->name() == QLatin1String("str")) { scriptName = mStreamReader->readElementText(); } else { mStreamReader->skipCurrentElement(); } } return scriptName; } diff --git a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp index c4a666a..59f2749 100644 --- a/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp +++ b/src/ksieveui/sievescriptdebugger/sievescriptdebuggerfrontendwidget.cpp @@ -1,234 +1,234 @@ /* Copyright (C) 2015-2019 Laurent Montel This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This library 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 Library General Public License for more details. You should have received a copy of the GNU Library General Public License along with this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "sievescriptdebuggerfrontendwidget.h" #include "sievescriptdebuggertextedit.h" #include "sievescriptdebuggerwarning.h" #include "sievescriptdebuggerresulteditor.h" #include #include #include #include #include #include #include #include "editor/sievetexteditwidget.h" #include "editor/sievetextedit.h" #include #include #include #include #include #include #include using namespace KSieveUi; SieveScriptDebuggerFrontEndWidget::SieveScriptDebuggerFrontEndWidget(QWidget *parent) : QWidget(parent) { QVBoxLayout *mainLayout = new QVBoxLayout(this); mainLayout->setContentsMargins(0, 0, 0, 0); QFormLayout *formLayout = new QFormLayout; mainLayout->addLayout(formLayout); QLabel *emailLab = new QLabel(i18n("Email path:"), this); emailLab->setObjectName(QStringLiteral("emaillab")); mEmailPath = new KUrlRequester(this); mEmailPath->setObjectName(QStringLiteral("emailpath")); mEmailPath->lineEdit()->setTrapReturnKey(true); mEmailPath->lineEdit()->setClearButtonEnabled(true); connect(mEmailPath->lineEdit(), &KLineEdit::textChanged, this, &SieveScriptDebuggerFrontEndWidget::slotEmailChanged); formLayout->addRow(emailLab, mEmailPath); QHBoxLayout *extensionLayout = new QHBoxLayout; mainLayout->addLayout(extensionLayout); QLabel *extensionLab = new QLabel(i18n("Extension:")); extensionLab->setObjectName(QStringLiteral("extensionlab")); mExtension = new KLineEdit(this); mExtension->setObjectName(QStringLiteral("extension")); mExtension->setPlaceholderText(i18n("Activate extension with \"+\", deactivate it with \"-\"")); mExtension->setClearButtonEnabled(true); mExtension->setTrapReturnKey(true); formLayout->addRow(extensionLab, mExtension); mSplitter = new QSplitter(Qt::Vertical); mSplitter->setObjectName(QStringLiteral("splitter")); mainLayout->addWidget(mSplitter); QWidget *sieveEditorWidget = new QWidget(this); QVBoxLayout *vboxSieveEditorLayout = new QVBoxLayout; sieveEditorWidget->setLayout(vboxSieveEditorLayout); vboxSieveEditorLayout->setContentsMargins(0, 0, 0, 0); KPIMTextEdit::TextToSpeechWidget *textToSpeechWidget = new KPIMTextEdit::TextToSpeechWidget(this); textToSpeechWidget->setObjectName(QStringLiteral("texttospeechwidget")); vboxSieveEditorLayout->addWidget(textToSpeechWidget); KSieveUi::SieveScriptDebuggerTextEdit *textEdit = new KSieveUi::SieveScriptDebuggerTextEdit(this); connect(textEdit, &KSieveUi::SieveScriptDebuggerTextEdit::textChanged, this, &SieveScriptDebuggerFrontEndWidget::slotScriptTextChanged); mSieveTextEditWidget = new KSieveUi::SieveTextEditWidget(textEdit, this); mSieveTextEditWidget->setObjectName(QStringLiteral("sievetexteditwidget")); vboxSieveEditorLayout->addWidget(mSieveTextEditWidget); connect(mSieveTextEditWidget->textEdit(), &SieveTextEdit::say, textToSpeechWidget, &KPIMTextEdit::TextToSpeechWidget::say); mSplitter->addWidget(sieveEditorWidget); mSplitter->setChildrenCollapsible(false); mSieveTestResult = new KPIMTextEdit::PlainTextEditorWidget(new KSieveUi::SieveScriptDebuggerResultEditor(this), this); mSieveTestResult->setObjectName(QStringLiteral("sievetextresult")); mSieveTestResult->editor()->setPlaceholderText(i18n("Display check script result...")); mSieveTestResult->setReadOnly(true); mSplitter->addWidget(mSieveTestResult); mSieveScriptDebuggerWarning = new KSieveUi::SieveScriptDebuggerWarning(this); mSieveScriptDebuggerWarning->setObjectName(QStringLiteral("sievescriptdebuggerwarning")); mainLayout->addWidget(mSieveScriptDebuggerWarning); connect(this, &SieveScriptDebuggerFrontEndWidget::debugScriptButtonClicked, this, &SieveScriptDebuggerFrontEndWidget::slotDebugScript); } SieveScriptDebuggerFrontEndWidget::~SieveScriptDebuggerFrontEndWidget() { disconnect(mSieveTextEditWidget->textEdit(), &KSieveUi::SieveScriptDebuggerTextEdit::textChanged, this, &SieveScriptDebuggerFrontEndWidget::slotScriptTextChanged); } void SieveScriptDebuggerFrontEndWidget::updateDebugButton() { Q_EMIT debugButtonEnabled(!mSieveTextEditWidget->textEdit()->document()->isEmpty() && !mEmailPath->lineEdit()->text().trimmed().isEmpty()); } void SieveScriptDebuggerFrontEndWidget::slotScriptTextChanged() { updateDebugButton(); Q_EMIT scriptTextChanged(); } void SieveScriptDebuggerFrontEndWidget::setSplitterSizes(const QList &sizes) { mSplitter->setSizes(sizes); } QList SieveScriptDebuggerFrontEndWidget::splitterSizes() const { return mSplitter->sizes(); } void SieveScriptDebuggerFrontEndWidget::slotEmailChanged(const QString &text) { Q_UNUSED(text); updateDebugButton(); } void SieveScriptDebuggerFrontEndWidget::slotDebugScript() { if (mSieveTextEditWidget->textEdit()->toPlainText().trimmed().isEmpty()) { mSieveScriptDebuggerWarning->setErrorMessage(i18n("Script text is empty.")); return; } if (!mEmailPath->url().isLocalFile()) { mSieveScriptDebuggerWarning->setWarningMessage(i18n("Email file must be installed locally.")); return; } QTemporaryFile *temporaryFile = new QTemporaryFile(); if (!temporaryFile->open()) { - mSieveScriptDebuggerWarning->setErrorMessage(i18n("Impossible to open temporary file.")); + mSieveScriptDebuggerWarning->setErrorMessage(i18n("Failed to open temporary file.")); delete temporaryFile; return; } Q_EMIT debugButtonEnabled(false); QTextStream stream(temporaryFile); stream << mSieveTextEditWidget->textEdit()->toPlainText(); temporaryFile->flush(); mProcess = new QProcess(this); temporaryFile->setParent(mProcess); QString extensionList; if (!mExtension->text().trimmed().isEmpty()) { extensionList = QStringLiteral("-x \"%1\"").arg(mExtension->text()); } QStringList arguments; if (!extensionList.isEmpty()) { arguments << extensionList; } arguments << temporaryFile->fileName() << mEmailPath->url().toLocalFile(); mProcess->start(QStringLiteral("sieve-test"), QStringList() << arguments); connect(mProcess, &QProcess::readyReadStandardOutput, this, &SieveScriptDebuggerFrontEndWidget::slotReadStandardOutput); connect(mProcess, &QProcess::readyReadStandardError, this, &SieveScriptDebuggerFrontEndWidget::slotReadErrorOutput); connect(mProcess, QOverload::of(&QProcess::finished), this, &SieveScriptDebuggerFrontEndWidget::slotDebugFinished); mSieveTestResult->editor()->appendPlainText(QStringLiteral("--------------------------------------")); mSieveTestResult->editor()->appendPlainText(QLocale().toString(QDateTime::currentDateTime())); mSieveTestResult->editor()->appendPlainText(QStringLiteral("\n")); if (!mProcess->waitForStarted()) { delete mProcess; mProcess = nullptr; Q_EMIT debugButtonEnabled(true); } } void SieveScriptDebuggerFrontEndWidget::slotReadStandardOutput() { const QByteArray result = mProcess->readAllStandardOutput(); mSieveTestResult->editor()->appendPlainText(QString::fromLocal8Bit(result)); } void SieveScriptDebuggerFrontEndWidget::slotReadErrorOutput() { const QByteArray result = mProcess->readAllStandardError(); mSieveTestResult->editor()->appendPlainText(QString::fromLocal8Bit(result)); } void SieveScriptDebuggerFrontEndWidget::slotDebugFinished() { delete mProcess; mProcess = nullptr; Q_EMIT debugButtonEnabled(true); } QString SieveScriptDebuggerFrontEndWidget::script() const { return mSieveTextEditWidget->textEdit()->toPlainText(); } void SieveScriptDebuggerFrontEndWidget::setScript(const QString &script) { mSieveTextEditWidget->textEdit()->setPlainText(script); mSieveTextEditWidget->textEdit()->verticalScrollBar()->setValue(mSieveTextEditWidget->textEdit()->verticalScrollBar()->maximum()); } bool SieveScriptDebuggerFrontEndWidget::canAccept() const { const QString script = mSieveTextEditWidget->textEdit()->toPlainText(); if (script.contains(QLatin1String("debug_log")) || script.contains(QLatin1String("vnd.dovecot.debug"))) { mSieveScriptDebuggerWarning->setErrorMessage(i18n("Script still contains debug method. Remove it please.")); return false; } mSieveScriptDebuggerWarning->hide(); return true; }