[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim/KDE/4.14] mailcommon: improve InvalidFilterListWidgetI
From:       Montel Laurent <montel () kde ! org>
Date:       2015-03-31 21:02:10
Message-ID: E1Yd3IY-0007sd-R9 () scm ! kde ! org
[Download RAW message or body]

Git commit 45c4186c978b12fbe8308457ffacf37f9dc48ad3 by Montel Laurent.
Committed on 31/03/2015 at 21:01.
Pushed by mlaurent into branch 'KDE/4.14'.

improve InvalidFilterListWidgetI

M  +4    -1    mailcommon/CMakeLists.txt
M  +35   -0    mailcommon/filter/autotests/CMakeLists.txt
M  +12   -0    mailcommon/filter/autotests/invalidfilterlistwidgettest.cpp
M  +1    -0    mailcommon/filter/autotests/invalidfilterlistwidgettest.h
M  +16   -0    mailcommon/filter/invalidfilters/invalidfilterlistwidget.cpp
M  +10   -0    mailcommon/filter/invalidfilters/invalidfilterlistwidget.h

http://commits.kde.org/kdepim/45c4186c978b12fbe8308457ffacf37f9dc48ad3

diff --git a/mailcommon/CMakeLists.txt b/mailcommon/CMakeLists.txt
index 94c291c..e1438f6 100644
--- a/mailcommon/CMakeLists.txt
+++ b/mailcommon/CMakeLists.txt
@@ -84,6 +84,9 @@ set(libmailcommon_filter_SRCS
   filter/dialog/selectthunderbirdfilterfilesdialog.cpp
   filter/dialog/selectthunderbirdfilterfileswidget.cpp
   filter/mdnadvicedialog.cpp
+)
+
+set(libmailcommon_invalidfilters 
   filter/invalidfilters/invalidfilterdialog.cpp
   filter/invalidfilters/invalidfilterlistwidget.cpp
   filter/invalidfilters/invalidfilterwidget.cpp
@@ -158,6 +161,7 @@ set(libmailcommon_SRCS
   kernel/mailkernel.cpp
   util/mailutil.cpp
   mdn/sendmdnhandler.cpp
+  ${libmailcommon_invalidfilters}
   ${libmailcommon_widget_SRCS}
   ${libmailcommon_tag_SRCS}
   ${libmailcommon_snippets_SRCS}
@@ -225,7 +229,6 @@ add_subdirectory(collectionpage/autotests)
 add_subdirectory(filter/autotests)
 add_subdirectory(snippets/autotests)
 add_subdirectory(filter/tests)
-#install(FILES viewer/viewer.h viewer/attachmentstrategy.h header/headerstrategy.h \
messageviewer_export.h DESTINATION ${INCLUDE_INSTALL_DIR}/messageviewer COMPONENT \
devel)  
 if (QT_QTDESIGNER_FOUND)
   set(mailcommonwidgets_PART_SRCS)
diff --git a/mailcommon/filter/autotests/CMakeLists.txt \
b/mailcommon/filter/autotests/CMakeLists.txt index 8cb563f..1e392db 100644
--- a/mailcommon/filter/autotests/CMakeLists.txt
+++ b/mailcommon/filter/autotests/CMakeLists.txt
@@ -203,3 +203,38 @@ target_link_libraries( invalidfilterwidgettest \
${QT_QTTEST_LIBRARY} ${KDE4_KDECO  set( mailcommon_invalidfilterlistwidget_source \
invalidfilterlistwidgettest.cpp  )  kde4_add_unit_test( invalidfilterlistwidgettest \
${mailcommon_invalidfilterlistwidget_source})  target_link_libraries( \
invalidfilterlistwidgettest ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS} \
${QT_QTGUI_LIBRARY} ${KDEPIMLIBS_AKONADI_LIBS} mailcommon) +
+
+set(mailcommon_filteractionunsetstatustest_SRCS filteractionunsetstatustest.cpp
+                                           \
../filteractions/filteractionunsetstatus.cpp +                                        \
../filteractions/filteractionstatus.cpp +                                           \
../filteractions/filteractionwithstringlist.cpp +                                     \
../filteractions/filteractionwithstring.cpp) +kde4_add_unit_test( \
filteractionunsetstatustest ${mailcommon_filteractionunsetstatustest_SRCS} ) \
+target_link_libraries( filteractionunsetstatustest +   kdepim
+   pimcommon
+   mailcommon
+   ${QT_QTTEST_LIBRARY}
+   ${QT_QTCORE_LIBRARY}
+   ${KDEPIMLIBS_AKONADI_LIBS}
+   ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+)
+
+set(mailcommon_filteractionredirecttest_SRCS filteractionredirecttest.cpp
+                                           ../filteractions/filteractionredirect.cpp
+                                           \
../filteractions/filteractionwithaddress.cpp +                                        \
../filteractions/filteractionwithstring.cpp) +kde4_add_unit_test( \
filteractionredirecttest ${mailcommon_filteractionredirecttest_SRCS} ) \
+target_link_libraries( filteractionredirecttest +   kdepim
+   pimcommon
+   mailcommon
+   messagecore
+   messagecomposer
+   ${QT_QTTEST_LIBRARY}
+   ${QT_QTCORE_LIBRARY}
+   ${KDEPIMLIBS_AKONADI_LIBS}
+   ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
+)
+
diff --git a/mailcommon/filter/autotests/invalidfilterlistwidgettest.cpp \
b/mailcommon/filter/autotests/invalidfilterlistwidgettest.cpp index 48c1c50..cb509b4 \
                100644
--- a/mailcommon/filter/autotests/invalidfilterlistwidgettest.cpp
+++ b/mailcommon/filter/autotests/invalidfilterlistwidgettest.cpp
@@ -36,4 +36,16 @@ void InvalidFilterListWidgetTest::shouldHaveDefaultValue()
     QCOMPARE(w.count(), 0);
 }
 
+void InvalidFilterListWidgetTest::shouldAddInvalidFilters()
+{
+    MailCommon::InvalidFilterListWidget w;
+    QCOMPARE(w.count(), 0);
+    QStringList lst;
+    lst << QLatin1String("foo");
+    lst << QLatin1String("foo1");
+    lst << QLatin1String("foo2");
+    w.setInvalidFilter(lst);
+    QCOMPARE(w.count(), 3);
+}
+
 QTEST_KDEMAIN(InvalidFilterListWidgetTest, GUI)
diff --git a/mailcommon/filter/autotests/invalidfilterlistwidgettest.h \
b/mailcommon/filter/autotests/invalidfilterlistwidgettest.h index c2c0475..7901c7c \
                100644
--- a/mailcommon/filter/autotests/invalidfilterlistwidgettest.h
+++ b/mailcommon/filter/autotests/invalidfilterlistwidgettest.h
@@ -28,6 +28,7 @@ public:
     ~InvalidFilterListWidgetTest();
 private Q_SLOTS:
     void shouldHaveDefaultValue();
+    void shouldAddInvalidFilters();
 };
 
 #endif // INVALIDFILTERLISTWIDGETTEST_H
diff --git a/mailcommon/filter/invalidfilters/invalidfilterlistwidget.cpp \
b/mailcommon/filter/invalidfilters/invalidfilterlistwidget.cpp index 3280430..a63cd20 \
                100644
--- a/mailcommon/filter/invalidfilters/invalidfilterlistwidget.cpp
+++ b/mailcommon/filter/invalidfilters/invalidfilterlistwidget.cpp
@@ -18,6 +18,22 @@
 #include "invalidfilterlistwidget.h"
 using namespace MailCommon;
 
+InvalidFilterListWidgetItem::InvalidFilterListWidgetItem(QListWidget *parent)
+    : QListWidgetItem(parent)
+{
+
+}
+
+InvalidFilterListWidgetItem::~InvalidFilterListWidgetItem()
+{
+
+}
+
+void InvalidFilterListWidgetItem::setInformation(const QString &information)
+{
+    mInformation = information;
+}
+
 InvalidFilterListWidget::InvalidFilterListWidget(QWidget *parent)
     : QListWidget(parent)
 {
diff --git a/mailcommon/filter/invalidfilters/invalidfilterlistwidget.h \
b/mailcommon/filter/invalidfilters/invalidfilterlistwidget.h index ea3a679..6963084 \
                100644
--- a/mailcommon/filter/invalidfilters/invalidfilterlistwidget.h
+++ b/mailcommon/filter/invalidfilters/invalidfilterlistwidget.h
@@ -22,6 +22,16 @@
 #include "mailcommon_export.h"
 
 namespace MailCommon {
+class InvalidFilterListWidgetItem : public QListWidgetItem
+{
+public:
+    explicit InvalidFilterListWidgetItem(QListWidget *parent = 0);
+    ~InvalidFilterListWidgetItem();
+    void setInformation(const QString &information);
+private:
+    QString mInformation;
+};
+
 class MAILCOMMON_EXPORT InvalidFilterListWidget : public QListWidget
 {
     Q_OBJECT


[prev in list] [next in list] [prev in thread] [next in thread]