[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] libksieve/ksieveui/autocreatescripts: Start to implement list support
From: Montel Laurent <montel () kde ! org>
Date: 2013-05-31 17:49:46
Message-ID: 20130531174946.3AFDFA6067 () git ! kde ! org
[Download RAW message or body]
Git commit f8fc451b3a17a72df32459d6e4cc1ee16757c9d0 by Montel Laurent.
Committed on 31/05/2013 at 17:12.
Pushed by mlaurent into branch 'master'.
Start to implement list support
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstracteditheader.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstracteditheader.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.h
M +11 -5 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.h
M +25 -3 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp
M +2 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.cpp
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.h
M +1 -1 libksieve/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
http://commits.kde.org/kdepim/f8fc451b3a17a72df32459d6e4cc1ee16757c9d0
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp index 17f5cba..fc9d748 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.cpp
@@ -55,7 +55,7 @@ QString SieveAction::code(QWidget *) const
return QString();
}
-QStringList SieveAction::needRequires() const
+QStringList SieveAction::needRequires(QWidget *parent) const
{
return QStringList();
}
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.h \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.h index c4546d5..4911792 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.h
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveaction.h
@@ -38,7 +38,7 @@ public:
virtual QWidget *createParamWidget( QWidget *parent ) const;
virtual QString code( QWidget *) const;
- virtual QStringList needRequires() const;
+ virtual QStringList needRequires(QWidget *parent) const;
virtual bool needCheckIfServerHasCapability() const;
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstracteditheader.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstracteditheader.cpp index \
1416421..c3b4c20 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstracteditheader.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstracteditheader.cpp
@@ -24,7 +24,7 @@ SieveActionAbstractEditHeader::SieveActionAbstractEditHeader(const QString &name
{
}
-QStringList SieveActionAbstractEditHeader::needRequires() const
+QStringList SieveActionAbstractEditHeader::needRequires(QWidget *parent) const
{
return QStringList() <<QLatin1String("editheader");
}
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstracteditheader.h \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstracteditheader.h index \
b4a28c1..d74f51a 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstracteditheader.h
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstracteditheader.h
@@ -27,7 +27,7 @@ class SieveActionAbstractEditHeader : public SieveAction
public:
SieveActionAbstractEditHeader(const QString &name, const QString &label, QObject *parent = 0);
- QStringList needRequires() const;
+ QStringList needRequires(QWidget *parent) const;
bool needCheckIfServerHasCapability() const;
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.cpp index 91fe376..92dfebc \
100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.cpp
@@ -48,7 +48,7 @@ QString SieveActionAbstractFlags::code(QWidget *w) const
return str + QLatin1Char(' ') + flagCode;
}
-QStringList SieveActionAbstractFlags::needRequires() const
+QStringList SieveActionAbstractFlags::needRequires(QWidget *parent) const
{
return QStringList() <<QLatin1String("imapflags");
}
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.h \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.h index 23ab48a..6a84a7d \
100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.h
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionabstractflags.h
@@ -28,7 +28,7 @@ public:
QWidget *createParamWidget( QWidget *parent ) const;
QString code(QWidget *) const;
- QStringList needRequires() const;
+ QStringList needRequires(QWidget *parent) const;
virtual QString flagsCode() const = 0;
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.cpp index a854b74..cb3ba25 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.cpp
@@ -66,7 +66,7 @@ QString SieveActionBreak::help() const
return i18n("The break command terminates the closest enclosing loop.");
}
-QStringList SieveActionBreak::needRequires() const
+QStringList SieveActionBreak::needRequires(QWidget */*parent*/) const
{
return QStringList() << QLatin1String("foreverypart");
}
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.h \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.h index 3ebd2fd..0187322 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.h
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionbreak.h
@@ -28,7 +28,7 @@ public:
static SieveAction* newAction();
QString code(QWidget *) const;
QString help() const;
- QStringList needRequires() const;
+ QStringList needRequires(QWidget *parent) const;
bool needCheckIfServerHasCapability() const;
QString serverNeedsCapability() const;
QWidget *createParamWidget( QWidget *parent ) const;
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp index 78a113c..da69221 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.cpp
@@ -89,7 +89,7 @@ QString SieveActionConvert::code(QWidget *w) const
}
-QStringList SieveActionConvert::needRequires() const
+QStringList SieveActionConvert::needRequires(QWidget *parent) const
{
return QStringList() << QLatin1String("convert");
}
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.h \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.h index 625a2fd..11ecbaf 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.h
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionconvert.h
@@ -29,7 +29,7 @@ public:
static SieveAction* newAction();
QString code(QWidget *) const;
QWidget *createParamWidget( QWidget *parent ) const;
- QStringList needRequires() const;
+ QStringList needRequires(QWidget *parent) const;
bool needCheckIfServerHasCapability() const;
QString serverNeedsCapability() const;
QString help() const;
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.cpp index eb41e1e..ce96618 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.cpp
@@ -95,7 +95,7 @@ QString SieveActionEnclose::code(QWidget *w) const
}
-QStringList SieveActionEnclose::needRequires() const
+QStringList SieveActionEnclose::needRequires(QWidget *parent) const
{
return QStringList() << QLatin1String("enclose");
}
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.h \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.h index f8e1d4b..c8ca711 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.h
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionenclose.h
@@ -28,7 +28,7 @@ public:
static SieveAction* newAction();
QString code(QWidget *) const;
QWidget *createParamWidget( QWidget *parent ) const;
- QStringList needRequires() const;
+ QStringList needRequires(QWidget *parent) const;
bool needCheckIfServerHasCapability() const;
QString serverNeedsCapability() const;
QString help() const;
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp index 04094de..7f132c5 \
100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp
@@ -75,7 +75,7 @@ QString SieveActionExtractText::code(QWidget *w) const
}
-QStringList SieveActionExtractText::needRequires() const
+QStringList SieveActionExtractText::needRequires(QWidget *parent) const
{
return QStringList() << QLatin1String("extracttext");
}
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.h \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.h index cc5e463..9d6a404 \
100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.h
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.h
@@ -29,7 +29,7 @@ public:
static SieveAction* newAction();
QWidget *createParamWidget( QWidget *parent ) const;
QString code(QWidget *) const;
- QStringList needRequires() const;
+ QStringList needRequires(QWidget *parent) const;
bool needCheckIfServerHasCapability() const;
QString serverNeedsCapability() const;
QString help() const;
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.cpp index d9dd684..6b46015 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.cpp
@@ -80,14 +80,20 @@ QWidget *SieveActionFileInto::createParamWidget( QWidget *parent ) const
return w;
}
-QStringList SieveActionFileInto::needRequires() const
+QStringList SieveActionFileInto::needRequires(QWidget *parent) const
{
QStringList lst;
lst << QLatin1String("fileinto");
- if (mHasCopySupport)
- lst << QLatin1String("copy");
- if (mHasMailBoxSupport)
- lst << QLatin1String("mailbox");
+ if (mHasCopySupport) {
+ const QCheckBox *create = parent->findChild<QCheckBox*>( QLatin1String("copy") );
+ if (create->isChecked())
+ lst << QLatin1String("copy");
+ }
+ if (mHasMailBoxSupport) {
+ const QCheckBox *create = parent->findChild<QCheckBox*>( QLatin1String("create") );
+ if (create->isChecked())
+ lst << QLatin1String("mailbox");
+ }
return lst;
}
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.h \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.h index 2957c99..703a207 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.h
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionfileinto.h
@@ -29,7 +29,7 @@ public:
static SieveAction* newAction();
QString code(QWidget *) const;
QWidget *createParamWidget( QWidget *parent ) const;
- QStringList needRequires() const;
+ QStringList needRequires(QWidget *parent) const;
bool needCheckIfServerHasCapability() const;
QString serverNeedsCapability() const;
QString help() const;
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp index 523a769..a39dd1f 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp
@@ -31,6 +31,7 @@ SieveActionRedirect::SieveActionRedirect(QObject *parent)
: SieveAction(QLatin1String("redirect"), i18n("Redirect"), parent)
{
mHasCopySupport = AutoCreateScriptDialog::sieveCapabilities().contains(QLatin1String("copy"));
+ mHasListSupport = AutoCreateScriptDialog::sieveCapabilities().contains(QLatin1String("extlists"));
}
SieveAction *SieveActionRedirect::newAction()
@@ -49,6 +50,11 @@ QWidget *SieveActionRedirect::createParamWidget( QWidget *parent ) const
copy->setObjectName(QLatin1String("copy"));
lay->addWidget(copy);
}
+ if (mHasListSupport) {
+ QCheckBox *list = new QCheckBox(i18n("Use list"));
+ list->setObjectName(QLatin1String("list"));
+ lay->addWidget(list);
+ }
AddressLineEdit *edit = new AddressLineEdit;
edit->setObjectName(QLatin1String("RedirectEdit"));
lay->addWidget(edit);
@@ -66,20 +72,36 @@ QString SieveActionRedirect::code(QWidget *w) const
if (copy->isChecked())
result += QLatin1String(":copy ");
}
+
+ if (mHasListSupport) {
+ const QCheckBox *list = w->findChild<QCheckBox*>( QLatin1String("list") );
+ if (list->isChecked())
+ result += QLatin1String(":list ");
+ }
+
return result + QString::fromLatin1("\"%1\";").arg(text);
}
-QStringList SieveActionRedirect::needRequires() const
+QStringList SieveActionRedirect::needRequires(QWidget *parent) const
{
+ QStringList lst;
if (mHasCopySupport) {
- return QStringList() <<QLatin1String("copy");
+ const QCheckBox *copy = parent->findChild<QCheckBox*>( QLatin1String("copy") );
+ if (copy->isChecked())
+ lst <<QLatin1String("copy");
+ }
+ if (mHasListSupport) {
+ const QCheckBox *list = parent->findChild<QCheckBox*>( QLatin1String("list") );
+ if (list->isChecked())
+ lst <<QLatin1String("extlists");
}
- return QStringList();
+ return lst;
}
QString SieveActionRedirect::help() const
{
//TODO add copy info
+ //TODO add list info
return i18n("The \"redirect\" action is used to send the message to another user at a supplied \
address, as a mail forwarding feature does. The \"redirect\" action makes no changes to the message body \
or existing headers, but it may add new headers."); }
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.h \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.h index 7d4d325..72b9e8e 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.h
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.h
@@ -31,11 +31,12 @@ public:
QWidget *createParamWidget( QWidget *parent ) const;
QString code(QWidget *) const;
- QStringList needRequires() const;
+ QStringList needRequires(QWidget *parent) const;
QString help() const;
private:
bool mHasCopySupport;
+ bool mHasListSupport;
};
}
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp index 22c3032..e989024 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp
@@ -58,7 +58,7 @@ QString SieveActionReject::code(QWidget *w) const
return QString::fromLatin1("reject text:%1;").arg(AutoCreateScriptUtil::createMultiLine(text));
}
-QStringList SieveActionReject::needRequires() const
+QStringList SieveActionReject::needRequires(QWidget *) const
{
return QStringList() <<QLatin1String("reject");
}
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.h \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.h index 141c560..475428f 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.h
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.h
@@ -30,7 +30,7 @@ public:
QWidget *createParamWidget( QWidget *parent ) const;
QString code(QWidget *) const;
- QStringList needRequires() const;
+ QStringList needRequires(QWidget *parent) const;
bool needCheckIfServerHasCapability() const;
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.cpp index ef3517b..879ea22 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.cpp
@@ -94,7 +94,7 @@ QString SieveActionReplace::code(QWidget *w) const
}
-QStringList SieveActionReplace::needRequires() const
+QStringList SieveActionReplace::needRequires(QWidget *) const
{
return QStringList() << QLatin1String("replace");
}
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.h \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.h index 91b6650..70739b4 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.h
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreplace.h
@@ -29,7 +29,7 @@ public:
static SieveAction* newAction();
QString code(QWidget *) const;
QWidget *createParamWidget( QWidget *parent ) const;
- QStringList needRequires() const;
+ QStringList needRequires(QWidget *parent) const;
bool needCheckIfServerHasCapability() const;
QString serverNeedsCapability() const;
QString help() const;
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp index 3ab0cf9..55fdf8f \
100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.cpp
@@ -85,7 +85,7 @@ QString SieveActionSetVariable::code(QWidget *w) const
return result;
}
-QStringList SieveActionSetVariable::needRequires() const
+QStringList SieveActionSetVariable::needRequires(QWidget *) const
{
return QStringList() << QLatin1String("variables");
}
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.h \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.h index 8ee3cb1..a899c28 \
100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.h
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionsetvariable.h
@@ -28,7 +28,7 @@ public:
static SieveAction* newAction();
QString code(QWidget *) const;
QString help() const;
- QStringList needRequires() const;
+ QStringList needRequires(QWidget *parent) const;
bool needCheckIfServerHasCapability() const;
QString serverNeedsCapability() const;
QWidget *createParamWidget( QWidget *parent ) const;
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.cpp index 8195f0e..04f5fb7 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.cpp
@@ -133,7 +133,7 @@ bool SieveActionVacation::needCheckIfServerHasCapability() const
return true;
}
-QStringList SieveActionVacation::needRequires() const
+QStringList SieveActionVacation::needRequires(QWidget *) const
{
QStringList lst;
if (mHasVacationSecondsSupport) {
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.h \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.h index 523f36f..d5ea9d1 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.h
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionvacation.h
@@ -32,7 +32,7 @@ public:
QString code(QWidget *) const;
QString serverNeedsCapability() const;
bool needCheckIfServerHasCapability() const;
- QStringList needRequires() const;
+ QStringList needRequires(QWidget *parent) const;
QString help() const;
private:
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp index 1bdb5c2..766610c 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactionwidgetlister.cpp
@@ -69,7 +69,7 @@ void SieveActionWidget::generatedScript(QString &script, QStringList &requires)
if (index != mComboBox->count()-1) {
KSieveUi::SieveAction *widgetAction = mActionList.at(mComboBox->currentIndex());
QWidget *currentWidget = mLayout->itemAtPosition( 1, 2 )->widget();
- const QStringList lstRequires = widgetAction->needRequires();
+ const QStringList lstRequires = widgetAction->needRequires(currentWidget);
Q_FOREACH (const QString &r, lstRequires) {
if (!requires.contains(r)) {
requires.append(r);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic