diff --git a/CMakeLists.txt b/CMakeLists.txt index 36df183a..78ef6fd1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,166 +1,166 @@ cmake_minimum_required(VERSION 3.1) set(PIM_VERSION "5.10.40") project(kdepim-addons VERSION ${PIM_VERSION}) if(POLICY CMP0063) cmake_policy(SET CMP0063 NEW) endif() set(KF5_VERSION "5.51.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/ ${ECM_MODULE_PATH}) # Do NOT add quote set(KDEPIM_DEV_VERSION alpha) # add an extra space if(DEFINED KDEPIM_DEV_VERSION) set(KDEPIM_DEV_VERSION " ${KDEPIM_DEV_VERSION}") endif() set(KDEPIMADDONS_VERSION_NUMBER ${PIM_VERSION}) set(KDEPIMADDONS_VERSION "${KDEPIMADDONS_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") set(KDEPIMADDONS_LIB_VERSION "${KDEPIMADDONS_VERSION_NUMBER}") set(KDEPIMADDONS_LIB_SOVERSION "5") set(AKONADINOTES_LIB_VERSION "5.9.80") set(QT_REQUIRED_VERSION "5.9.0") include(ECMInstallIcons) include(ECMSetupVersion) include(ECMAddTests) include(GenerateExportHeader) include(ECMGenerateHeaders) include(FeatureSummary) include(CheckFunctionExists) include(ECMGeneratePriFile) include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) option(KDEPIMADDONS_BUILD_EXAMPLES "Build the kdepim-addons example applications." TRUE) option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE) option(KMAIL_EDITORCONVERTERPLUGIN_TEMPLATE_BUILD "Build the kmail editor converter plugin." FALSE) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED WebEngine WebEngineWidgets Widgets Test) find_package(KF5I18n ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Config ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5DBusAddons ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiNotes ${AKONADINOTES_LIB_VERSION} CONFIG REQUIRED) find_package(KF5XmlGui ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Declarative ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5SyntaxHighlighting ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5IconThemes ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Parts ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Prison ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Holidays ${KF5_VERSION} CONFIG REQUIRED) set(MAILCOMMON_LIB_VERSION "5.9.80") set(GRAVATAR_LIB_VERSION "5.9.80") set(PIMCOMMON_LIB_VERSION "5.9.80") set(GRANTLEETHEME_LIB_VERSION "5.9.80") set(CALENDARSUPPORT_LIB_VERSION "5.9.80") set(EVENTVIEW_LIB_VERSION "5.9.80") set(LIBKDEPIM_LIB_VERSION "5.9.80") set(KDEPIM_APPS_LIB_VERSION "5.9.80") set(LIBKLEO_LIB_VERSION "5.9.80") set(AKONADI_LIB_VERSION "5.9.80") set(INCIDENCEEDITOR_LIB_VERSION "5.9.80") set(KTNEF_LIB_VERSION "5.9.80") -set(MESSAGELIB_LIB_VERSION "5.9.80") +set(MESSAGELIB_LIB_VERSION "5.10.42") set(AKONADICALENDAR_LIB_VERSION "5.9.80") set(CALENDAR_UTILS_VERSION "5.9.80") set(KPIMTEXTEDIT_LIB_VERSION "5.9.80") set(KIMAP_LIB_VERSION "5.9.80") set(LIBKSIEVE_LIB_VERSION "5.9.80") set(KMAILTRANSPORT_LIB_VERSION "5.9.80") set(AKONADICONTACT_LIB_VERSION "5.9.80") set(IMPORTWIZARD_LIB_VERSION "5.9.80") set(MAILIMPORTER_LIB_VERSION "5.9.80") set(KPIMPKPASS_LIB_VERSION "5.9.80") set(KPIMITINERARY_LIB_VERSION "5.9.80") find_package(KF5CalendarUtils ${CALENDAR_UTILS_VERSION} CONFIG REQUIRED) find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5TemplateParser ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MailCommon ${MAILCOMMON_LIB_VERSION} CONFIG REQUIRED) find_package(KF5KaddressbookGrantlee ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MessageViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5KaddressbookImportExport ${KDEPIM_APPS_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Libkleo ${LIBKLEO_LIB_VERSION} CONFIG REQUIRED) find_package(KF5GrantleeTheme ${GRANTLEETHEME_LIB_VERSION} CONFIG REQUIRED) find_package(KF5PimCommonAkonadi ${PIMCOMMON_LIB_VERSION} CONFIG REQUIRED) find_package(KF5LibkdepimAkonadi ${LIBKDEPIM_LIB_VERSION} CONFIG REQUIRED) find_package(KF5IncidenceEditor ${INCIDENCEEDITOR_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MessageCore ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MessageComposer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MessageList ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) find_package(KF5CalendarSupport ${CALENDARSUPPORT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5EventViews ${EVENTVIEW_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Akonadi ${AKONADI_LIB_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiCalendar ${AKONADICALENDAR_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Gravatar ${GRAVATAR_LIB_VERSION} CONFIG REQUIRED) find_package(KF5PimTextEdit ${KPIMTEXTEDIT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5IdentityManagement ${KIDENTITYMANAGEMENT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5IMAP ${KIMAP_LIB_VERSION} CONFIG REQUIRED) find_package(KF5LibKSieve ${LIBKSIEVE_LIB_VERSION} CONFIG REQUIRED) find_package(KF5Tnef ${KTNEF_LIB_VERSION} CONFIG REQUIRED) find_package(KF5MailTransportAkonadi ${KMAILTRANSPORT_LIB_VERSION} CONFIG REQUIRED) find_package(KF5AkonadiContact ${AKONADICONTACT_LIB_VERSION} CONFIG REQUIRED) find_package(KPimImportWizard ${IMPORTWIZARD_LIB_VERSION} CONFIG) find_package(KF5MailImporterAkonadi ${MAILIMPORTER_LIB_VERSION} CONFIG REQUIRED) find_package(KPimPkPass ${KPIMPKPASS_LIB_VERSION} CONFIG REQUIRED) find_package(KPimItinerary ${KPIMITINERARY_LIB_VERSION} CONFIG REQUIRED) if(KDEPIM_ENTERPRISE_BUILD) set(KDEPIM_ENTERPRISE_BUILD true) else() set(KDEPIM_ENTERPRISE_BUILD false) endif() # Extra package find_package(Gpgmepp 1.8.0 CONFIG) set_package_properties(Gpgmepp PROPERTIES DESCRIPTION "GpgME library" URL "http://www.gnupg.org" TYPE REQUIRED) if(KDEPIMADDONS_BUILD_EXAMPLES) add_subdirectory(examples) endif() include_directories(${CMAKE_CURRENT_SOURCE_DIR}) set(QTCREATOR_TEMPLATE_INSTALL_DIR ${KDE_INSTALL_DATADIR}/qtcreator/templates CACHE PATH "Define qtcreator template install path (default is /usr/share/qtcreator/templates)") find_package(Discount "2") set_package_properties("discount" PROPERTIES DESCRIPTION "A library that gives you formatting functions suitable for marking down entire documents or lines of text" URL "http://www.pell.portland.or.us/~orc/Code/discount/" TYPE RECOMMENDED PURPOSE "Generate Markdown file.") add_subdirectory(plugins) add_subdirectory(korganizer) add_subdirectory(kmail) add_subdirectory(kaddressbook) add_subdirectory(sieveeditor) add_subdirectory(kmailtransport) if(KPimImportWizard_FOUND) add_subdirectory(akonadi-import-wizard) endif() install(FILES kdepim-addons.categories kdepim-addons.renamecategories DESTINATION ${KDE_INSTALL_CONFDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/plugins/messageviewerconfigureplugins/CMakeLists.txt b/plugins/messageviewerconfigureplugins/CMakeLists.txt index ea483650..18ff6520 100644 --- a/plugins/messageviewerconfigureplugins/CMakeLists.txt +++ b/plugins/messageviewerconfigureplugins/CMakeLists.txt @@ -1 +1,3 @@ +add_definitions(-DTRANSLATION_DOMAIN=\"messageviewerconfiguresettingsplugins\") + add_subdirectory(gravatar) diff --git a/plugins/messageviewerconfigureplugins/gravatar/CMakeLists.txt b/plugins/messageviewerconfigureplugins/gravatar/CMakeLists.txt index e69de29b..bd50fc5d 100644 --- a/plugins/messageviewerconfigureplugins/gravatar/CMakeLists.txt +++ b/plugins/messageviewerconfigureplugins/gravatar/CMakeLists.txt @@ -0,0 +1,12 @@ +set(messageviewer_gravatarconfigplugin_SRCS + gravatarconfiguresettingspluginwidget.cpp + gravatarconfiguresettingsplugin.cpp +) + +kcoreaddons_add_plugin(messageviewer_gravatarconfigplugin JSON messageviewer_gravatarconfigplugin.json SOURCES + ${messageviewer_gravatarconfigplugin_SRCS} INSTALL_NAMESPACE messageviewer) + +target_link_libraries(messageviewer_gravatarconfigplugin + KF5::MessageViewer + KF5::I18n +) diff --git a/plugins/messageviewerconfigureplugins/gravatar/gravatarconfiguresettingsplugin.cpp b/plugins/messageviewerconfigureplugins/gravatar/gravatarconfiguresettingsplugin.cpp new file mode 100644 index 00000000..33162105 --- /dev/null +++ b/plugins/messageviewerconfigureplugins/gravatar/gravatarconfiguresettingsplugin.cpp @@ -0,0 +1,41 @@ +/* + Copyright (C) 2018 Montel Laurent + + 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 "gravatarconfiguresettingsplugin.h" +#include + +K_PLUGIN_CLASS_WITH_JSON(GravatarConfigureSettingsPlugin, "messageviewer_gravatarconfigplugin.json") + +GravatarConfigureSettingsPlugin::GravatarConfigureSettingsPlugin(QObject *parent, const QList &) + : MessageViewer::MessageViewerConfigureSettingsPlugin(parent) +{ + +} + + +GravatarConfigureSettingsPlugin::~GravatarConfigureSettingsPlugin() +{ + +} + +void GravatarConfigureSettingsPlugin::showConfigureDialog(QWidget *parent) +{ +} + +#include "gravatarconfiguresettingsplugin.moc" diff --git a/plugins/messageviewerconfigureplugins/gravatar/gravatarconfiguresettingsplugin.h b/plugins/messageviewerconfigureplugins/gravatar/gravatarconfiguresettingsplugin.h new file mode 100644 index 00000000..26287950 --- /dev/null +++ b/plugins/messageviewerconfigureplugins/gravatar/gravatarconfiguresettingsplugin.h @@ -0,0 +1,36 @@ +/* + Copyright (C) 2018 Montel Laurent + + 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 GRAVATARCONFIGURESETTINGSPLUGIN_H +#define GRAVATARCONFIGURESETTINGSPLUGIN_H + +#include + +#include + +class GravatarConfigureSettingsPlugin : public MessageViewer::MessageViewerConfigureSettingsPlugin +{ + Q_OBJECT +public: + explicit GravatarConfigureSettingsPlugin(QObject *parent = nullptr, const QList & = QList()); + ~GravatarConfigureSettingsPlugin() override; + + void showConfigureDialog(QWidget *parent) override; +}; + +#endif // GRAVATARCONFIGURESETTINGSPLUGIN_H diff --git a/plugins/messageviewerconfigureplugins/gravatar/gravatarconfiguresettingspluginwidget.cpp b/plugins/messageviewerconfigureplugins/gravatar/gravatarconfiguresettingspluginwidget.cpp new file mode 100644 index 00000000..8320e12f --- /dev/null +++ b/plugins/messageviewerconfigureplugins/gravatar/gravatarconfiguresettingspluginwidget.cpp @@ -0,0 +1,43 @@ +/* + Copyright (C) 2018 Montel Laurent + + 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 "gravatarconfiguresettingspluginwidget.h" + +GravatarConfigureSettingsPluginWidget::GravatarConfigureSettingsPluginWidget(QWidget *parent) + : MessageViewer::MessageViewerConfigureSettingsPluginWidget(parent) +{ + +} + +GravatarConfigureSettingsPluginWidget::~GravatarConfigureSettingsPluginWidget() +{ +} + + +void GravatarConfigureSettingsPluginWidget::loadSettings() +{ +} + +void GravatarConfigureSettingsPluginWidget::saveSettings() +{ +} + +void GravatarConfigureSettingsPluginWidget::resetSettings() +{ +} diff --git a/plugins/messageviewerconfigureplugins/gravatar/gravatarconfiguresettingspluginwidget.h b/plugins/messageviewerconfigureplugins/gravatar/gravatarconfiguresettingspluginwidget.h new file mode 100644 index 00000000..287160ee --- /dev/null +++ b/plugins/messageviewerconfigureplugins/gravatar/gravatarconfiguresettingspluginwidget.h @@ -0,0 +1,38 @@ +/* + Copyright (C) 2018 Montel Laurent + + 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 GRAVATARCONFIGURESETTINGSPLUGINWIDGET_H +#define GRAVATARCONFIGURESETTINGSPLUGINWIDGET_H + +#include + +class GravatarConfigureSettingsPluginWidget : public MessageViewer::MessageViewerConfigureSettingsPluginWidget +{ + Q_OBJECT +public: + explicit GravatarConfigureSettingsPluginWidget(QWidget *parent = nullptr); + ~GravatarConfigureSettingsPluginWidget() override; + +public: + void loadSettings() override; + void saveSettings() override; + void resetSettings() override; +}; + +#endif // GRAVATARCONFIGURESETTINGSPLUGINWIDGET_H diff --git a/plugins/messageviewerconfigureplugins/gravatar/messageviewer_gravatarconfigplugin.json b/plugins/messageviewerconfigureplugins/gravatar/messageviewer_gravatarconfigplugin.json new file mode 100644 index 00000000..151850ab --- /dev/null +++ b/plugins/messageviewerconfigureplugins/gravatar/messageviewer_gravatarconfigplugin.json @@ -0,0 +1,12 @@ +{ + "KPlugin": { + "Description": "This plugin allows you to configure gravatar support.", + "EnabledByDefault": "true", + "Name": "Gravatar", + "ServiceTypes": [ + "MessageViewerConfigureSettingsPlugin/Plugin" + ], + "Version": "1.0" + }, + "X-KDE-MessageViewer-Configure-Order": "100" +}