summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMontel Laurent <montel@kde.org>2016-09-26 05:16:28 (GMT)
committerMontel Laurent <montel@kde.org>2016-09-26 05:16:28 (GMT)
commitbe366425f8ab3e4af2e2da08cfdcf5fae26d66c5 (patch)
treec9d1b4c080f6cb9b7ec72e460b8547de778cf40d
parentcabe6543b74a68af6fc6d4b0de4211cad6650101 (diff)
Move in own directory
-rw-r--r--plugins/messageviewerplugins/autotests/CMakeLists.txt6
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/CMakeLists.txt5
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/CMakeLists.txt20
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/correctdesktop/first.desktop (renamed from plugins/messageviewerplugins/autotests/externaldatas/correctdesktop/first.desktop)0
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/emptydesktop/first.desktop (renamed from plugins/messageviewerplugins/autotests/externaldatas/emptydesktop/first.desktop)0
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/nonamedesktop/first.desktop (renamed from plugins/messageviewerplugins/autotests/externaldatas/nonamedesktop/first.desktop)0
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/twodesktopfiles/first.desktop (renamed from plugins/messageviewerplugins/autotests/externaldatas/twosamenamedesktopfiles/first.desktop)0
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/twodesktopfiles/second.desktop (renamed from plugins/messageviewerplugins/autotests/externaldatas/twodesktopfiles/second.desktop)0
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/twosamenamedesktopfiles/first.desktop (renamed from plugins/messageviewerplugins/autotests/externaldatas/twodesktopfiles/first.desktop)0
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/twosamenamedesktopfiles/second.desktop (renamed from plugins/messageviewerplugins/autotests/externaldatas/twosamenamedesktopfiles/second.desktop)0
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptinfotest.cpp (renamed from plugins/messageviewerplugins/autotests/viewerpluginexternalscriptinfotest.cpp)2
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptinfotest.h (renamed from plugins/messageviewerplugins/autotests/viewerpluginexternalscriptinfotest.h)0
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptparseargumenttest.cpp (renamed from plugins/messageviewerplugins/autotests/viewerpluginexternalscriptparseargumenttest.cpp)2
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptparseargumenttest.h (renamed from plugins/messageviewerplugins/autotests/viewerpluginexternalscriptparseargumenttest.h)0
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptsloadjobtest.cpp (renamed from plugins/messageviewerplugins/autotests/viewerpluginexternalscriptsloadjobtest.cpp)2
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptsloadjobtest.h (renamed from plugins/messageviewerplugins/autotests/viewerpluginexternalscriptsloadjobtest.h)0
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfigurewidget.cpp31
-rw-r--r--plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfigurewidget.h33
18 files changed, 92 insertions, 9 deletions
diff --git a/plugins/messageviewerplugins/autotests/CMakeLists.txt b/plugins/messageviewerplugins/autotests/CMakeLists.txt
index 950b851..8925caa 100644
--- a/plugins/messageviewerplugins/autotests/CMakeLists.txt
+++ b/plugins/messageviewerplugins/autotests/CMakeLists.txt
@@ -1,9 +1,7 @@
-add_definitions (-DTEST_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/externaldatas")
set(common_SRCS)
ecm_qt_declare_logging_category(common_SRCS HEADER createeventplugin_debug.h IDENTIFIER CREATEEVENTPLUGIN_LOG CATEGORY_NAME org.kde.pim.createeventplugin)
ecm_qt_declare_logging_category(common_SRCS HEADER createnoteplugin_debug.h IDENTIFIER CREATENOTEPLUGIN_LOG CATEGORY_NAME org.kde.pim.createnoteplugin)
ecm_qt_declare_logging_category(common_SRCS HEADER createtodoplugin_debug.h IDENTIFIER CREATETODOPLUGIN_LOG CATEGORY_NAME org.kde.pim.createtodoplugin)
-ecm_qt_declare_logging_category(common_SRCS HEADER externalscriptplugin_debug.h IDENTIFIER EXTERNALSCRIPTPLUGIN_LOG CATEGORY_NAME org.kde.pim.externalscriptplugin)
macro(add_messageviewer_viewerplugin_unittest _source _additional _jsonfile)
set( _test ${_source} ${_additional} ${common_SRCS})
@@ -53,7 +51,3 @@ add_messageviewer_viewerplugin_unittest(viewerplugincreateeventtest.cpp "../crea
add_messageviewer_viewerplugin_unittest(viewerplugincreatetodotest.cpp "../createtodoplugin/viewerplugincreatetodo.cpp;../createtodoplugin/viewerplugincreatetodointerface.cpp;../createtodoplugin/todoedit.cpp;../createtodoplugin/createtodojob.cpp" "")
add_messageviewer_viewerplugin_unittest(viewerplugincreatenotetest.cpp "../createnoteplugin/noteedit.cpp;../createnoteplugin/viewerplugincreatenote.cpp;../createnoteplugin/viewerplugincreatenoteinterface.cpp;../createnoteplugin/createnotejob.cpp" "")
add_messageviewer_viewerplugin_unittest(viewerplugintranslatortest.cpp "../common/translatorplugin/viewerplugintranslator.cpp;../common/translatorplugin/viewerplugintranslatorinterface.cpp" "")
-
-add_messageviewer_viewerplugin_unittest(viewerpluginexternalscriptinfotest.cpp "../externalscriptplugin/viewerpluginexternalscriptparseargument.cpp;../externalscriptplugin/viewerpluginexternalscriptinfo.cpp;../externalscriptplugin/viewerpluginexternalscriptsloadjob.cpp" "")
-add_messageviewer_viewerplugin_unittest(viewerpluginexternalscriptsloadjobtest.cpp "../externalscriptplugin/viewerpluginexternalscriptsloadjob.cpp;../externalscriptplugin/viewerpluginexternalscriptinfo.cpp" "")
-add_messageviewer_viewerplugin_unittest(viewerpluginexternalscriptparseargumenttest.cpp "../externalscriptplugin/viewerpluginexternalscriptparseargument.cpp" "")
diff --git a/plugins/messageviewerplugins/externalscriptplugin/CMakeLists.txt b/plugins/messageviewerplugins/externalscriptplugin/CMakeLists.txt
index 734b914..0c034d4 100644
--- a/plugins/messageviewerplugins/externalscriptplugin/CMakeLists.txt
+++ b/plugins/messageviewerplugins/externalscriptplugin/CMakeLists.txt
@@ -6,6 +6,7 @@ set(messageviewer_externalscriptplugin_SRCS
viewerpluginexternalscriptsloadjob.cpp
viewerpluginexternalscriptparseargument.cpp
configuredialog/viewerpluginexternalconfiguredialog.cpp
+ configuredialog/viewerpluginexternalconfigurewidget.cpp
)
ecm_qt_declare_logging_category(messageviewer_externalscriptplugin_SRCS HEADER externalscriptplugin_debug.h IDENTIFIER EXTERNALSCRIPTPLUGIN_LOG CATEGORY_NAME org.kde.pim.externalscriptplugin)
@@ -18,3 +19,7 @@ target_link_libraries(messageviewer_externalscriptplugin
if (KDEPIMADDONS_BUILD_EXAMPLES)
add_subdirectory(examples)
endif()
+
+if(BUILD_TESTING)
+ add_subdirectory(autotests)
+endif()
diff --git a/plugins/messageviewerplugins/externalscriptplugin/autotests/CMakeLists.txt b/plugins/messageviewerplugins/externalscriptplugin/autotests/CMakeLists.txt
new file mode 100644
index 0000000..b10df97
--- /dev/null
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/CMakeLists.txt
@@ -0,0 +1,20 @@
+add_definitions (-DTEST_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/externaldatas")
+ecm_qt_declare_logging_category(common_SRCS HEADER externalscriptplugin_debug.h IDENTIFIER EXTERNALSCRIPTPLUGIN_LOG CATEGORY_NAME org.kde.pim.externalscriptplugin)
+
+macro(add_messageviewer_viewerplugin_external_plugin_unittest _source _additional _jsonfile)
+ set( _test ${_source} ${_additional} ${common_SRCS})
+ get_filename_component(_name ${_source} NAME_WE)
+ if (${_jsonfile})
+ kcoreaddons_desktop_to_json(${_name} ${_jsonfile})
+ endif()
+ ecm_add_test(${_test}
+ TEST_NAME ${_name}
+ NAME_PREFIX "messageviewerplugins-"
+ LINK_LIBRARIES KF5::MessageViewer KF5::Libkleo KF5::QGpgme Qt5::Test KF5::KIOCore KF5::Mime KF5::AkonadiCore KF5::AkonadiNotes KF5::CalendarCore KF5::GrantleeTheme KF5::IncidenceEditor
+ )
+endmacro ()
+
+
+add_messageviewer_viewerplugin_external_plugin_unittest(viewerpluginexternalscriptinfotest.cpp "../viewerpluginexternalscriptparseargument.cpp;../viewerpluginexternalscriptinfo.cpp;../viewerpluginexternalscriptsloadjob.cpp" "")
+add_messageviewer_viewerplugin_external_plugin_unittest(viewerpluginexternalscriptsloadjobtest.cpp "../viewerpluginexternalscriptsloadjob.cpp;../viewerpluginexternalscriptinfo.cpp" "")
+add_messageviewer_viewerplugin_external_plugin_unittest(viewerpluginexternalscriptparseargumenttest.cpp "../viewerpluginexternalscriptparseargument.cpp" "")
diff --git a/plugins/messageviewerplugins/autotests/externaldatas/correctdesktop/first.desktop b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/correctdesktop/first.desktop
index 5fa9a57..5fa9a57 100644
--- a/plugins/messageviewerplugins/autotests/externaldatas/correctdesktop/first.desktop
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/correctdesktop/first.desktop
diff --git a/plugins/messageviewerplugins/autotests/externaldatas/emptydesktop/first.desktop b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/emptydesktop/first.desktop
index d226fba..d226fba 100644
--- a/plugins/messageviewerplugins/autotests/externaldatas/emptydesktop/first.desktop
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/emptydesktop/first.desktop
diff --git a/plugins/messageviewerplugins/autotests/externaldatas/nonamedesktop/first.desktop b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/nonamedesktop/first.desktop
index f1bf6c9..f1bf6c9 100644
--- a/plugins/messageviewerplugins/autotests/externaldatas/nonamedesktop/first.desktop
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/nonamedesktop/first.desktop
diff --git a/plugins/messageviewerplugins/autotests/externaldatas/twosamenamedesktopfiles/first.desktop b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/twodesktopfiles/first.desktop
index b2774b7..b2774b7 100644
--- a/plugins/messageviewerplugins/autotests/externaldatas/twosamenamedesktopfiles/first.desktop
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/twodesktopfiles/first.desktop
diff --git a/plugins/messageviewerplugins/autotests/externaldatas/twodesktopfiles/second.desktop b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/twodesktopfiles/second.desktop
index 40a3fe6..40a3fe6 100644
--- a/plugins/messageviewerplugins/autotests/externaldatas/twodesktopfiles/second.desktop
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/twodesktopfiles/second.desktop
diff --git a/plugins/messageviewerplugins/autotests/externaldatas/twodesktopfiles/first.desktop b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/twosamenamedesktopfiles/first.desktop
index b2774b7..b2774b7 100644
--- a/plugins/messageviewerplugins/autotests/externaldatas/twodesktopfiles/first.desktop
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/twosamenamedesktopfiles/first.desktop
diff --git a/plugins/messageviewerplugins/autotests/externaldatas/twosamenamedesktopfiles/second.desktop b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/twosamenamedesktopfiles/second.desktop
index b2774b7..b2774b7 100644
--- a/plugins/messageviewerplugins/autotests/externaldatas/twosamenamedesktopfiles/second.desktop
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/externaldatas/twosamenamedesktopfiles/second.desktop
diff --git a/plugins/messageviewerplugins/autotests/viewerpluginexternalscriptinfotest.cpp b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptinfotest.cpp
index bed5064..8432850 100644
--- a/plugins/messageviewerplugins/autotests/viewerpluginexternalscriptinfotest.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptinfotest.cpp
@@ -18,7 +18,7 @@
*/
#include "viewerpluginexternalscriptinfotest.h"
-#include "../externalscriptplugin/viewerpluginexternalscriptinfo.h"
+#include "../viewerpluginexternalscriptinfo.h"
#include <QTest>
diff --git a/plugins/messageviewerplugins/autotests/viewerpluginexternalscriptinfotest.h b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptinfotest.h
index 2c5ba5a..2c5ba5a 100644
--- a/plugins/messageviewerplugins/autotests/viewerpluginexternalscriptinfotest.h
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptinfotest.h
diff --git a/plugins/messageviewerplugins/autotests/viewerpluginexternalscriptparseargumenttest.cpp b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptparseargumenttest.cpp
index 75a6892..0c1a15d 100644
--- a/plugins/messageviewerplugins/autotests/viewerpluginexternalscriptparseargumenttest.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptparseargumenttest.cpp
@@ -18,7 +18,7 @@
*/
#include "viewerpluginexternalscriptparseargumenttest.h"
-#include "../externalscriptplugin/viewerpluginexternalscriptparseargument.h"
+#include "../viewerpluginexternalscriptparseargument.h"
#include <QTest>
ViewerPluginExternalScriptParseArgumentTest::ViewerPluginExternalScriptParseArgumentTest(QObject *parent)
diff --git a/plugins/messageviewerplugins/autotests/viewerpluginexternalscriptparseargumenttest.h b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptparseargumenttest.h
index 013c7d4..013c7d4 100644
--- a/plugins/messageviewerplugins/autotests/viewerpluginexternalscriptparseargumenttest.h
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptparseargumenttest.h
diff --git a/plugins/messageviewerplugins/autotests/viewerpluginexternalscriptsloadjobtest.cpp b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptsloadjobtest.cpp
index 9de1523..08dc35d 100644
--- a/plugins/messageviewerplugins/autotests/viewerpluginexternalscriptsloadjobtest.cpp
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptsloadjobtest.cpp
@@ -18,7 +18,7 @@
*/
#include "viewerpluginexternalscriptsloadjobtest.h"
-#include "../externalscriptplugin/viewerpluginexternalscriptsloadjob.h"
+#include "../viewerpluginexternalscriptsloadjob.h"
#include <QTest>
diff --git a/plugins/messageviewerplugins/autotests/viewerpluginexternalscriptsloadjobtest.h b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptsloadjobtest.h
index 0ca4e8e..0ca4e8e 100644
--- a/plugins/messageviewerplugins/autotests/viewerpluginexternalscriptsloadjobtest.h
+++ b/plugins/messageviewerplugins/externalscriptplugin/autotests/viewerpluginexternalscriptsloadjobtest.h
diff --git a/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfigurewidget.cpp b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfigurewidget.cpp
new file mode 100644
index 0000000..9eb66f7
--- /dev/null
+++ b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfigurewidget.cpp
@@ -0,0 +1,31 @@
+/*
+ Copyright (C) 2016 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 as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ 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; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#include "viewerpluginexternalconfigurewidget.h"
+
+ViewerPluginExternalConfigureWidget::ViewerPluginExternalConfigureWidget(QWidget *parent)
+ : QWidget(parent)
+{
+
+}
+
+ViewerPluginExternalConfigureWidget::~ViewerPluginExternalConfigureWidget()
+{
+
+}
diff --git a/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfigurewidget.h b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfigurewidget.h
new file mode 100644
index 0000000..8813348
--- /dev/null
+++ b/plugins/messageviewerplugins/externalscriptplugin/configuredialog/viewerpluginexternalconfigurewidget.h
@@ -0,0 +1,33 @@
+/*
+ Copyright (C) 2016 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 as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ 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; see the file COPYING. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef VIEWERPLUGINEXTERNALCONFIGUREWIDGET_H
+#define VIEWERPLUGINEXTERNALCONFIGUREWIDGET_H
+
+#include <QWidget>
+
+class ViewerPluginExternalConfigureWidget : public QWidget
+{
+ Q_OBJECT
+public:
+ explicit ViewerPluginExternalConfigureWidget(QWidget *parent = Q_NULLPTR);
+ ~ViewerPluginExternalConfigureWidget();
+};
+
+#endif // VIEWERPLUGINEXTERNALCONFIGUREWIDGET_H