[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim] libksieve/ksieveui: add more action
From: Montel Laurent <montel () kde ! org>
Date: 2013-04-05 17:37:11
Message-ID: 20130405173711.3ABCDA6059 () git ! kde ! org
[Download RAW message or body]
Git commit 75e3b3ed4019f4cfc66edf25e5971e8ecf5275d5 by Montel Laurent.
Committed on 05/04/2013 at 19:37.
Pushed by mlaurent into branch 'master'.
add more action
M +4 -1 libksieve/ksieveui/CMakeLists.txt
C +18 -16 libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.cpp \
[from: libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp - 054% \
similarity] C +12 -15 \
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.h [from: \
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp - 056% \
similarity] M +7 -0 \
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp C +26 -16 \
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp [from: \
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp - 054% \
similarity] C +16 -14 \
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.h [from: \
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp - 056% \
similarity] A +63 -0 \
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp [License: \
GPL (v2)] C +17 -15 \
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.h [from: \
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp - 056% \
similarity] [License: UNKNOWN] *
The files marked with a * at the end have a non valid license. Please read: \
http://techbase.kde.org/Policies/Licensing_Policy and use the headers which are \
listed at that page.
http://commits.kde.org/kdepim/75e3b3ed4019f4cfc66edf25e5971e8ecf5275d5
diff --git a/libksieve/ksieveui/CMakeLists.txt b/libksieve/ksieveui/CMakeLists.txt
index c882058..2a54a57 100644
--- a/libksieve/ksieveui/CMakeLists.txt
+++ b/libksieve/ksieveui/CMakeLists.txt
@@ -33,10 +33,13 @@ set(ksieveui_LIB_SRCS
autocreatescripts/sieveactions/sieveactionsetflags.cpp
autocreatescripts/sieveactions/sieveactionaddflags.cpp
autocreatescripts/sieveactions/sieveactionfileinto.cpp
+ autocreatescripts/sieveactions/sieveactionreject.cpp
+ autocreatescripts/sieveactions/sieveactionkeep.cpp
+ autocreatescripts/sieveactions/sieveactionredirect.cpp
autocreatescripts/sieveconditions/sievecondition.cpp
autocreatescripts/sieveconditions/sieveconditionheader.cpp
autocreatescripts/sieveconditions/sieveconditionlist.cpp
- autocreatescripts/sieveconditions/sieveconditionaddress.cpp
+ autocreatescripts/sieveconditions/sieveconditionaddress.cpp
)
kde4_add_kcfg_files(ksieveui_LIB_SRCS settings.kcfgc)
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.cpp similarity \
index 54% copy from libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp
copy to libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.cpp
index dc5e929..f754fe4 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.cpp
@@ -15,21 +15,23 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "sieveactionlist.h"
-#include "sieveaction.h"
-#include "sieveactiondiscard.h"
-#include "sieveactionsetflags.h"
-#include "sieveactionstop.h"
-#include "sieveactionaddflags.h"
-#include "sieveactionfileinto.h"
-
-QList<KSieveUi::SieveAction *> KSieveUi::SieveActionList::actionList()
+#include "sieveactionkeep.h"
+#include <KLocale>
+
+using namespace KSieveUi;
+SieveActionKeep::SieveActionKeep(QObject *parent)
+ : SieveAction(QLatin1String("keep"), i18n("Keep"), parent)
+{
+}
+
+SieveAction* SieveActionKeep::newAction()
{
- QList<KSieveUi::SieveAction*> list;
- list.append(new KSieveUi::SieveActionDiscard);
- list.append(new KSieveUi::SieveActionStop);
- list.append(new KSieveUi::SieveActionSetFlags);
- list.append(new KSieveUi::SieveActionAddFlags);
- list.append(new KSieveUi::SieveActionFileInto);
- return list;
+ return new SieveActionKeep;
}
+
+QString SieveActionKeep::code() const
+{
+ return QLatin1String("keep;");
+}
+
+#include "sieveactionkeep.moc"
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.h similarity \
index 56% copy from libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp
copy to libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.h
index dc5e929..455f398 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionkeep.h
@@ -15,21 +15,18 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "sieveactionlist.h"
+#ifndef SIEVEACTIONKEEP_H
+#define SIEVEACTIONKEEP_H
#include "sieveaction.h"
-#include "sieveactiondiscard.h"
-#include "sieveactionsetflags.h"
-#include "sieveactionstop.h"
-#include "sieveactionaddflags.h"
-#include "sieveactionfileinto.h"
-
-QList<KSieveUi::SieveAction *> KSieveUi::SieveActionList::actionList()
+namespace KSieveUi {
+class SieveActionKeep : public SieveAction
{
- QList<KSieveUi::SieveAction*> list;
- list.append(new KSieveUi::SieveActionDiscard);
- list.append(new KSieveUi::SieveActionStop);
- list.append(new KSieveUi::SieveActionSetFlags);
- list.append(new KSieveUi::SieveActionAddFlags);
- list.append(new KSieveUi::SieveActionFileInto);
- return list;
+ Q_OBJECT
+public:
+ SieveActionKeep(QObject *parent = 0);
+ static SieveAction* newAction();
+
+ QString code() const;
+};
}
+#endif // SIEVEACTIONKEEP_H
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp index \
dc5e929..ac1286f 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp
@@ -22,6 +22,9 @@
#include "sieveactionstop.h"
#include "sieveactionaddflags.h"
#include "sieveactionfileinto.h"
+#include "sieveactionreject.h"
+#include "sieveactionkeep.h"
+#include "sieveactionredirect.h"
QList<KSieveUi::SieveAction *> KSieveUi::SieveActionList::actionList()
{
@@ -31,5 +34,9 @@ QList<KSieveUi::SieveAction *> \
KSieveUi::SieveActionList::actionList() list.append(new \
KSieveUi::SieveActionSetFlags); list.append(new KSieveUi::SieveActionAddFlags);
list.append(new KSieveUi::SieveActionFileInto);
+ list.append(new KSieveUi::SieveActionReject);
+ list.append(new KSieveUi::SieveActionKeep);
+ list.append(new KSieveUi::SieveActionRedirect);
+
return list;
}
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp \
similarity index 54% copy from \
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp copy to \
libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp index \
dc5e929..0277e74 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp
@@ -15,21 +15,31 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "sieveactionlist.h"
-#include "sieveaction.h"
-#include "sieveactiondiscard.h"
-#include "sieveactionsetflags.h"
-#include "sieveactionstop.h"
-#include "sieveactionaddflags.h"
-#include "sieveactionfileinto.h"
-
-QList<KSieveUi::SieveAction *> KSieveUi::SieveActionList::actionList()
+#include "sieveactionredirect.h"
+
+#include <KLocale>
+
+using namespace KSieveUi;
+
+SieveActionRedirect::SieveActionRedirect(QObject *parent)
+ : SieveAction(QLatin1String("redirect"), i18n("Redirect"), parent)
{
- QList<KSieveUi::SieveAction*> list;
- list.append(new KSieveUi::SieveActionDiscard);
- list.append(new KSieveUi::SieveActionStop);
- list.append(new KSieveUi::SieveActionSetFlags);
- list.append(new KSieveUi::SieveActionAddFlags);
- list.append(new KSieveUi::SieveActionFileInto);
- return list;
}
+
+SieveAction *SieveActionRedirect::newAction()
+{
+ return new SieveActionRedirect;
+}
+
+QWidget *SieveActionRedirect::createParamWidget( QWidget *parent ) const
+{
+ //TODO
+ return 0;
+}
+
+QString SieveActionRedirect::code() const
+{
+ return QString(); //TODO
+}
+
+#include "sieveactionredirect.moc"
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.h similarity \
index 56% copy from libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp
copy to libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.h
index dc5e929..ecb2dd3 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionredirect.h
@@ -15,21 +15,23 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "sieveactionlist.h"
+#ifndef SIEVEACTIONREDIRECT_H
+#define SIEVEACTIONREDIRECT_H
+
#include "sieveaction.h"
-#include "sieveactiondiscard.h"
-#include "sieveactionsetflags.h"
-#include "sieveactionstop.h"
-#include "sieveactionaddflags.h"
-#include "sieveactionfileinto.h"
-QList<KSieveUi::SieveAction *> KSieveUi::SieveActionList::actionList()
+namespace KSieveUi {
+class SieveActionRedirect : public SieveAction
{
- QList<KSieveUi::SieveAction*> list;
- list.append(new KSieveUi::SieveActionDiscard);
- list.append(new KSieveUi::SieveActionStop);
- list.append(new KSieveUi::SieveActionSetFlags);
- list.append(new KSieveUi::SieveActionAddFlags);
- list.append(new KSieveUi::SieveActionFileInto);
- return list;
+ Q_OBJECT
+public:
+ SieveActionRedirect(QObject *parent = 0);
+
+ static SieveAction* newAction();
+
+ QWidget *createParamWidget( QWidget *parent ) const;
+ QString code() const;
+};
}
+
+#endif // SIEVEACTIONREDIRECT_H
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp new file \
mode 100644 index 0000000..a93ea0f
--- /dev/null
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.cpp
@@ -0,0 +1,63 @@
+/*
+ Copyright (c) 2013 Montel Laurent <montel@kde.org>
+
+ 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 "sieveactionreject.h"
+
+#include <KLineEdit>
+#include <KLocale>
+
+#include <QLabel>
+#include <QHBoxLayout>
+
+using namespace KSieveUi;
+SieveActionReject::SieveActionReject(QObject *parent)
+ : SieveAction(QLatin1String("reject"), i18n("Reject"), parent)
+{
+}
+
+SieveAction *SieveActionReject::newAction()
+{
+ return new SieveActionReject;
+}
+
+QWidget *SieveActionReject::createParamWidget( QWidget *parent ) const
+{
+ QWidget *w = new QWidget(parent);
+ QHBoxLayout *lay = new QHBoxLayout;
+ w->setLayout(lay);
+ QLabel *lab = new QLabel(i18n("text:"));
+ lay->addWidget(lab);
+
+ KLineEdit *edit = new KLineEdit;
+ edit->setObjectName( "RejectText" );
+ lay->addWidget(edit);
+ return w;
+}
+
+QString SieveActionReject::code() const
+{
+ //TODO
+ return QString::fromLatin1(" reject %1\n").arg("foo");
+}
+
+QStringList SieveActionReject::needRequires() const
+{
+ return QStringList() <<QLatin1String("reject");
+}
+
+
+#include "sieveactionreject.moc"
diff --git a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp \
b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.h similarity \
index 56% copy from libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp
copy to libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.h
index dc5e929..c5cac44 100644
--- a/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionlist.cpp
+++ b/libksieve/ksieveui/autocreatescripts/sieveactions/sieveactionreject.h
@@ -15,21 +15,23 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#include "sieveactionlist.h"
-#include "sieveaction.h"
-#include "sieveactiondiscard.h"
-#include "sieveactionsetflags.h"
-#include "sieveactionstop.h"
-#include "sieveactionaddflags.h"
-#include "sieveactionfileinto.h"
+#ifndef SIEVEACTIONREJECT_H
+#define SIEVEACTIONREJECT_H
-QList<KSieveUi::SieveAction *> KSieveUi::SieveActionList::actionList()
+#include "sieveaction.h"
+namespace KSieveUi {
+class SieveActionReject : public SieveAction
{
- QList<KSieveUi::SieveAction*> list;
- list.append(new KSieveUi::SieveActionDiscard);
- list.append(new KSieveUi::SieveActionStop);
- list.append(new KSieveUi::SieveActionSetFlags);
- list.append(new KSieveUi::SieveActionAddFlags);
- list.append(new KSieveUi::SieveActionFileInto);
- return list;
+ Q_OBJECT
+public:
+ SieveActionReject(QObject *parent = 0);
+
+ static SieveAction* newAction();
+
+ QWidget *createParamWidget( QWidget *parent ) const;
+ QString code() const;
+ QStringList needRequires() const;
+};
}
+
+#endif // SIEVEACTIONREJECT_H
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic